From 297f6f5c400af3b61d783cb4ce08b4798366edfc Mon Sep 17 00:00:00 2001 From: Matthew Netsch Date: Fri, 29 Jul 2022 10:43:14 -0700 Subject: [PATCH] Fix Api version check with loaders Loaders return instance version that they support, which may be greater than version ICDs support. Change version check to use device version instead of instance version for the purposes of verifying if this version of CTS is legal to be used with the ICD. Components: Vulkan VK-GL-CTS Issue: 3863 Affects: * dEQP-VK.api.version_check.version Change-Id: I57e9a4aeee0ebda3fee1396c780d03941959ba6f --- external/vulkancts/modules/vulkan/api/vktApiVersionCheck.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/external/vulkancts/modules/vulkan/api/vktApiVersionCheck.cpp b/external/vulkancts/modules/vulkan/api/vktApiVersionCheck.cpp index fd6a767..e5baf0e 100644 --- a/external/vulkancts/modules/vulkan/api/vktApiVersionCheck.cpp +++ b/external/vulkancts/modules/vulkan/api/vktApiVersionCheck.cpp @@ -87,9 +87,7 @@ public: log << tcu::TestLog::Message << "deviceVersion: " << deviceVersion << tcu::TestLog::EndMessage; log << tcu::TestLog::Message << "usedApiVersion: " << usedApiVersion << tcu::TestLog::EndMessage; - if (instanceVersion.majorNum > maxVulkanVersion.majorNum || instanceVersion.minorNum > maxVulkanVersion.minorNum) - return tcu::TestStatus::fail(de::toString("This version of CTS does not support a Vulkan instance with version ") + instanceVersionString); - else if (deviceVersion.majorNum > maxVulkanVersion.majorNum || deviceVersion.minorNum > maxVulkanVersion.minorNum) + if (deviceVersion.majorNum > maxVulkanVersion.majorNum || deviceVersion.minorNum > maxVulkanVersion.minorNum) return tcu::TestStatus::fail(de::toString("This version of CTS does not support Vulkan device version ") + deviceVersionString); else return tcu::TestStatus::pass(usedApiVersionString); -- 2.7.4