diff --git a/.gitlab-ci/container/build-deqp.sh b/.gitlab-ci/container/build-deqp.sh index 12286ba6fc5..4a5a720f309 100644 --- a/.gitlab-ci/container/build-deqp.sh +++ b/.gitlab-ci/container/build-deqp.sh @@ -66,6 +66,10 @@ cts_commits_to_backport=( # dEQP-VK.wsi.acquire_drm_display.*invalid_fd 98ad9402e7d94030d1689fd59135da7a2f52384c + + # Test alpha-less 10bit formats correctly in wide_color tests + # Fixes dEQP-EGL.functional.wide_color.*_888_colorspace_* + dacf752adf388ce4399733ee9b4a3c8a4f317990 ) for commit in "${cts_commits_to_backport[@]}" diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml index 6cc009c2737..a1093848734 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -21,14 +21,14 @@ variables: DEBIAN_X86_64_TEST_IMAGE_VK_PATH: "debian/x86_64_test-vk" DEBIAN_X86_64_TEST_ANDROID_IMAGE_PATH: "debian/x86_64_test-android" - DEBIAN_X86_64_TEST_ANDROID_TAG: "2023-08-03-deqp-mold" - DEBIAN_X86_64_TEST_GL_TAG: "2023-08-07-vvl" + DEBIAN_X86_64_TEST_ANDROID_TAG: "2023-08-20-deqp-wide_color" + DEBIAN_X86_64_TEST_GL_TAG: "2023-08-20-deqp-wide_color" DEBIAN_X86_64_TEST_VK_TAG: "2023-08-03-deqp-mold" ALPINE_X86_64_BUILD_TAG: "2023-05-01-3.18-bump-1" ALPINE_X86_64_LAVA_SSH_TAG: "2023-06-26-first-version" FEDORA_X86_64_BUILD_TAG: "2023-07-26-meson-1.2" - KERNEL_ROOTFS_TAG: "2023-08-07-vvl" + KERNEL_ROOTFS_TAG: "2023-08-20-deqp-wide_color" KERNEL_TAG: "v6.3.13-for-mesa-ci-a7f02a9f9591" WINDOWS_X64_VS_PATH: "windows/x64_vs" diff --git a/src/broadcom/ci/broadcom-rpi4-fails.txt b/src/broadcom/ci/broadcom-rpi4-fails.txt index f53d60088c8..dc41f024b84 100644 --- a/src/broadcom/ci/broadcom-rpi4-fails.txt +++ b/src/broadcom/ci/broadcom-rpi4-fails.txt @@ -514,8 +514,6 @@ spec@arb_clear_texture@arb_clear_texture-sized-formats,Fail spec@!opengl 2.0@max-samplers,Fail spec@!opengl 2.0@max-samplers border,Fail -wayland-dEQP-EGL.functional.wide_color.window_888_colorspace_default,Fail - spec@!opengl 1.1@line-smooth-stipple,Fail # Works when run individually, but fail consistently on the CI diff --git a/src/freedreno/ci/freedreno-a618-fails.txt b/src/freedreno/ci/freedreno-a618-fails.txt index b5d5ac515e2..17c9e5ee027 100644 --- a/src/freedreno/ci/freedreno-a618-fails.txt +++ b/src/freedreno/ci/freedreno-a618-fails.txt @@ -352,9 +352,6 @@ spec@arb_query_buffer_object@qbo@query-GL_TESS_CONTROL_SHADER_PATCHES-SYNC_CPU_R spill-dEQP-VK.subgroups.ballot_broadcast.compute.subgroupbroadcast_bool,Fail spill-dEQP-VK.subgroups.ballot_broadcast.compute.subgroupbroadcast_bool_requiredsubgroupsize128,Fail -# Failing (Color test failed) since wayland platform was enabled in arm builds -wayland-dEQP-EGL.functional.wide_color.window_888_colorspace_default,Fail - # skqp failure: # SRGBReadWritePixels FAILED (7 errors) # ../../tests/SRGBReadWritePixelsTest.cpp:214 Could not create sRGB surface context. [OpenGL] diff --git a/src/freedreno/ci/freedreno-a630-fails.txt b/src/freedreno/ci/freedreno-a630-fails.txt index 38e296b7672..951e34fba07 100644 --- a/src/freedreno/ci/freedreno-a630-fails.txt +++ b/src/freedreno/ci/freedreno-a630-fails.txt @@ -350,16 +350,6 @@ spec@arb_query_buffer_object@qbo@query-GL_TESS_CONTROL_SHADER_PATCHES-SYNC_CPU_R spec@arb_query_buffer_object@qbo@query-GL_TESS_CONTROL_SHADER_PATCHES-SYNC_CPU_READ_AFTER_CACHE_TEST-GL_UNSIGNED_INT,Fail spec@arb_query_buffer_object@qbo@query-GL_TESS_CONTROL_SHADER_PATCHES-SYNC_CPU_READ_AFTER_CACHE_TEST-GL_UNSIGNED_INT64_ARB,Fail -# Excerpt: -# Image comparison failed: reference = -0.000488281, expected = 0:0:0:0, result = 0:0:0:3 -# Image comparison failed: reference = 0, expected = 0:0:0:0, result = 0:0:0:3 -# Image comparison failed: reference = 0.000488281, expected = 0:1:0:0, result = 0:1:0:3 -# Image comparison failed: reference = 0.000976562, expected = 1:1:0:0, result = 1:1:0:3 -wayland-dEQP-EGL.functional.wide_color.pbuffer_888_colorspace_default,Fail - -# Failing (Color test failed) since wayland platform was enabled in arm builds -wayland-dEQP-EGL.functional.wide_color.window_888_colorspace_default,Fail - # skqp failure: # SRGBReadWritePixels FAILED (7 errors) # ../../tests/SRGBReadWritePixelsTest.cpp:214 Could not create sRGB surface context. [OpenGL] diff --git a/src/gallium/drivers/llvmpipe/ci/llvmpipe-fails.txt b/src/gallium/drivers/llvmpipe/ci/llvmpipe-fails.txt index 4775382ab7b..8b584caad94 100644 --- a/src/gallium/drivers/llvmpipe/ci/llvmpipe-fails.txt +++ b/src/gallium/drivers/llvmpipe/ci/llvmpipe-fails.txt @@ -189,13 +189,6 @@ spec@glsl-4.50@execution@ssbo-atomiccompswap-int,Fail spec@!opengl 1.0@depth-clear-precision-check,Fail spec@!opengl 1.0@depth-clear-precision-check@depth32,Fail -# [...] -# Image comparison failed: reference = -0.000488281, expected = 0:0:0:0, result = 0:0:0:3 -# Image comparison failed: reference = 0, expected = 0:0:0:0, result = 0:0:0:3 -# Image comparison failed: reference = 0.000488281, expected = 0:1:0:0, result = 0:1:0:3 -# [...] -wayland-dEQP-EGL.functional.wide_color.pbuffer_888_colorspace_default,Fail - # Debian bookworm fails spec@arb_viewport_array@display-list,Fail spec@intel_shader_atomic_float_minmax@execution@ssbo-atomicmin-float-nan,Fail diff --git a/src/gallium/drivers/llvmpipe/ci/llvmpipe-flakes.txt b/src/gallium/drivers/llvmpipe/ci/llvmpipe-flakes.txt index 14c43ce84ba..4984af93ed6 100644 --- a/src/gallium/drivers/llvmpipe/ci/llvmpipe-flakes.txt +++ b/src/gallium/drivers/llvmpipe/ci/llvmpipe-flakes.txt @@ -23,6 +23,3 @@ glx@glx-multi-context-single-window # unreliable, probably from scheduling. spec@arb_timer_query@timestamp-get - -# flakes very often -wayland-dEQP-EGL.functional.wide_color.window_8888_colorspace_srgb diff --git a/src/intel/ci/iris-amly-fails.txt b/src/intel/ci/iris-amly-fails.txt index 20231a9dc02..e69de29bb2d 100644 --- a/src/intel/ci/iris-amly-fails.txt +++ b/src/intel/ci/iris-amly-fails.txt @@ -1,7 +0,0 @@ -# [...] -# Image comparison failed: reference = -0.000488281, expected = 0:0:0:0, result = 0:0:0:3 -# Image comparison failed: reference = 0, expected = 0:0:0:0, result = 0:0:0:3 -# Image comparison failed: reference = 0.000488281, expected = 0:1:0:0, result = 0:1:0:3 -# [...] -wayland-dEQP-EGL.functional.wide_color.pbuffer_888_colorspace_default,Fail -wayland-dEQP-EGL.functional.wide_color.window_888_colorspace_default,Fail diff --git a/src/intel/ci/iris-apl-fails.txt b/src/intel/ci/iris-apl-fails.txt index 33efc1d09f4..e69de29bb2d 100644 --- a/src/intel/ci/iris-apl-fails.txt +++ b/src/intel/ci/iris-apl-fails.txt @@ -1,9 +0,0 @@ -# Excerpt: -# Image comparison failed: reference = -0.000488281, expected = 0:0:0:0, result = 0:0:0:3 -# Image comparison failed: reference = 0, expected = 0:0:0:0, result = 0:0:0:3 -# Image comparison failed: reference = 0.000488281, expected = 0:1:0:0, result = 0:1:0:3 -# Image comparison failed: reference = 0.000976562, expected = 1:1:0:0, result = 1:1:0:3 -wayland-dEQP-EGL.functional.wide_color.pbuffer_888_colorspace_default,Fail - -# after enabling wayland in x86_64 mesa build -wayland-dEQP-EGL.functional.wide_color.window_888_colorspace_default,Fail diff --git a/src/intel/ci/iris-glk-fails.txt b/src/intel/ci/iris-glk-fails.txt index f06f6e3d7bd..c8b6f4be5c7 100644 --- a/src/intel/ci/iris-glk-fails.txt +++ b/src/intel/ci/iris-glk-fails.txt @@ -2,10 +2,3 @@ KHR-GL46.texture_buffer.texture_buffer_atomic_functions,Fail KHR-GLES31.core.texture_buffer.texture_buffer_atomic_functions,Fail - -# Excerpt: -# Image comparison failed: reference = -0.000488281, expected = 0:0:0:0, result = 0:0:0:3 -# Image comparison failed: reference = 0, expected = 0:0:0:0, result = 0:0:0:3 -# Image comparison failed: reference = 0.000488281, expected = 0:1:0:0, result = 0:1:0:3 -# Image comparison failed: reference = 0.000976562, expected = 1:1:0:0, result = 1:1:0:3 -wayland-dEQP-EGL.functional.wide_color.pbuffer_888_colorspace_default,Fail diff --git a/src/panfrost/ci/panfrost-t860-fails.txt b/src/panfrost/ci/panfrost-t860-fails.txt index af096032d8b..9c1d19c6744 100644 --- a/src/panfrost/ci/panfrost-t860-fails.txt +++ b/src/panfrost/ci/panfrost-t860-fails.txt @@ -55,5 +55,3 @@ dEQP-GLES31.functional.texture.gather.basic.cube.rgba8ui.base_level.level_1,Fail dEQP-GLES31.functional.texture.gather.basic.cube.rgba8ui.no_corners.size_pot.clamp_to_edge_repeat,Fail dEQP-GLES31.functional.texture.gather.basic.cube.rgba8ui.no_corners.size_pot.mirrored_repeat_clamp_to_edge,Fail dEQP-GLES31.functional.texture.gather.basic.cube.rgba8ui.no_corners.size_pot.repeat_mirrored_repeat,Fail - -wayland-dEQP-EGL.functional.wide_color.window_888_colorspace_default,Fail