diff --git a/.gitlab-ci/container/build-deqp.sh b/.gitlab-ci/container/build-deqp.sh index f1fc674382b..a04d50d6611 100644 --- a/.gitlab-ci/container/build-deqp.sh +++ b/.gitlab-ci/container/build-deqp.sh @@ -55,6 +55,8 @@ vk_cts_patch_files=( # e7e7c4ff1b8a3c6f25527c82e92f67a9a7c49481 # patch because it doesn't backport cleanly build-deqp-vk_Fix-for-render_to_image-exceeding-maxResourceSize.patch + # Fix for modifiers test + 0001-Add-check-for-import-export-bits-for-vk-modifier-tes.patch ) if [ "${DEQP_TARGET}" = 'android' ]; then diff --git a/.gitlab-ci/container/patches/0001-Add-check-for-import-export-bits-for-vk-modifier-tes.patch b/.gitlab-ci/container/patches/0001-Add-check-for-import-export-bits-for-vk-modifier-tes.patch new file mode 100644 index 00000000000..5601a69f8f6 --- /dev/null +++ b/.gitlab-ci/container/patches/0001-Add-check-for-import-export-bits-for-vk-modifier-tes.patch @@ -0,0 +1,28 @@ +From f267a15f43ba7aded2d86dc6533105d5a92aa552 Mon Sep 17 00:00:00 2001 +From: Lucas Fryzek +Date: Thu, 14 Mar 2024 10:51:50 -0400 +Subject: [PATCH] Add check for import & export bits for vk modifier tests + +--- + .../vulkancts/modules/vulkan/modifiers/vktModifiersTests.cpp | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/external/vulkancts/modules/vulkan/modifiers/vktModifiersTests.cpp b/external/vulkancts/modules/vulkan/modifiers/vktModifiersTests.cpp +index daec05da2..2206eef14 100644 +--- a/external/vulkancts/modules/vulkan/modifiers/vktModifiersTests.cpp ++++ b/external/vulkancts/modules/vulkan/modifiers/vktModifiersTests.cpp +@@ -167,7 +167,10 @@ bool verifyHandleTypeForFormatModifier (const InstanceInterface& vki, + if (vki.getPhysicalDeviceImageFormatProperties2(physicalDevice, &imageFormatInfo, &imageProperties) == VK_ERROR_FORMAT_NOT_SUPPORTED) + return false; + +- if ((externalImageProperties.externalMemoryProperties.compatibleHandleTypes & handleType) != handleType) ++ ++ vk::VkExternalMemoryFeatureFlags required_bits = VK_EXTERNAL_MEMORY_FEATURE_EXPORTABLE_BIT | VK_EXTERNAL_MEMORY_FEATURE_IMPORTABLE_BIT; ++ if ((externalImageProperties.externalMemoryProperties.compatibleHandleTypes & handleType) != handleType || ++ !((externalImageProperties.externalMemoryProperties.externalMemoryFeatures & required_bits) == required_bits)) + return false; + + return true; +-- +2.44.0 + diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml index 0d45ddaf88c..f747924901e 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -25,9 +25,9 @@ variables: DEBIAN_X86_64_TEST_ANDROID_IMAGE_PATH: "debian/x86_64_test-android" DEBIAN_X86_64_TEST_ANDROID_TAG: "20240401-wlproto" - DEBIAN_X86_64_TEST_GL_TAG: "20240401-wlproto" - DEBIAN_X86_64_TEST_VK_TAG: "20240401-vkcts-rti" - KERNEL_ROOTFS_TAG: "20240401-vkcts-rti" + DEBIAN_X86_64_TEST_GL_TAG: "20240403-ninetests" + DEBIAN_X86_64_TEST_VK_TAG: "20240403-runner" + KERNEL_ROOTFS_TAG: "20240403-runner" ALPINE_X86_64_BUILD_TAG: "20240401-wlproto" ALPINE_X86_64_LAVA_SSH_TAG: "20240401-wlproto"