From e46605c10900e30742c64576551782f962034363 Mon Sep 17 00:00:00 2001 From: David Heidelberg Date: Fri, 10 May 2024 13:46:16 -0700 Subject: [PATCH] ci/deqp: correct EGL_EXT_config_select_group detection It's now a display extension, not an client one. Signed-off-by: David Heidelberg Part-of: (cherry picked from commit 9f42a34625bdd0f246afd47a5fa126788a40321e) --- .gitlab-ci/container/build-deqp.sh | 2 + ..._config_select_group-extension-query.patch | 45 +++++++++++++++++++ .gitlab-ci/image-tags.yml | 4 +- .pick_status.json | 2 +- 4 files changed, 50 insertions(+), 3 deletions(-) create mode 100644 .gitlab-ci/container/patches/build-deqp-egl_Correct-EGL_EXT_config_select_group-extension-query.patch diff --git a/.gitlab-ci/container/build-deqp.sh b/.gitlab-ci/container/build-deqp.sh index c496407c1d1..df141982f94 100644 --- a/.gitlab-ci/container/build-deqp.sh +++ b/.gitlab-ci/container/build-deqp.sh @@ -70,6 +70,8 @@ gles_cts_commits_to_backport=( # 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 new file mode 100644 index 00000000000..7839b0e5589 --- /dev/null +++ b/.gitlab-ci/container/patches/build-deqp-egl_Correct-EGL_EXT_config_select_group-extension-query.patch @@ -0,0 +1,45 @@ +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 f06101e4dd9..ea387a0e563 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: "20240423-deqp" - DEBIAN_X86_64_TEST_GL_TAG: "20240423-deqp" + DEBIAN_X86_64_TEST_GL_TAG: "20240514-egltrans241" DEBIAN_X86_64_TEST_VK_TAG: "20240423-deqp" - KERNEL_ROOTFS_TAG: "20240423-deqp" + KERNEL_ROOTFS_TAG: "20240514-egltrans241" ALPINE_X86_64_BUILD_TAG: "20240412-pycparser" ALPINE_X86_64_LAVA_SSH_TAG: "20240401-wlproto" diff --git a/.pick_status.json b/.pick_status.json index 0a039462739..97589f0dd36 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -2634,7 +2634,7 @@ "description": "ci/deqp: correct EGL_EXT_config_select_group detection", "nominated": false, "nomination_type": 3, - "resolution": 4, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null