[Vk] Let VulkanPhysicalDevice::physicalDeviceID be unsigned and hold …

…deviceLUID if available
OGRECave · Nov 27, 2024 · 13e92dd · 13e92dd
1 parent 84c07a0
commit 13e92dd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/RenderSystems/Vulkan/include/OgreVulkanRenderSystem.h b/RenderSystems/Vulkan/include/OgreVulkanRenderSystem.h
@@ -56,7 +56,7 @@ namespace Ogre
     struct VulkanPhysicalDevice
     {
         VkPhysicalDevice physicalDevice;
-        long long physicalDeviceID;
+        uint64 physicalDeviceID;
         String title;
     };
 

diff --git a/RenderSystems/Vulkan/src/OgreVulkanDevice.cpp b/RenderSystems/Vulkan/src/OgreVulkanDevice.cpp
@@ -441,7 +441,7 @@ namespace Ogre
             // TODO: use deviceLUID or deviceUUID if available
             uint64 hashResult[2] = {};
             OGRE_HASH128_FUNC( name.c_str(), (int)name.size(), IdString::Seed, hashResult );
-            long long deviceLUID = hashResult[0];
+            uint64 deviceLUID = hashResult[0] ^ hashResult[1];
 
             LogManager::getSingleton().logMessage( "Vulkan: \"" + name + "\"" );
             mVulkanPhysicalDevices.push_back( { device, deviceLUID, name } );