diff --git a/.gitlab-ci/conditional-build-image-tags.yml b/.gitlab-ci/conditional-build-image-tags.yml index ef0a1cfa1d5..ef653967bae 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: 2dfd3e288249e4776ef6866d34d344d4 - CONDITIONAL_BUILD_ANGLE_TAG: d72e5d2429eff42e341b1209dc2f5d97 + CONDITIONAL_BUILD_ANGLE_TAG: 09747e85cb75ce82b9302bf1cdb1fd58 CONDITIONAL_BUILD_CROSVM_TAG: 4c61f9707203afca91db3efeb57175db CONDITIONAL_BUILD_FLUSTER_TAG: e13f8521875ebd70e207ec0f6f3d3e5b CONDITIONAL_BUILD_PIGLIT_TAG: 8638cc6cab3840150257cabc88739579 diff --git a/.gitlab-ci/container/build-angle.sh b/.gitlab-ci/container/build-angle.sh index 13650883949..ab1ef226409 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="b90b9ee1a4f901e6ba9e649d8f6cf9098a944f50" +ANGLE_REV="599125448d7ad53b2868a7b5d2e3e8d3bfbc1717" DEPOT_REV="5982a1aeb33dc36382ed8c62eddf52a6135e7dd3" # Set ANGLE_ARCH based on DEBIAN_ARCH if it hasn't been explicitly defined @@ -145,8 +145,8 @@ fi # with our clang19 'unbundled' toolchain. See: # https://chromium.googlesource.com/chromium/src/build/+/39d42026/config/compiler/BUILD.gn#619 # https://chromium.googlesource.com/chromium/src/build/+/39d42026/config/compiler/BUILD.gn#1882 -sed -i 's/-fno-lifetime-dse//g' build/config/compiler/BUILD.gn -sed -i 's/-fsanitize-ignore-for-ubsan-feature=array-bounds//g' build/config/compiler/BUILD.gn +sed -i '/-fno-lifetime-dse/d' build/config/compiler/BUILD.gn +sed -i '/-fsanitize-ignore-for-ubsan-feature=/d' build/config/compiler/BUILD.gn ( # The 'unbundled' toolchain configuration requires clang, and it also needs to diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml index 78244e25676..41aa26752bf 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -23,8 +23,8 @@ variables: DEBIAN_BUILD_TAG: "20260309-D3D619" DEBIAN_TEST_BASE_TAG: "20260201-deqp-runner" - DEBIAN_TEST_ANDROID_TAG: "20260302-cuttlefish" - DEBIAN_TEST_GL_TAG: "20260313-piglit-d0" + DEBIAN_TEST_ANDROID_TAG: "20260317-angle-59" + DEBIAN_TEST_GL_TAG: "20260317-angle-59" DEBIAN_TEST_VIDEO_TAG: "20250813-vector" DEBIAN_TEST_VK_TAG: "20260310-vkd3d" diff --git a/src/intel/ci/angle-anv-jsl-fails.txt b/src/intel/ci/angle-anv-jsl-fails.txt index 7dd0903dc4f..71668615d67 100644 --- a/src/intel/ci/angle-anv-jsl-fails.txt +++ b/src/intel/ci/angle-anv-jsl-fails.txt @@ -3,8 +3,6 @@ dEQP-GLES2.functional.shaders.builtin_variable.fragcoord_xyz,Fail dEQP-GLES3.functional.shaders.builtin_variable.fragcoord_xyz,Fail multisample-dEQP-GLES3.functional.shaders.builtin_variable.fragcoord_xyz,Fail -dEQP-GLES3.functional.multisample.fbo_max_samples.constancy_sample_coverage_inverted,Fail - # ANGLE marks non-shadow linear-filtered textures incomplete (see GLES 3.2 spec # 8.17 Texture Completeness), so you get a fallback texture sample, while Mesa # incorrectly marks it complete. The CTS incorrectly expects texture