From d8e9c669cb04a1e71adbefad83f92e163fd94ed1 Mon Sep 17 00:00:00 2001 From: Collabora's Gfx CI Team Date: Tue, 18 Nov 2025 00:08:28 +0000 Subject: [PATCH] Uprev ANGLE to ee05836a4934129527544385203ecf420afc5dd1 https://github.com/google/angle/compare/127a84404b88dbc4327ffb7f831a9a36c3b111bc...ee05836a4934129527544385203ecf420afc5dd1 Part-of: --- .gitlab-ci/conditional-build-image-tags.yml | 2 +- .gitlab-ci/container/build-angle.sh | 2 +- .gitlab-ci/image-tags.yml | 4 ++-- src/panfrost/ci/panfrost-g925-fails.txt | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci/conditional-build-image-tags.yml b/.gitlab-ci/conditional-build-image-tags.yml index c443867d5d3..2a1e260315a 100644 --- a/.gitlab-ci/conditional-build-image-tags.yml +++ b/.gitlab-ci/conditional-build-image-tags.yml @@ -1,6 +1,6 @@ variables: CONDITIONAL_BUILD_ANDROID_CTS_TAG: b018634d732f438027ec58c0383615e7 - CONDITIONAL_BUILD_ANGLE_TAG: efd57e99d51361944f87b9466356b0ce + CONDITIONAL_BUILD_ANGLE_TAG: a0d3f85744c545c13b349232ac3c513b CONDITIONAL_BUILD_CROSVM_TAG: 4c61f9707203afca91db3efeb57175db CONDITIONAL_BUILD_FLUSTER_TAG: e13f8521875ebd70e207ec0f6f3d3e5b CONDITIONAL_BUILD_PIGLIT_TAG: 21ab2c66f54777163dd038dc4cfcfde6 diff --git a/.gitlab-ci/container/build-angle.sh b/.gitlab-ci/container/build-angle.sh index 38d31386603..2b9e742621d 100755 --- a/.gitlab-ci/container/build-angle.sh +++ b/.gitlab-ci/container/build-angle.sh @@ -13,7 +13,7 @@ section_start angle "Building ANGLE" # setting up the environment variables locally ci_tag_build_time_check "ANGLE_TAG" -ANGLE_REV="127a84404b88dbc4327ffb7f831a9a36c3b111bc" +ANGLE_REV="ee05836a4934129527544385203ecf420afc5dd1" DEPOT_REV="5982a1aeb33dc36382ed8c62eddf52a6135e7dd3" # Set ANGLE_ARCH based on DEBIAN_ARCH if it hasn't been explicitly defined diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml index 94716eedb2e..d76255c6a5f 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -23,8 +23,8 @@ variables: DEBIAN_BUILD_TAG: "20250926-D3D618" DEBIAN_TEST_BASE_TAG: "20251203-virgl" - DEBIAN_TEST_ANDROID_TAG: "20251208-deqp" - DEBIAN_TEST_GL_TAG: "20251208-deqp" + DEBIAN_TEST_ANDROID_TAG: "20251211-angle-ee" + DEBIAN_TEST_GL_TAG: "20251211-angle-ee" DEBIAN_TEST_VIDEO_TAG: "20250813-vector" DEBIAN_TEST_VK_TAG: "20251208-deqp" diff --git a/src/panfrost/ci/panfrost-g925-fails.txt b/src/panfrost/ci/panfrost-g925-fails.txt index 27ba77229ef..3566bd31d31 100644 --- a/src/panfrost/ci/panfrost-g925-fails.txt +++ b/src/panfrost/ci/panfrost-g925-fails.txt @@ -10,3 +10,8 @@ angle-KHR-GLES31.core.shader_atomic_counters.advanced-usage-multi-stage,Fail angle-KHR-GLES31.core.shader_storage_buffer_object.advanced-matrix-vsfs,Fail angle-KHR-GLES31.core.shader_storage_buffer_object.advanced-usage-sync-vsfs,Fail angle-KHR-GLES31.core.texture_cube_map_array.sampling,Fail + +# deqp calls glCompressedTexImage2D with 0x8b90 which is GL_PALETTE4_RGB8_OES +# ANGLE now exposes paletted textures to ES2+, and there's a CTS bug caught by this +# https://gitlab.khronos.org/opengl/API/-/issues/278 +angle-dEQP-GLES2.functional.negative_api.texture.generatemipmap_zero_level_array_compressed,Fail