From 640e2eddea1cf1a7526c2ae8a6caab803d012c0d Mon Sep 17 00:00:00 2001 From: Collabora's Gfx CI Team Date: Sat, 19 Jul 2025 00:09:36 +0000 Subject: [PATCH] Uprev ANGLE to 995c4c4d89ed6a5c28b210e9c0f83eb4f8b6e2f5 https://github.com/google/angle/compare/6a04a50f98cac71b25464d10289ce7a013841caf...995c4c4d89ed6a5c28b210e9c0f83eb4f8b6e2f5 - Skip tests failing on all drivers due to a CTS bug - Disable clang options not supported by the 'unbundled' toolchain Signed-off-by: Guilherme Gallo Part-of: --- .gitlab-ci/angle-skips.txt | 9 ++++ .gitlab-ci/conditional-build-image-tags.yml | 2 +- .gitlab-ci/container/build-angle.sh | 4 +- .gitlab-ci/image-tags.yml | 4 +- src/amd/ci/angle-radv-stoney-fails.txt | 52 --------------------- src/freedreno/ci/freedreno-a618-fails.txt | 52 --------------------- src/freedreno/ci/freedreno-a660-fails.txt | 52 --------------------- src/freedreno/ci/freedreno-a750-fails.txt | 52 --------------------- src/intel/ci/angle-anv-adl-fails.txt | 52 --------------------- src/intel/ci/angle-anv-jsl-fails.txt | 52 --------------------- src/intel/ci/angle-anv-tgl-fails.txt | 52 --------------------- 11 files changed, 15 insertions(+), 368 deletions(-) diff --git a/.gitlab-ci/angle-skips.txt b/.gitlab-ci/angle-skips.txt index 4ccedad2fd5..480c7e9555a 100644 --- a/.gitlab-ci/angle-skips.txt +++ b/.gitlab-ci/angle-skips.txt @@ -5,3 +5,12 @@ dEQP-GLES3.functional.transform_feedback.random.* dEQP-GLES31.functional.program_interface_query.transform_feedback_varying.*_array_element dEQP-GLES31.functional.program_interface_query.transform_feedback_varying.type.*.array.* KHR-GLES31.core.program_interface_query.transform-feedback-types + +# CTS bug - https://gerrit.khronos.org/c/vk-gl-cts/+/17901 +# https://issues.angleproject.org/issues/436377594#comment6 +dEQP-GLES31.functional.debug.negative_coverage.log.advanced_blend.attachment_advanced_equation +dEQP-GLES31.functional.debug.negative_coverage.log.advanced_blend.blend_qualifier_mismatch +dEQP-GLES31.functional.debug.negative_coverage.log.compute.invalid_program_query +dEQP-GLES31.functional.debug.negative_coverage.log.shader.link_program +dEQP-GLES31.functional.debug.negative_coverage.log.shader.use_program +dEQP-GLES31.functional.debug.negative_coverage.log.tessellation.single_tessellation_stage diff --git a/.gitlab-ci/conditional-build-image-tags.yml b/.gitlab-ci/conditional-build-image-tags.yml index 1d921a2df15..64ae288aeb7 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: b0f48de11f870c340c4c4ad4ac2b8f13 - CONDITIONAL_BUILD_ANGLE_TAG: 9aaedd74072834a3c553656b6ddc17a7 + CONDITIONAL_BUILD_ANGLE_TAG: a605063a7e800eb28e3cbd5f73650a3f CONDITIONAL_BUILD_CROSVM_TAG: 4079babd375b09761d59eacb25a0598a CONDITIONAL_BUILD_FLUSTER_TAG: 7c6f5e2af781cd4e39358500c1549541 CONDITIONAL_BUILD_PIGLIT_TAG: 3dec1e03175e4cca1f644435e4e479d5 diff --git a/.gitlab-ci/container/build-angle.sh b/.gitlab-ci/container/build-angle.sh index ef1b56c663b..dfa1e14bb25 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="6a04a50f98cac71b25464d10289ce7a013841caf" +ANGLE_REV="995c4c4d89ed6a5c28b210e9c0f83eb4f8b6e2f5" DEPOT_REV="5982a1aeb33dc36382ed8c62eddf52a6135e7dd3" # Set ANGLE_ARCH based on DEBIAN_ARCH if it hasn't been explicitly defined @@ -107,6 +107,8 @@ case "$ANGLE_TARGET" in linux) cat >> out/Release/args.gn <