vulkan-cts: allow vulkan versions > 1.3
PATCH 1/1 vulkan-cts: allow vulkan versions > 1.3
From: Randolph Sapp <[email protected]>
Backport a patch from upstream that allows vulkan-cts to work with Vulkan version greater than 1.3. Previously any unknown Vulkan versions will return 0 when we attempt to locate the minimum version with minVulkanAPIVersion.
Signed-off-by Randolph Sapp <[email protected]>
---
Note: This patch went out on August 6th, but it was missing the PATCH tag. Didn't catch that until just now. Sorry.
...e-CTS-with-unknown-versions-of-Vulka.patch | 41 +++++++++++++++++++ .../vk-gl-cts/vulkan-cts_1.3.7.3.bb | 1 + 2 files changed, 42 insertions(+) create mode 100644 meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts/0001-Allow-running-the-CTS-with-unknown-versions-of-Vulka.patch
meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts/0001-Allow-running-the-CTS-with-unknown-versions-of-Vulka.patch new file +41 -0
@@ -0,0 +1,41 @@ +From 954b523a998933b1edbe9af3fe7b1c74595cf148 Mon Sep 17 00:00:00 2001 +From: Lorenzo Dal Col <[email protected]> +Date: Tue, 17 Sep 2024 17:18:20 +0200 +Subject: [PATCH] Allow running the CTS with unknown versions of Vulkan in the + driver + +This will default to VK_API_MAX_FRAMEWORK_VERSION, which at this time is 1.3.x. +VK-GL-CTS issue: 5165 +Components: Framework, Vulkan +Affects: None + +Change-Id: I954d0144db9ff5f3848c81df61dd263505b17ac2 +Upstream-Status: Backport [https://github.com/KhronosGroup/VK-GL-CTS/commit/609c09b3163d86d7e4819fbfc00a616e364f14f0] +Signed-off-by: Randolph Sapp <[email protected]> +--- + external/vulkancts/framework/vulkan/vkApiVersion.cpp | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/external/vulkancts/framework/vulkan/vkApiVersion.cpp b/external/vulkancts/framework/vulkan/vkApiVersion.cpp +index d996cb0e6..8720df52a 100644 +--- a/external/vulkancts/framework/vulkan/vkApiVersion.cpp ++++ b/external/vulkancts/framework/vulkan/vkApiVersion.cpp +@@ -134,7 +134,14 @@ deUint32 minVulkanAPIVersion(deUint32 lhs, deUint32 rhs) + for (auto it = begin(commonPredecessors); it != end(commonPredecessors); ++it) + if (isApiVersionPredecessor(rhs, *it) && isApiVersionPredecessor(lhs, *it)) + return *it; +- return 0; ++ ++#ifndef CTS_USES_VULKANSC ++ // If we got to this point, it means we are dealing with an unknown version. ++ // We assume it to be valid, and we default to VK_API_MAX_FRAMEWORK_VERSION which is generated from the spec. ++ return VK_API_MAX_FRAMEWORK_VERSION; ++#else ++ return VKSC_API_MAX_FRAMEWORK_VERSION; ++#endif + } + + } // vk +-- +2.50.1 +
meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts_1.3.7.3.bb +1 -0
@@ -19,6 +19,7 @@ SRCREV_video-parser = "138bbe048221d315962ddf8413aa6a08cc62a381" SRC_URI += "file://0001-cmake-Define-WAYLAND_SCANNER-and-WAYLAND_PROTOCOLS_D.patch \ file://0001-vulkan-cts-include-missing-cstdint.patch \ + file://0001-Allow-running-the-CTS-with-unknown-versions-of-Vulka.patch \ " TOOLCHAIN = "gcc"
Signature · 1 line
2.50.1