diff --git a/.gitlab-ci/container/build-deqp.sh b/.gitlab-ci/container/build-deqp.sh index d3151074c2f..a4cb991ad4b 100644 --- a/.gitlab-ci/container/build-deqp.sh +++ b/.gitlab-ci/container/build-deqp.sh @@ -17,8 +17,8 @@ set -ex -o pipefail # - the GLES release produces `deqp-gles*` and `deqp-egl` DEQP_VK_VERSION=1.3.8.2 -DEQP_GL_VERSION=4.6.4.0 -DEQP_GLES_VERSION=3.2.10.0 +DEQP_GL_VERSION=4.6.4.1 +DEQP_GLES_VERSION=3.2.10.1 # Patches to VulkanCTS may come from commits in their repo (listed in # cts_commits_to_backport) or patch files stored in our repo (in the patch @@ -67,14 +67,10 @@ fi # shellcheck disable=SC2034 # GLES builds also EGL gles_cts_commits_to_backport=( - # Implement support for the EGL_EXT_config_select_group extension - 88ba9ac270db5be600b1ecacbc6d9db0c55d5be4 ) # shellcheck disable=SC2034 gles_cts_patch_files=( - # Correct detection mechanism for EGL_EXT_config_select_group extension - build-deqp-egl_Correct-EGL_EXT_config_select_group-extension-query.patch ) if [ "${DEQP_TARGET}" = 'android' ]; then diff --git a/.gitlab-ci/container/patches/build-deqp-egl_Correct-EGL_EXT_config_select_group-extension-query.patch b/.gitlab-ci/container/patches/build-deqp-egl_Correct-EGL_EXT_config_select_group-extension-query.patch deleted file mode 100644 index 7839b0e5589..00000000000 --- a/.gitlab-ci/container/patches/build-deqp-egl_Correct-EGL_EXT_config_select_group-extension-query.patch +++ /dev/null @@ -1,45 +0,0 @@ -From cab41ed387c66a5e7f3454c547fc9ea53587ec1e Mon Sep 17 00:00:00 2001 -From: David Heidelberg -Date: Thu, 9 May 2024 14:08:59 -0700 -Subject: [PATCH] Correct EGL_EXT_config_select_group extension query - -EGL_EXT_config_select_group is a display extension, -not a client extension. - -Affects: -dEQP-EGL.functional.choose_config.simple.selection_and_sort.* - -Ref: https://github.com/KhronosGroup/EGL-Registry/pull/199 - -Fixes: 88ba9ac270db ("Implement support for the EGL_EXT_config_select_group extension") - -Change-Id: I38956511bdcb8e99d585ea9b99aeab53da0457e2 -Signed-off-by: David Heidelberg ---- - framework/egl/egluConfigInfo.cpp | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/framework/egl/egluConfigInfo.cpp b/framework/egl/egluConfigInfo.cpp -index 88c30fd65..10936055a 100644 ---- a/framework/egl/egluConfigInfo.cpp -+++ b/framework/egl/egluConfigInfo.cpp -@@ -129,7 +129,6 @@ void queryCoreConfigInfo (const Library& egl, EGLDisplay display, EGLConfig conf - void queryExtConfigInfo (const eglw::Library& egl, eglw::EGLDisplay display, eglw::EGLConfig config, ConfigInfo* dst) - { - const std::vector extensions = getDisplayExtensions(egl, display); -- const std::vector clientExtensions = getClientExtensions(egl); - - if (de::contains(extensions.begin(), extensions.end(), "EGL_EXT_yuv_surface")) - { -@@ -159,7 +158,7 @@ void queryExtConfigInfo (const eglw::Library& egl, eglw::EGLDisplay display, egl - else - dst->colorComponentType = EGL_COLOR_COMPONENT_TYPE_FIXED_EXT; - -- if (de::contains(clientExtensions.begin(), clientExtensions.end(), "EGL_EXT_config_select_group")) -+ if (hasExtension(egl, display, "EGL_EXT_config_select_group")) - { - egl.getConfigAttrib(display, config, EGL_CONFIG_SELECT_GROUP_EXT, (EGLint*)&dst->groupId); - --- -2.43.0 - diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml index ec424c8c986..689f39c8f92 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -28,9 +28,9 @@ variables: DEBIAN_X86_64_TEST_ANDROID_IMAGE_PATH: "debian/x86_64_test-android" DEBIAN_TEST_ANDROID_TAG: "20240423-deqp" - DEBIAN_TEST_GL_TAG: "20240531-piglit-cf" + DEBIAN_TEST_GL_TAG: "20240531-glcts" DEBIAN_TEST_VK_TAG: "20240531-piglit-cf" - KERNEL_ROOTFS_TAG: "20240531-piglit-cf" + KERNEL_ROOTFS_TAG: "20240531-glcts" ALPINE_X86_64_BUILD_TAG: "20240517-m0ld" ALPINE_X86_64_LAVA_SSH_TAG: "20240401-wlproto" diff --git a/src/gallium/drivers/zink/ci/zink-anv-tgl-fails.txt b/src/gallium/drivers/zink/ci/zink-anv-tgl-fails.txt index 7f83319fd7d..1a6bd50c826 100644 --- a/src/gallium/drivers/zink/ci/zink-anv-tgl-fails.txt +++ b/src/gallium/drivers/zink/ci/zink-anv-tgl-fails.txt @@ -600,8 +600,7 @@ KHR-GL46.sparse_texture_clamp_tests.SparseTextureClampLookupResidency,Crash # Error detected at x,y,z: expected [a] got [b] KHR-GL46.sparse_texture2_tests.SparseTexture2Commitment,Fail -# This one crashes in CI but just fails in other TGL machines. -KHR-GL46.sparse_texture2_tests.SparseTexture2Lookup,Crash +KHR-GL46.sparse_texture2_tests.SparseTexture2Lookup,Fail # uprev Piglit in Mesa spec@arb_shader_storage_buffer_object@max-ssbo-size@fs,Crash