浏览代码

Fixed compilation error in OpenXRVk gem (#42)

Signed-off-by: moraaar <[email protected]>
moraaar 2 年之前
父节点
当前提交
716aa55158

+ 1 - 1
Gems/OpenXRVk/Code/Include/OpenXRVk/OpenXRVkInstance.h

@@ -30,7 +30,7 @@ namespace OpenXRVk
 
         //////////////////////////////////////////////////////////////////////////
         // XR::Instance overrides
-        AZ::RHI::ResultCode InitInstanceInternal(AZ::RHI::ValidationMode m_validationMode) override;
+        AZ::RHI::ResultCode InitInstanceInternal(AZ::RHI::ValidationMode validationMode) override;
         AZ::RHI::ResultCode InitNativeInstance(AZ::RHI::XRInstanceDescriptor* instanceDescriptor) override;
         AZ::u32 GetNumPhysicalDevices() const override;
         AZ::RHI::ResultCode GetXRPhysicalDevice(AZ::RHI::XRPhysicalDeviceDescriptor* physicalDeviceDescriptor, int32_t index) override;

+ 1 - 1
Gems/OpenXRVk/Code/Include/OpenXRVk/OpenXRVkPhysicalDevice.h

@@ -14,6 +14,6 @@
 namespace OpenXRVk::PhysicalDevice
 {
     //! API to enumerate and return physical devices.
-    static AZStd::vector<VkPhysicalDevice> EnumerateDeviceList(XrSystemId xrSystemId, XrInstance xrInstance, VkInstance vkInstance); 
+    AZStd::vector<VkPhysicalDevice> EnumerateDeviceList(XrSystemId xrSystemId, XrInstance xrInstance, VkInstance vkInstance); 
 }
 

+ 2 - 2
Gems/OpenXRVk/Code/Source/OpenXRVkPhysicalDevice.cpp

@@ -9,9 +9,9 @@
 #include <OpenXRVk/OpenXRVkPhysicalDevice.h>
 #include <OpenXRVk/OpenXRVkUtils.h>
 
-namespace OpenXRVk
+namespace OpenXRVk::PhysicalDevice
 {
-    AZStd::vector<VkPhysicalDevice> PhysicalDevice::EnumerateDeviceList(XrSystemId xrSystemId, XrInstance xrInstance, VkInstance vkInstance)
+    AZStd::vector<VkPhysicalDevice> EnumerateDeviceList(XrSystemId xrSystemId, XrInstance xrInstance, VkInstance vkInstance)
     {
         PFN_xrGetVulkanGraphicsDeviceKHR pfnGetVulkanGraphicsDeviceKHR = nullptr;
         XrResult result = xrGetInstanceProcAddr(

+ 1 - 1
Gems/XR/Code/Include/XR/XRInstance.h

@@ -49,7 +49,7 @@ namespace XR
         virtual void ShutdownInternal() = 0;
 
         //! API to allow backend object to initialize native xr instance.
-        virtual AZ::RHI::ResultCode InitInstanceInternal(AZ::RHI::ValidationMode m_validationMode) = 0;
+        virtual AZ::RHI::ResultCode InitInstanceInternal(AZ::RHI::ValidationMode validationMode) = 0;
 
         //Cache validation mode in case the backend object needs to use it.
         AZ::RHI::ValidationMode m_validationMode = AZ::RHI::ValidationMode::Disabled;