Skip to content

Commit b63617b

Browse files
authored
Merge pull request #27 from aws-lumberyard-dev/openxr/amzn-phist/MiscFixes
OpenXR Misc header fixes
2 parents cb5343d + 5253aba commit b63617b

File tree

4 files changed

+6
-4
lines changed

4 files changed

+6
-4
lines changed

Gems/OpenXRVk/Code/Include/OpenXRVk/OpenXRVkInput.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
#pragma once
1010

1111
#include <XR/XRInput.h>
12+
#include <OpenXRVk/OpenXRVkSpace.h>
1213
#include <OpenXRVk_Platform.h>
1314

1415
namespace OpenXRVk

Gems/OpenXRVk/Code/Include/OpenXRVk/OpenXRVkUtils.h

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
#pragma once
1010

11-
#include <Atom/RHI.Reflect/Base.h>
1211
#include <OpenXRVk_Platform.h>
1312
#include <XR/XRBase.h>
1413

@@ -42,7 +41,7 @@ namespace OpenXRVk
4241
if (result != XR_SUCCESS) {\
4342
return;\
4443
}
45-
44+
4645
#define WARN_IF_UNSUCCESSFUL(result) \
4746
if (result != XR_SUCCESS) {\
4847
AZ_Warning("OpenXRVk", false, "Warning error code: %s", to_string(result));\
@@ -59,8 +58,8 @@ namespace OpenXRVk
5958
const char* GetResultString(const XrResult result);
6059
XR::RawStringList FilterList(const XR::RawStringList& source, const XR::StringList& filter);
6160

62-
//! Input is an array of chars with multiple ' ' char embedded in it, indicating the start of a new string.
63-
//! Iterate through the characters while caching the starting pointer to a string
61+
//! Input is an array of chars with multiple ' ' char embedded in it, indicating the start of a new string.
62+
//! Iterate through the characters while caching the starting pointer to a string
6463
//! and every time ' ' is encountered replace it with '\0' to indicate the end of a string.
6564
AZStd::vector<const char*> ParseExtensionString(char* names);
6665
}

Gems/OpenXRVk/Code/Source/OpenXRVkSwapChain.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
#include <AzCore/Casting/numeric_cast.h>
1212
#include <AzCore/std/containers/set.h>
1313
#include <AzCore/std/containers/vector.h>
14+
#include <OpenXRVk/OpenXRVkDevice.h>
1415
#include <OpenXRVk/OpenXRVkInstance.h>
1516
#include <OpenXRVk/OpenXRVkSession.h>
1617
#include <OpenXRVk/OpenXRVkSwapChain.h>

Gems/XR/Code/Include/XR/XRBase.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
#include <AzCore/std/smart_ptr/intrusive_ptr.h>
1212
#include <AzCore/std/string/string.h>
1313
#include <AzCore/std/containers/vector.h>
14+
#include <Atom/RHI.Reflect/Base.h> // For AZ::RHI::ResultCode
1415

1516
namespace XR
1617
{

0 commit comments

Comments
 (0)