From fd4d0e1cc23ff64d4d9b852e3f5cc7454c7b2018 Mon Sep 17 00:00:00 2001 From: Janne Grunau Date: Wed, 28 Jun 2023 21:09:50 +0200 Subject: [PATCH] st/mesa: Set gl_config.floatMode based on color_format Sets the float color component type in st_visual_to_context_mode() ensuring float color values are not clamped. Fixes dEQP-EGL.functional.wide_color.window_fp16_default_colorspace on asahi, iris and most likely every other driver having it marked as fail or flake. Closes: mesa/mesa#9276 Signed-off-by: Janne Grunau Reviewed-by: Adam Jackson Acked-by: David Heidelberg Cc: mesa-stable Part-of: --- src/broadcom/ci/broadcom-rpi4-fails.txt | 1 - src/freedreno/ci/freedreno-a618-fails.txt | 1 - src/freedreno/ci/freedreno-a630-fails.txt | 1 - src/gallium/drivers/lima/ci/lima-fails.txt | 1 - src/intel/ci/iris-amly-fails.txt | 2 -- src/intel/ci/iris-apl-fails.txt | 1 - src/intel/ci/iris-apl-flakes.txt | 3 --- src/mesa/state_tracker/st_manager.c | 1 + src/panfrost/ci/panfrost-t860-fails.txt | 1 - 9 files changed, 1 insertion(+), 11 deletions(-) diff --git a/src/broadcom/ci/broadcom-rpi4-fails.txt b/src/broadcom/ci/broadcom-rpi4-fails.txt index 6700a0bf8ea..7c8f5b0a645 100644 --- a/src/broadcom/ci/broadcom-rpi4-fails.txt +++ b/src/broadcom/ci/broadcom-rpi4-fails.txt @@ -511,7 +511,6 @@ 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 -wayland-dEQP-EGL.functional.wide_color.window_fp16_default_colorspace,Fail spec@!opengl 1.1@line-smooth-stipple,Fail diff --git a/src/freedreno/ci/freedreno-a618-fails.txt b/src/freedreno/ci/freedreno-a618-fails.txt index 57f079acb34..98eca117bd7 100644 --- a/src/freedreno/ci/freedreno-a618-fails.txt +++ b/src/freedreno/ci/freedreno-a618-fails.txt @@ -354,7 +354,6 @@ spill-dEQP-VK.subgroups.ballot_broadcast.compute.subgroupbroadcast_bool_required # Failing (Color test failed) since wayland platform was enabled in arm builds wayland-dEQP-EGL.functional.wide_color.window_888_colorspace_default,Fail -wayland-dEQP-EGL.functional.wide_color.window_fp16_default_colorspace,Fail # skqp failure: # SRGBReadWritePixels FAILED (7 errors) diff --git a/src/freedreno/ci/freedreno-a630-fails.txt b/src/freedreno/ci/freedreno-a630-fails.txt index 3bc8a814b22..8707de7672a 100644 --- a/src/freedreno/ci/freedreno-a630-fails.txt +++ b/src/freedreno/ci/freedreno-a630-fails.txt @@ -361,7 +361,6 @@ 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 -wayland-dEQP-EGL.functional.wide_color.window_fp16_default_colorspace,Fail # skqp failure: # SRGBReadWritePixels FAILED (7 errors) diff --git a/src/gallium/drivers/lima/ci/lima-fails.txt b/src/gallium/drivers/lima/ci/lima-fails.txt index 91f9add2b7c..95c668ce17b 100644 --- a/src/gallium/drivers/lima/ci/lima-fails.txt +++ b/src/gallium/drivers/lima/ci/lima-fails.txt @@ -53,7 +53,6 @@ wayland-dEQP-EGL.functional.render.multi_thread.gles2.rgb888_window,Fail wayland-dEQP-EGL.functional.render.multi_thread.gles2.rgba8888_pbuffer,Fail wayland-dEQP-EGL.functional.wide_color.pbuffer_8888_colorspace_srgb,Fail wayland-dEQP-EGL.functional.wide_color.window_8888_colorspace_srgb,Fail -wayland-dEQP-EGL.functional.wide_color.window_fp16_default_colorspace,Fail x11-dEQP-EGL.functional.create_context.no_config,Fail x11-dEQP-EGL.functional.image.modify.renderbuffer_depth16_renderbuffer_clear_depth,Fail diff --git a/src/intel/ci/iris-amly-fails.txt b/src/intel/ci/iris-amly-fails.txt index d9e2596850d..20231a9dc02 100644 --- a/src/intel/ci/iris-amly-fails.txt +++ b/src/intel/ci/iris-amly-fails.txt @@ -5,5 +5,3 @@ # [...] wayland-dEQP-EGL.functional.wide_color.pbuffer_888_colorspace_default,Fail wayland-dEQP-EGL.functional.wide_color.window_888_colorspace_default,Fail - -wayland-dEQP-EGL.functional.wide_color.window_fp16_default_colorspace,Fail diff --git a/src/intel/ci/iris-apl-fails.txt b/src/intel/ci/iris-apl-fails.txt index 0f03c2a4663..33efc1d09f4 100644 --- a/src/intel/ci/iris-apl-fails.txt +++ b/src/intel/ci/iris-apl-fails.txt @@ -7,4 +7,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 -wayland-dEQP-EGL.functional.wide_color.window_fp16_default_colorspace,Fail diff --git a/src/intel/ci/iris-apl-flakes.txt b/src/intel/ci/iris-apl-flakes.txt index 15b3bd23b43..f26d9dce809 100644 --- a/src/intel/ci/iris-apl-flakes.txt +++ b/src/intel/ci/iris-apl-flakes.txt @@ -21,6 +21,3 @@ dEQP-EGL.functional.sharing.gles2.multithread.simple.buffers.buffersubdata_rende # 2022-05-05 18:40:38.338548: [ 830.144153] i915 0000:00:02.0: [drm] GPU HANG: ecode 9:1:87d79ffe, in deqp-gles31 [2571] dEQP-GLES31.functional.primitive_bounding_box.clear.scissored_clear_with_triangles dEQP-GLES31.functional.primitive_bounding_box.clear.scissored_clear_with_triangles_per_primitive_bbox - -# Since Wayland was enabled on x86-64, this test flakes occasionally. -wayland-dEQP-EGL.functional.wide_color.window_fp16_default_colorspace diff --git a/src/mesa/state_tracker/st_manager.c b/src/mesa/state_tracker/st_manager.c index a6587d94410..5176ccab006 100644 --- a/src/mesa/state_tracker/st_manager.c +++ b/src/mesa/state_tracker/st_manager.c @@ -559,6 +559,7 @@ st_visual_to_context_mode(const struct st_visual *visual, mode->rgbBits = mode->redBits + mode->greenBits + mode->blueBits + mode->alphaBits; mode->sRGBCapable = util_format_is_srgb(visual->color_format); + mode->floatMode = util_format_is_float(visual->color_format); } if (visual->depth_stencil_format != PIPE_FORMAT_NONE) { diff --git a/src/panfrost/ci/panfrost-t860-fails.txt b/src/panfrost/ci/panfrost-t860-fails.txt index e4640d4b0a2..af096032d8b 100644 --- a/src/panfrost/ci/panfrost-t860-fails.txt +++ b/src/panfrost/ci/panfrost-t860-fails.txt @@ -57,4 +57,3 @@ dEQP-GLES31.functional.texture.gather.basic.cube.rgba8ui.no_corners.size_pot.mir 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 -wayland-dEQP-EGL.functional.wide_color.window_fp16_default_colorspace,Fail