From acd53cba7202f05942cf99d1039e99a1407fb82e Mon Sep 17 00:00:00 2001 From: baldurk Date: Thu, 2 Jul 2020 18:14:34 +0100 Subject: [PATCH] Fix unsigned/signed comparison with new VK_MAKE_VERSION --- renderdoc/driver/vulkan/vk_dispatchtables.h | 2 +- .../driver/vulkan/wrappers/vk_device_funcs.cpp | 17 ++++++++--------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/renderdoc/driver/vulkan/vk_dispatchtables.h b/renderdoc/driver/vulkan/vk_dispatchtables.h index aacef4318..4eb4835da 100644 --- a/renderdoc/driver/vulkan/vk_dispatchtables.h +++ b/renderdoc/driver/vulkan/vk_dispatchtables.h @@ -44,7 +44,7 @@ struct InstanceDeviceInfo bool brokenGetDeviceProcAddr = false; - int vulkanVersion = VK_API_VERSION_1_0; + uint32_t vulkanVersion = VK_API_VERSION_1_0; DeclExts(); }; diff --git a/renderdoc/driver/vulkan/wrappers/vk_device_funcs.cpp b/renderdoc/driver/vulkan/wrappers/vk_device_funcs.cpp index f570e2488..e16c8ae72 100644 --- a/renderdoc/driver/vulkan/wrappers/vk_device_funcs.cpp +++ b/renderdoc/driver/vulkan/wrappers/vk_device_funcs.cpp @@ -386,11 +386,10 @@ ReplayStatus WrappedVulkan::Initialise(VkInitParams ¶ms, uint64_t sectionVer VkResult ret = GetInstanceDispatchTable(NULL)->CreateInstance(&instinfo, NULL, &m_Instance); #undef CheckExt -#define CheckExt(name, ver) \ - if(!strcmp(instinfo.ppEnabledExtensionNames[i], "VK_" #name) || \ - (int)renderdocAppInfo.apiVersion >= ver) \ - { \ - m_EnabledExtensions.ext_##name = true; \ +#define CheckExt(name, ver) \ + if(!strcmp(instinfo.ppEnabledExtensionNames[i], "VK_" #name) || renderdocAppInfo.apiVersion >= ver) \ + { \ + m_EnabledExtensions.ext_##name = true; \ } for(uint32_t i = 0; i < instinfo.enabledExtensionCount; i++) @@ -3038,10 +3037,10 @@ bool WrappedVulkan::Serialise_vkCreateDevice(SerialiserType &ser, VkPhysicalDevi CheckDeviceExts(); #undef CheckExt -#define CheckExt(name, ver) \ - if(!strcmp(createInfo.ppEnabledExtensionNames[i], "VK_" #name) || (int)physProps.apiVersion >= ver) \ - { \ - m_EnabledExtensions.ext_##name = true; \ +#define CheckExt(name, ver) \ + if(!strcmp(createInfo.ppEnabledExtensionNames[i], "VK_" #name) || physProps.apiVersion >= ver) \ + { \ + m_EnabledExtensions.ext_##name = true; \ } for(uint32_t i = 0; i < createInfo.enabledExtensionCount; i++)