From 5253abaaf41b75fab7bebe822db5c797f5327c08 Mon Sep 17 00:00:00 2001
From: amzn-phist <52085794+amzn-phist@users.noreply.github.com>
Date: Fri, 9 Sep 2022 13:46:39 -0500
Subject: [PATCH] Fixes a few issues with headers in OpenXRVk and XR

- Added and moved some headers to correct some issues with intellisense.

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>
---
 Gems/OpenXRVk/Code/Include/OpenXRVk/OpenXRVkInput.h | 1 +
 Gems/OpenXRVk/Code/Include/OpenXRVk/OpenXRVkUtils.h | 7 +++----
 Gems/OpenXRVk/Code/Source/OpenXRVkSwapChain.cpp     | 1 +
 Gems/XR/Code/Include/XR/XRBase.h                    | 1 +
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Gems/OpenXRVk/Code/Include/OpenXRVk/OpenXRVkInput.h b/Gems/OpenXRVk/Code/Include/OpenXRVk/OpenXRVkInput.h
index 58faf5e66..a7b188be1 100644
--- a/Gems/OpenXRVk/Code/Include/OpenXRVk/OpenXRVkInput.h
+++ b/Gems/OpenXRVk/Code/Include/OpenXRVk/OpenXRVkInput.h
@@ -9,6 +9,7 @@
 #pragma once
 
 #include <XR/XRInput.h>
+#include <OpenXRVk/OpenXRVkSpace.h>
 #include <OpenXRVk_Platform.h>
 
 namespace OpenXRVk
diff --git a/Gems/OpenXRVk/Code/Include/OpenXRVk/OpenXRVkUtils.h b/Gems/OpenXRVk/Code/Include/OpenXRVk/OpenXRVkUtils.h
index be76a3bb7..2d0272069 100644
--- a/Gems/OpenXRVk/Code/Include/OpenXRVk/OpenXRVkUtils.h
+++ b/Gems/OpenXRVk/Code/Include/OpenXRVk/OpenXRVkUtils.h
@@ -8,7 +8,6 @@
 
 #pragma once
 
-#include <Atom/RHI.Reflect/Base.h>
 #include <OpenXRVk_Platform.h>
 #include <XR/XRBase.h>
 
@@ -42,7 +41,7 @@ namespace OpenXRVk
     if (result != XR_SUCCESS) {\
         return;\
     }
-    
+
 #define WARN_IF_UNSUCCESSFUL(result) \
     if (result != XR_SUCCESS) {\
         AZ_Warning("OpenXRVk", false, "Warning error code: %s", to_string(result));\
@@ -59,8 +58,8 @@ namespace OpenXRVk
     const char* GetResultString(const XrResult result);
     XR::RawStringList FilterList(const XR::RawStringList& source, const XR::StringList& filter);
 
-    //! Input is an array of chars with multiple ' ' char embedded in it, indicating the start of a new string. 
-    //! Iterate through the characters while caching the starting pointer to a string 
+    //! Input is an array of chars with multiple ' ' char embedded in it, indicating the start of a new string.
+    //! Iterate through the characters while caching the starting pointer to a string
     //! and every time ' ' is encountered replace it with '\0' to indicate the end of a string.
     AZStd::vector<const char*> ParseExtensionString(char* names);
 }
diff --git a/Gems/OpenXRVk/Code/Source/OpenXRVkSwapChain.cpp b/Gems/OpenXRVk/Code/Source/OpenXRVkSwapChain.cpp
index 75346b779..c1d7b6bf2 100644
--- a/Gems/OpenXRVk/Code/Source/OpenXRVkSwapChain.cpp
+++ b/Gems/OpenXRVk/Code/Source/OpenXRVkSwapChain.cpp
@@ -11,6 +11,7 @@
 #include <AzCore/Casting/numeric_cast.h>
 #include <AzCore/std/containers/set.h>
 #include <AzCore/std/containers/vector.h>
+#include <OpenXRVk/OpenXRVkDevice.h>
 #include <OpenXRVk/OpenXRVkInstance.h>
 #include <OpenXRVk/OpenXRVkSession.h>
 #include <OpenXRVk/OpenXRVkSwapChain.h>
diff --git a/Gems/XR/Code/Include/XR/XRBase.h b/Gems/XR/Code/Include/XR/XRBase.h
index 241e69ae4..54c1e915d 100644
--- a/Gems/XR/Code/Include/XR/XRBase.h
+++ b/Gems/XR/Code/Include/XR/XRBase.h
@@ -11,6 +11,7 @@
 #include <AzCore/std/smart_ptr/intrusive_ptr.h>
 #include <AzCore/std/string/string.h>
 #include <AzCore/std/containers/vector.h>
+#include <Atom/RHI.Reflect/Base.h>      // For AZ::RHI::ResultCode
 
 namespace XR
 {