From e8a9b4571ea32ec93687f267e4f8f9b49b5deb2b Mon Sep 17 00:00:00 2001 From: Collabora's Gfx CI Team Date: Thu, 24 Apr 2025 00:09:19 +0000 Subject: [PATCH] Uprev ANGLE to 3540a326ec8497700523eb2d3eca90ae21806e8e https://github.com/google/angle/compare/f355e2b37ed43939e2753fc7dacccf75abb4c1a3...3540a326ec8497700523eb2d3eca90ae21806e8e Part-of: --- .gitlab-ci/conditional-build-image-tags.yml | 2 +- .gitlab-ci/container/build-angle.sh | 2 +- .gitlab-ci/image-tags.yml | 4 +-- src/freedreno/ci/freedreno-a660-fails.txt | 30 ---------------- src/freedreno/ci/freedreno-a750-fails.txt | 39 --------------------- 5 files changed, 4 insertions(+), 73 deletions(-) diff --git a/.gitlab-ci/conditional-build-image-tags.yml b/.gitlab-ci/conditional-build-image-tags.yml index f8f40036447..ccc0161970f 100644 --- a/.gitlab-ci/conditional-build-image-tags.yml +++ b/.gitlab-ci/conditional-build-image-tags.yml @@ -1,5 +1,5 @@ variables: - CONDITIONAL_BUILD_ANGLE_TAG: 384145a4023315dae658259bee07c43a + CONDITIONAL_BUILD_ANGLE_TAG: 5a8f4bff2489a7c0a9331250d4fb6960 CONDITIONAL_BUILD_CROSVM_TAG: bb7f75d912ef43be8c9204385d79820a CONDITIONAL_BUILD_FLUSTER_TAG: f1af06c34ccdbb5b44f78adaeb63603c CONDITIONAL_BUILD_PIGLIT_TAG: 6d869cd388a6ecd3d1ee246056bb796a diff --git a/.gitlab-ci/container/build-angle.sh b/.gitlab-ci/container/build-angle.sh index e6dd7882c3e..3e2f10cc502 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="f355e2b37ed43939e2753fc7dacccf75abb4c1a3" +ANGLE_REV="3540a326ec8497700523eb2d3eca90ae21806e8e" 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 90884e1d31a..3932fc25ec4 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -23,8 +23,8 @@ variables: DEBIAN_BUILD_TAG: "20250422-ci-fairy" - DEBIAN_TEST_ANDROID_TAG: "20250502-depot-57" - DEBIAN_TEST_GL_TAG: "20250505-piglit-14" + DEBIAN_TEST_ANDROID_TAG: "20250506-angle-35" + DEBIAN_TEST_GL_TAG: "20250506-angle-35" DEBIAN_TEST_VIDEO_TAG: "20250503-fluster" DEBIAN_TEST_VK_TAG: "20250505-piglit-14" diff --git a/src/freedreno/ci/freedreno-a660-fails.txt b/src/freedreno/ci/freedreno-a660-fails.txt index d682d7726a0..1de0d5c8273 100644 --- a/src/freedreno/ci/freedreno-a660-fails.txt +++ b/src/freedreno/ci/freedreno-a660-fails.txt @@ -87,28 +87,9 @@ program@execute@vector-conversion,Fail angle-KHR-GLES3.clip_distance.coverage,Fail angle-KHR-GLES3.cull_distance.functional,Fail angle-KHR-GLES3.texture_lod_basic.lod_selection,Fail -angle-dEQP-GLES2.functional.fragment_ops.interaction.basic_shader.25,Fail -angle-dEQP-GLES2.functional.fragment_ops.interaction.basic_shader.29,Fail -angle-dEQP-GLES2.functional.fragment_ops.interaction.basic_shader.85,Fail -angle-dEQP-GLES2.functional.fragment_ops.interaction.basic_shader.98,Fail -angle-dEQP-GLES2.functional.fragment_ops.random.22,Fail -angle-dEQP-GLES2.functional.fragment_ops.random.40,Fail -angle-dEQP-GLES2.functional.fragment_ops.random.55,Fail -angle-dEQP-GLES2.functional.fragment_ops.random.69,Fail -angle-dEQP-GLES2.functional.fragment_ops.random.86,Fail angle-dEQP-GLES2.functional.shaders.algorithm.rgb_to_hsl_vertex,Fail angle-dEQP-GLES2.functional.texture.mipmap.cube.projected.nearest_linear,Fail -angle-dEQP-GLES3.functional.fragment_ops.interaction.basic_shader.28,Fail -angle-dEQP-GLES3.functional.fragment_ops.random.53,Fail -angle-dEQP-GLES3.functional.fragment_ops.random.55,Fail -angle-dEQP-GLES3.functional.fragment_ops.random.61,Fail -angle-dEQP-GLES3.functional.fragment_ops.random.69,Fail angle-dEQP-GLES31.functional.texture.border_clamp.range_clamp.linear_float_color,Fail -angle-multisample-dEQP-GLES3.functional.fragment_ops.interaction.basic_shader.28,Fail -angle-multisample-dEQP-GLES3.functional.fragment_ops.random.53,Fail -angle-multisample-dEQP-GLES3.functional.fragment_ops.random.55,Fail -angle-multisample-dEQP-GLES3.functional.fragment_ops.random.61,Fail -angle-multisample-dEQP-GLES3.functional.fragment_ops.random.69,Fail # GPU hangs with ANGLE 2025-02-12, were passing with ANGLE 2024-10-17 angle-dEQP-GLES31.functional.ssbo.layout.single_basic_type.packed.row_major_highp_mat3,Crash @@ -163,14 +144,3 @@ angle-dEQP-GLES31.functional.tessellation.user_defined_io.per_patch_block.vertex angle-dEQP-GLES31.functional.tessellation.user_defined_io.per_patch_block_array.vertex_io_array_size_query.quads,Crash angle-dEQP-GLES31.functional.tessellation.user_defined_io.per_vertex_block.vertex_io_array_size_implicit.quads_explicit_tcs_out_size,Crash angle-dEQP-GLES31.functional.tessellation.user_defined_io.per_vertex_block.vertex_io_array_size_shader_builtin.quads_explicit_tcs_out_size,Crash - -# Turnip regression in https://gitlab.freedesktop.org/mesa/mesa/-/compare/e210b79ce3932f7fb1387d68a4cad495b77746f4...5ad00bae8b39b3731efc694d01470156b6fa7594 -angle-dEQP-GLES2.functional.fragment_ops.interaction.basic_shader.7,Fail -angle-dEQP-GLES2.functional.fragment_ops.interaction.basic_shader.93,Fail -angle-dEQP-GLES2.functional.fragment_ops.interaction.basic_shader.94,Fail -angle-dEQP-GLES2.functional.fragment_ops.random.18,Fail -angle-dEQP-GLES3.functional.fragment_ops.interaction.basic_shader.45,Fail -angle-dEQP-GLES3.functional.fragment_ops.random.18,Fail -angle-multisample-dEQP-GLES3.functional.fragment_ops.interaction.basic_shader.45,Fail -angle-multisample-dEQP-GLES3.functional.fragment_ops.random.18,Fail - diff --git a/src/freedreno/ci/freedreno-a750-fails.txt b/src/freedreno/ci/freedreno-a750-fails.txt index 0ea88164433..e22ce7d5fa6 100644 --- a/src/freedreno/ci/freedreno-a750-fails.txt +++ b/src/freedreno/ci/freedreno-a750-fails.txt @@ -105,45 +105,6 @@ program@execute@builtin@builtin-float-nextafter-1.0.generated@nextafter float8,F angle-KHR-GLES3.clip_distance.coverage,Fail angle-KHR-GLES3.cull_distance.functional,Fail angle-KHR-GLES3.texture_lod_basic.lod_selection,Fail -angle-dEQP-GLES2.functional.fragment_ops.interaction.basic_shader.25,Fail -angle-dEQP-GLES2.functional.fragment_ops.interaction.basic_shader.29,Fail -angle-dEQP-GLES2.functional.fragment_ops.interaction.basic_shader.85,Fail -angle-dEQP-GLES2.functional.fragment_ops.interaction.basic_shader.98,Fail -angle-dEQP-GLES2.functional.fragment_ops.random.22,Fail -angle-dEQP-GLES2.functional.fragment_ops.random.40,Fail -angle-dEQP-GLES2.functional.fragment_ops.random.55,Fail -angle-dEQP-GLES2.functional.fragment_ops.random.69,Fail -angle-dEQP-GLES2.functional.fragment_ops.random.86,Fail angle-dEQP-GLES2.functional.shaders.algorithm.rgb_to_hsl_vertex,Fail angle-dEQP-GLES2.functional.texture.mipmap.cube.projected.nearest_linear,Fail -angle-dEQP-GLES3.functional.fragment_ops.interaction.basic_shader.28,Fail -angle-dEQP-GLES3.functional.fragment_ops.random.53,Fail -angle-dEQP-GLES3.functional.fragment_ops.random.55,Fail -angle-dEQP-GLES3.functional.fragment_ops.random.61,Fail -angle-dEQP-GLES3.functional.fragment_ops.random.69,Fail angle-dEQP-GLES31.functional.texture.border_clamp.range_clamp.linear_float_color,Fail -angle-multisample-dEQP-GLES3.functional.fragment_ops.interaction.basic_shader.28,Fail -angle-multisample-dEQP-GLES3.functional.fragment_ops.random.53,Fail -angle-multisample-dEQP-GLES3.functional.fragment_ops.random.55,Fail -angle-multisample-dEQP-GLES3.functional.fragment_ops.random.61,Fail -angle-multisample-dEQP-GLES3.functional.fragment_ops.random.69,Fail - -# Turnip regression in https://gitlab.freedesktop.org/mesa/mesa/-/compare/e210b79ce3932f7fb1387d68a4cad495b77746f4...5ad00bae8b39b3731efc694d01470156b6fa7594 -angle-dEQP-GLES2.functional.fragment_ops.interaction.basic_shader.19,Fail -angle-dEQP-GLES2.functional.fragment_ops.interaction.basic_shader.7,Fail -angle-dEQP-GLES2.functional.fragment_ops.interaction.basic_shader.93,Fail -angle-dEQP-GLES2.functional.fragment_ops.interaction.basic_shader.94,Fail -angle-dEQP-GLES2.functional.fragment_ops.random.18,Fail -angle-dEQP-GLES2.functional.fragment_ops.random.60,Fail -angle-dEQP-GLES2.functional.fragment_ops.random.62,Fail -angle-dEQP-GLES3.functional.fragment_ops.interaction.basic_shader.45,Fail -angle-dEQP-GLES3.functional.fragment_ops.random.11,Fail -angle-dEQP-GLES3.functional.fragment_ops.random.18,Fail -angle-dEQP-GLES3.functional.fragment_ops.random.60,Fail -angle-dEQP-GLES3.functional.fragment_ops.random.62,Fail -angle-multisample-dEQP-GLES3.functional.fragment_ops.interaction.basic_shader.45,Fail -angle-multisample-dEQP-GLES3.functional.fragment_ops.random.11,Fail -angle-multisample-dEQP-GLES3.functional.fragment_ops.random.18,Fail -angle-multisample-dEQP-GLES3.functional.fragment_ops.random.60,Fail -angle-multisample-dEQP-GLES3.functional.fragment_ops.random.62,Fail -