Module: Mesa Branch: main Commit: dcc4e1b4d78bf964f001d6b8b907ab7ac263fb87 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=dcc4e1b4d78bf964f001d6b8b907ab7ac263fb87
Author: Samuel Pitoiset <samuel.pitoi...@gmail.com> Date: Mon Oct 30 14:29:05 2023 +0100 ci: backport two mesh/task query fixes for VKCTS RADV would need these fixes to avoid skipping a ton of tests. Signed-off-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25953> --- .gitlab-ci/container/build-deqp.sh | 5 +++++ .gitlab-ci/image-tags.yml | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci/container/build-deqp.sh b/.gitlab-ci/container/build-deqp.sh index 949685e7492..f92da36f458 100644 --- a/.gitlab-ci/container/build-deqp.sh +++ b/.gitlab-ci/container/build-deqp.sh @@ -26,6 +26,11 @@ pushd /VK-GL-CTS # patches. cts_commits_to_backport=( + # Take multiview into account for task shader inv. stats + db6a4697c28f46da967bcc982c018d09aef2c742 + + # Remove illegal mesh shader query tests + 8fc585d85cd13fae9c2ff3eb407ee7e56281a016 ) for commit in "${cts_commits_to_backport[@]}" diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml index 6904d3caaf5..8b257a527b1 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -18,14 +18,14 @@ variables: DEBIAN_X86_64_TEST_IMAGE_VK_PATH: "debian/x86_64_test-vk" DEBIAN_X86_64_TEST_ANDROID_IMAGE_PATH: "debian/x86_64_test-android" - DEBIAN_X86_64_TEST_ANDROID_TAG: "2023-10-30-ci-improv" - DEBIAN_X86_64_TEST_GL_TAG: "2023-10-30-ci-improv" - DEBIAN_X86_64_TEST_VK_TAG: "2023-10-30-ci-improv" + DEBIAN_X86_64_TEST_ANDROID_TAG: "2023-10-31-deqp" + DEBIAN_X86_64_TEST_GL_TAG: "2023-10-31-deqp" + DEBIAN_X86_64_TEST_VK_TAG: "2023-10-31-deqp" ALPINE_X86_64_BUILD_TAG: "2023-10-30-ci-improv" ALPINE_X86_64_LAVA_SSH_TAG: "2023-06-26-first-version" FEDORA_X86_64_BUILD_TAG: "2023-10-30-ci-improv" - KERNEL_ROOTFS_TAG: "2023-10-31-virglrenderer" + KERNEL_ROOTFS_TAG: "2023-11-02-deqp" KERNEL_TAG: "v6.4.12-for-mesa-ci-f6b4ad45f48d" WINDOWS_X64_VS_PATH: "windows/x64_vs"
