From ca4d79c0a34f4186e8a6ec39a0c9568b5c920ed8 Mon Sep 17 00:00:00 2001 From: baldurk Date: Thu, 2 Feb 2023 11:46:19 +0000 Subject: [PATCH] Really fix compile error * I'm having a good day today. --- renderdoc/driver/vulkan/wrappers/vk_device_funcs.cpp | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/renderdoc/driver/vulkan/wrappers/vk_device_funcs.cpp b/renderdoc/driver/vulkan/wrappers/vk_device_funcs.cpp index 7881963c3..fc0d383ca 100644 --- a/renderdoc/driver/vulkan/wrappers/vk_device_funcs.cpp +++ b/renderdoc/driver/vulkan/wrappers/vk_device_funcs.cpp @@ -52,6 +52,15 @@ static VkApplicationInfo renderdocAppInfo = { VK_API_VERSION_1_0, }; +static bool equivalent(const VkQueueFamilyProperties &a, const VkQueueFamilyProperties &b) +{ + return a.timestampValidBits == b.timestampValidBits && + a.minImageTransferGranularity.width == b.minImageTransferGranularity.width && + a.minImageTransferGranularity.height == b.minImageTransferGranularity.height && + a.minImageTransferGranularity.depth == b.minImageTransferGranularity.depth && + a.queueFlags == b.queueFlags; +} + // we store the index in the loader table, since it won't be dereferenced and other parts of the // code expect to copy it into a wrapped object static VkPhysicalDevice MakePhysicalDeviceHandleFromIndex(uint32_t physDeviceIndex) @@ -1869,7 +1878,7 @@ bool WrappedVulkan::Serialise_vkCreateDevice(SerialiserType &ser, VkPhysicalDevi // ensure the remapped queue family is at least as good as it was at capture time. uint32_t destFamily = 0; - if(origQIndex < queueProps.size() && origprops[origQIndex] == queueProps[origQIndex]) + if(origQIndex < queueProps.size() && equivalent(origprops[origQIndex], queueProps[origQIndex])) { destFamily = origQIndex; RDCLOG(" (identity match)");