diff --git a/.gitlab-ci/container/build-angle.sh b/.gitlab-ci/container/build-angle.sh index acbad9eb904..75461b8d8cc 100755 --- a/.gitlab-ci/container/build-angle.sh +++ b/.gitlab-ci/container/build-angle.sh @@ -9,7 +9,7 @@ set -uex uncollapsed_section_start angle "Building ANGLE" -ANGLE_REV="76025caa1a059f464a2b0e8f879dbd4746f092b9" +ANGLE_REV="6abdc11741c4932e8e64ec055e67f556a7cbb5b1" # Set ANGLE_ARCH based on DEBIAN_ARCH if it hasn't been explicitly defined if [[ -z "${ANGLE_ARCH:-}" ]]; then diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml index 291d3f89b49..30a1673732b 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -30,10 +30,10 @@ variables: DEBIAN_ARM64_TEST_IMAGE_VK_PATH: "debian/arm64_test-vk" DEBIAN_X86_64_TEST_ANDROID_IMAGE_PATH: "debian/x86_64_test-android" - DEBIAN_TEST_ANDROID_TAG: "20250212-re-angle" + DEBIAN_TEST_ANDROID_TAG: "20250212-up-angle" DEBIAN_TEST_GL_TAG: "20250204-fix-deqp" DEBIAN_TEST_VK_TAG: "20250204-fix-deqp" - KERNEL_ROOTFS_TAG: "20250212-fix-angle" + KERNEL_ROOTFS_TAG: "20250212-up-angle" DEBIAN_PYUTILS_IMAGE: "debian/x86_64_pyutils" DEBIAN_PYUTILS_TAG: "20250129-lavacli" diff --git a/src/amd/ci/angle-radv-stoney-aco-fails.txt b/src/amd/ci/angle-radv-stoney-aco-fails.txt index 1b7fefc523d..a34418c894c 100644 --- a/src/amd/ci/angle-radv-stoney-aco-fails.txt +++ b/src/amd/ci/angle-radv-stoney-aco-fails.txt @@ -101,3 +101,6 @@ dEQP-GLES2.functional.fbo.render.recreate_colorbuffer.rebind_rbo_bgra_depth_comp dEQP-GLES2.functional.fbo.render.recreate_depthbuffer.rebind_rbo_bgra_depth_component16,Fail dEQP-GLES2.functional.fbo.render.resize.rbo_bgra_depth_component16,Fail dEQP-GLES2.functional.fbo.render.shared_colorbuffer.rbo_bgra_depth_component16,Fail + +# New failure with ANGLE 2025-02-12 +KHR-GLES3.framebuffer_blit.framebuffer_blit_functionality_multisampled_to_singlesampled_blit,Crash diff --git a/src/amd/ci/deqp-radv-stoney-angle-full.toml b/src/amd/ci/deqp-radv-stoney-angle-full.toml index 36b05cb030e..87ccb158db4 100644 --- a/src/amd/ci/deqp-radv-stoney-angle-full.toml +++ b/src/amd/ci/deqp-radv-stoney-angle-full.toml @@ -7,7 +7,7 @@ deqp_args = [ "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", "--deqp-gl-config-name=rgba8888d24s8ms0", ] -version_check = "GL ES 3.1" +version_check = "GL ES 3.2" renderer_check = "ANGLE.*RADV" [[deqp]] diff --git a/src/amd/ci/deqp-radv-stoney-angle.toml b/src/amd/ci/deqp-radv-stoney-angle.toml index 7bc91f2fa21..0fcb697b6be 100644 --- a/src/amd/ci/deqp-radv-stoney-angle.toml +++ b/src/amd/ci/deqp-radv-stoney-angle.toml @@ -8,7 +8,7 @@ deqp_args = [ "--deqp-gl-config-name=rgba8888d24s8ms0", ] fraction = 4 -version_check = "GL ES 3.1" +version_check = "GL ES 3.2" renderer_check = "ANGLE.*RADV" [[deqp]] diff --git a/src/intel/ci/angle-anv-adl-fails.txt b/src/intel/ci/angle-anv-adl-fails.txt index 768ad7ac03b..daa4738f11b 100644 --- a/src/intel/ci/angle-anv-adl-fails.txt +++ b/src/intel/ci/angle-anv-adl-fails.txt @@ -53,33 +53,3 @@ dEQP-GLES3.functional.fbo.completeness.renderable.renderbuffer.stencil.bgra,Fail # new failures with ANGLE 2024-10-17 KHR-GLES31.core.shader_image_load_store.basic-allTargets-loadStoreVS,Fail - -# Validation layer failure: -# https://docs.vulkan.org/spec/latest/chapters/resources.html#VUID-VkImageViewCreateInfo-pNext-01585 -# https://issues.angleproject.org/issues/382051956 -KHR-GLES31.core.shader_image_load_store.advanced-cast-cs,Crash -KHR-GLES31.core.shader_image_load_store.advanced-cast-fs,Crash -dEQP-GLES31.functional.image_load_store.2d.format_reinterpret.rgba8_r32f,Crash -dEQP-GLES31.functional.image_load_store.2d_array.format_reinterpret.rgba8_r32i,Crash -dEQP-GLES31.functional.image_load_store.2d_array.format_reinterpret.rgba8_rgba8ui,Crash -dEQP-GLES31.functional.image_load_store.3d.format_reinterpret.rgba8_rgba8i,Crash -dEQP-GLES31.functional.image_load_store.3d.format_reinterpret.rgba8_rgba8ui,Crash -dEQP-GLES31.functional.image_load_store.cube.format_reinterpret.rgba8_rgba8_snorm,Crash -dEQP-GLES31.functional.image_load_store.cube.format_reinterpret.rgba8_rgba8ui,Crash -dEQP-GLES31.functional.image_load_store.2d.format_reinterpret.rgba8_r32i,Crash -dEQP-GLES31.functional.image_load_store.2d.format_reinterpret.rgba8_r32ui,Crash -dEQP-GLES31.functional.image_load_store.2d.format_reinterpret.rgba8_rgba8_snorm,Crash -dEQP-GLES31.functional.image_load_store.2d.format_reinterpret.rgba8_rgba8i,Crash -dEQP-GLES31.functional.image_load_store.2d.format_reinterpret.rgba8_rgba8ui,Crash -dEQP-GLES31.functional.image_load_store.2d_array.format_reinterpret.rgba8_r32f,Crash -dEQP-GLES31.functional.image_load_store.2d_array.format_reinterpret.rgba8_r32ui,Crash -dEQP-GLES31.functional.image_load_store.2d_array.format_reinterpret.rgba8_rgba8_snorm,Crash -dEQP-GLES31.functional.image_load_store.2d_array.format_reinterpret.rgba8_rgba8i,Crash -dEQP-GLES31.functional.image_load_store.3d.format_reinterpret.rgba8_r32f,Crash -dEQP-GLES31.functional.image_load_store.3d.format_reinterpret.rgba8_r32i,Crash -dEQP-GLES31.functional.image_load_store.3d.format_reinterpret.rgba8_r32ui,Crash -dEQP-GLES31.functional.image_load_store.3d.format_reinterpret.rgba8_rgba8_snorm,Crash -dEQP-GLES31.functional.image_load_store.cube.format_reinterpret.rgba8_r32f,Crash -dEQP-GLES31.functional.image_load_store.cube.format_reinterpret.rgba8_r32i,Crash -dEQP-GLES31.functional.image_load_store.cube.format_reinterpret.rgba8_r32ui,Crash -dEQP-GLES31.functional.image_load_store.cube.format_reinterpret.rgba8_rgba8i,Crash diff --git a/src/intel/ci/angle-anv-jsl-fails.txt b/src/intel/ci/angle-anv-jsl-fails.txt index b1e77e23992..05fc3e8984b 100644 --- a/src/intel/ci/angle-anv-jsl-fails.txt +++ b/src/intel/ci/angle-anv-jsl-fails.txt @@ -3,9 +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-gles31: ../src/intel/vulkan/anv_private.h:5588: anv_image_get_clear_color_addr: Assertion `anv_image_view_formats_incomplete(image)' failed. -dEQP-GLES31.functional.image_load_store.2d_array.format_reinterpret.rgba8_rgba8i,Crash - # 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 @@ -70,28 +67,3 @@ dEQP-GLES3.functional.fbo.completeness.renderable.renderbuffer.color0.bgra,Fail # new with ANGLE 2024-10-17 KHR-GLES31.core.blend_equation_advanced.test_coherency.multiplySequence,Fail KHR-GLES31.core.shader_image_load_store.basic-allTargets-loadStoreVS,Fail -KHR-GLES31.core.shader_image_load_store.advanced-cast-cs,Crash -KHR-GLES31.core.shader_image_load_store.advanced-cast-fs,Crash -dEQP-GLES31.functional.image_load_store.2d.format_reinterpret.rgba8_r32i,Crash -dEQP-GLES31.functional.image_load_store.2d.format_reinterpret.rgba8_rgba8_snorm,Crash -dEQP-GLES31.functional.image_load_store.2d.format_reinterpret.rgba8_rgba8i,Crash -dEQP-GLES31.functional.image_load_store.2d.format_reinterpret.rgba8_rgba8ui,Crash -dEQP-GLES31.functional.image_load_store.2d_array.format_reinterpret.rgba8_rgba8_snorm,Crash -dEQP-GLES31.functional.image_load_store.2d_array.format_reinterpret.rgba8_rgba8ui,Crash -dEQP-GLES31.functional.image_load_store.3d.format_reinterpret.rgba8_r32ui,Crash -dEQP-GLES31.functional.image_load_store.cube.format_reinterpret.rgba8_r32f,Crash -dEQP-GLES31.functional.image_load_store.2d.format_reinterpret.rgba8_r32f,Crash -dEQP-GLES31.functional.image_load_store.2d.format_reinterpret.rgba8_r32ui,Crash -dEQP-GLES31.functional.image_load_store.2d_array.format_reinterpret.rgba8_r32f,Crash -dEQP-GLES31.functional.image_load_store.2d_array.format_reinterpret.rgba8_r32i,Crash -dEQP-GLES31.functional.image_load_store.2d_array.format_reinterpret.rgba8_r32ui,Crash -dEQP-GLES31.functional.image_load_store.3d.format_reinterpret.rgba8_r32f,Crash -dEQP-GLES31.functional.image_load_store.3d.format_reinterpret.rgba8_r32i,Crash -dEQP-GLES31.functional.image_load_store.3d.format_reinterpret.rgba8_rgba8_snorm,Crash -dEQP-GLES31.functional.image_load_store.3d.format_reinterpret.rgba8_rgba8i,Crash -dEQP-GLES31.functional.image_load_store.3d.format_reinterpret.rgba8_rgba8ui,Crash -dEQP-GLES31.functional.image_load_store.cube.format_reinterpret.rgba8_r32i,Crash -dEQP-GLES31.functional.image_load_store.cube.format_reinterpret.rgba8_r32ui,Crash -dEQP-GLES31.functional.image_load_store.cube.format_reinterpret.rgba8_rgba8_snorm,Crash -dEQP-GLES31.functional.image_load_store.cube.format_reinterpret.rgba8_rgba8i,Crash -dEQP-GLES31.functional.image_load_store.cube.format_reinterpret.rgba8_rgba8ui,Crash diff --git a/src/intel/ci/angle-anv-tgl-fails.txt b/src/intel/ci/angle-anv-tgl-fails.txt index adeeff425d4..e50e8a12981 100644 --- a/src/intel/ci/angle-anv-tgl-fails.txt +++ b/src/intel/ci/angle-anv-tgl-fails.txt @@ -53,33 +53,3 @@ dEQP-GLES3.functional.fbo.completeness.renderable.renderbuffer.stencil.bgra,Fail # new with ANGLE 2024-10-17 KHR-GLES31.core.shader_image_load_store.basic-allTargets-loadStoreVS,Fail - -# Validation layer failure: -# https://docs.vulkan.org/spec/latest/chapters/resources.html#VUID-VkImageViewCreateInfo-pNext-01585 -# https://issues.angleproject.org/issues/382051956 -KHR-GLES31.core.shader_image_load_store.advanced-cast-cs,Crash -KHR-GLES31.core.shader_image_load_store.advanced-cast-fs,Crash -dEQP-GLES31.functional.image_load_store.2d.format_reinterpret.rgba8_r32f,Crash -dEQP-GLES31.functional.image_load_store.2d_array.format_reinterpret.rgba8_r32i,Crash -dEQP-GLES31.functional.image_load_store.2d_array.format_reinterpret.rgba8_rgba8ui,Crash -dEQP-GLES31.functional.image_load_store.3d.format_reinterpret.rgba8_rgba8i,Crash -dEQP-GLES31.functional.image_load_store.3d.format_reinterpret.rgba8_rgba8ui,Crash -dEQP-GLES31.functional.image_load_store.cube.format_reinterpret.rgba8_rgba8_snorm,Crash -dEQP-GLES31.functional.image_load_store.cube.format_reinterpret.rgba8_rgba8ui,Crash -dEQP-GLES31.functional.image_load_store.2d.format_reinterpret.rgba8_r32i,Crash -dEQP-GLES31.functional.image_load_store.2d.format_reinterpret.rgba8_r32ui,Crash -dEQP-GLES31.functional.image_load_store.2d.format_reinterpret.rgba8_rgba8_snorm,Crash -dEQP-GLES31.functional.image_load_store.2d.format_reinterpret.rgba8_rgba8i,Crash -dEQP-GLES31.functional.image_load_store.2d.format_reinterpret.rgba8_rgba8ui,Crash -dEQP-GLES31.functional.image_load_store.2d_array.format_reinterpret.rgba8_r32f,Crash -dEQP-GLES31.functional.image_load_store.2d_array.format_reinterpret.rgba8_r32ui,Crash -dEQP-GLES31.functional.image_load_store.2d_array.format_reinterpret.rgba8_rgba8_snorm,Crash -dEQP-GLES31.functional.image_load_store.2d_array.format_reinterpret.rgba8_rgba8i,Crash -dEQP-GLES31.functional.image_load_store.3d.format_reinterpret.rgba8_r32f,Crash -dEQP-GLES31.functional.image_load_store.3d.format_reinterpret.rgba8_r32i,Crash -dEQP-GLES31.functional.image_load_store.3d.format_reinterpret.rgba8_r32ui,Crash -dEQP-GLES31.functional.image_load_store.3d.format_reinterpret.rgba8_rgba8_snorm,Crash -dEQP-GLES31.functional.image_load_store.cube.format_reinterpret.rgba8_r32f,Crash -dEQP-GLES31.functional.image_load_store.cube.format_reinterpret.rgba8_r32i,Crash -dEQP-GLES31.functional.image_load_store.cube.format_reinterpret.rgba8_r32ui,Crash -dEQP-GLES31.functional.image_load_store.cube.format_reinterpret.rgba8_rgba8i,Crash diff --git a/src/intel/ci/deqp-anv-adl-angle-full.toml b/src/intel/ci/deqp-anv-adl-angle-full.toml index cd68efcca70..c585614c2b4 100644 --- a/src/intel/ci/deqp-anv-adl-angle-full.toml +++ b/src/intel/ci/deqp-anv-adl-angle-full.toml @@ -7,7 +7,7 @@ deqp_args = [ "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", "--deqp-gl-config-name=rgba8888d24s8ms0", ] -version_check = "GL ES 3.1" +version_check = "GL ES 3.2" renderer_check = "ANGLE.*ADL" [[deqp]] diff --git a/src/intel/ci/deqp-anv-adl-angle.toml b/src/intel/ci/deqp-anv-adl-angle.toml index 097072e7e45..d2c27dad0f0 100644 --- a/src/intel/ci/deqp-anv-adl-angle.toml +++ b/src/intel/ci/deqp-anv-adl-angle.toml @@ -7,7 +7,7 @@ deqp_args = [ "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", "--deqp-gl-config-name=rgba8888d24s8ms0", ] -version_check = "GL ES 3.1" +version_check = "GL ES 3.2" renderer_check = "ANGLE.*ADL" [[deqp]] diff --git a/src/intel/ci/deqp-anv-jsl-angle-full.toml b/src/intel/ci/deqp-anv-jsl-angle-full.toml index 975c223db33..b83bab5e995 100644 --- a/src/intel/ci/deqp-anv-jsl-angle-full.toml +++ b/src/intel/ci/deqp-anv-jsl-angle-full.toml @@ -7,7 +7,7 @@ deqp_args = [ "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", "--deqp-gl-config-name=rgba8888d24s8ms0", ] -version_check = "GL ES 3.1" +version_check = "GL ES 3.2" renderer_check = "ANGLE.*JSL" [[deqp]] diff --git a/src/intel/ci/deqp-anv-jsl-angle.toml b/src/intel/ci/deqp-anv-jsl-angle.toml index 3084d2a76cd..954f5567d91 100644 --- a/src/intel/ci/deqp-anv-jsl-angle.toml +++ b/src/intel/ci/deqp-anv-jsl-angle.toml @@ -7,7 +7,7 @@ deqp_args = [ "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", "--deqp-gl-config-name=rgba8888d24s8ms0", ] -version_check = "GL ES 3.1" +version_check = "GL ES 3.2" renderer_check = "ANGLE.*JSL" fraction = 15 diff --git a/src/intel/ci/deqp-anv-tgl-angle-full.toml b/src/intel/ci/deqp-anv-tgl-angle-full.toml index baef3c44cc0..e95ce324bd3 100644 --- a/src/intel/ci/deqp-anv-tgl-angle-full.toml +++ b/src/intel/ci/deqp-anv-tgl-angle-full.toml @@ -7,7 +7,7 @@ deqp_args = [ "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", "--deqp-gl-config-name=rgba8888d24s8ms0", ] -version_check = "GL ES 3.1" +version_check = "GL ES 3.2" renderer_check = "ANGLE.*TGL" [[deqp]] diff --git a/src/intel/ci/deqp-anv-tgl-angle.toml b/src/intel/ci/deqp-anv-tgl-angle.toml index 559555abdbb..48188710b5e 100644 --- a/src/intel/ci/deqp-anv-tgl-angle.toml +++ b/src/intel/ci/deqp-anv-tgl-angle.toml @@ -7,7 +7,7 @@ deqp_args = [ "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", "--deqp-gl-config-name=rgba8888d24s8ms0", ] -version_check = "GL ES 3.1" +version_check = "GL ES 3.2" renderer_check = "ANGLE.*TGL" [[deqp]]