From 13e92ddc4e8f541f9bac43c38661e843e8ddb31a Mon Sep 17 00:00:00 2001 From: Eugene Golushkov Date: Wed, 27 Nov 2024 15:03:14 +0100 Subject: [PATCH] [Vk] Let VulkanPhysicalDevice::physicalDeviceID be unsigned and hold deviceLUID if available --- RenderSystems/Vulkan/include/OgreVulkanRenderSystem.h | 2 +- RenderSystems/Vulkan/src/OgreVulkanDevice.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/RenderSystems/Vulkan/include/OgreVulkanRenderSystem.h b/RenderSystems/Vulkan/include/OgreVulkanRenderSystem.h index 2820fb00de..a16bb418b5 100644 --- 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 index cef88038ef..716830e551 100644 --- 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 } );