Fix api version comparison in vkCreateInstance() Fixed an issue that previously compared the version major of appApiVersion with the version minor of vk::API_VERSION. Change-Id: Id2daf8ae0c805d21d9bcf1c0232bce7bd6c1c9a7 Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/76868 Kokoro-Result: kokoro <noreply+kokoro@google.com> Reviewed-by: Shahbaz Youssefi <syoussefi@google.com> Reviewed-by: Geoff Lang <geofflang@google.com> Commit-Queue: Geoff Lang <geofflang@google.com> Tested-by: Geoff Lang <geofflang@google.com>
diff --git a/src/Vulkan/libVulkan.cpp b/src/Vulkan/libVulkan.cpp index 92619a9..c77d671 100644 --- a/src/Vulkan/libVulkan.cpp +++ b/src/Vulkan/libVulkan.cpp
@@ -585,11 +585,11 @@ } else { - if(VK_API_VERSION_MAJOR(appApiVersion) > VK_API_VERSION_MINOR(vk::API_VERSION)) + if(VK_API_VERSION_MAJOR(appApiVersion) > VK_API_VERSION_MAJOR(vk::API_VERSION)) { return VK_ERROR_INCOMPATIBLE_DRIVER; } - if((VK_API_VERSION_MAJOR(appApiVersion) == VK_API_VERSION_MINOR(vk::API_VERSION)) && + if((VK_API_VERSION_MAJOR(appApiVersion) == VK_API_VERSION_MAJOR(vk::API_VERSION)) && VK_API_VERSION_MINOR(appApiVersion) > VK_API_VERSION_MINOR(vk::API_VERSION)) { return VK_ERROR_INCOMPATIBLE_DRIVER; @@ -4778,7 +4778,7 @@ TRACE("(VkPhysicalDevice physicalDevice = %p, const VkPhysicalDeviceSurfaceInfo2KHR *pSurfaceInfo = %p, VkSurfaceCapabilities2KHR *pSurfaceCapabilities = %p)", physicalDevice, pSurfaceInfo, pSurfaceCapabilities); - if (pSurfaceInfo->surface != VK_NULL_HANDLE) + if(pSurfaceInfo->surface != VK_NULL_HANDLE) { return vk::Cast(pSurfaceInfo->surface)->getSurfaceCapabilities(pSurfaceInfo->pNext, &pSurfaceCapabilities->surfaceCapabilities, pSurfaceCapabilities->pNext); }