From 8841b3ab06f2a2ba07e418cb86befb92c39cc371 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: (cherry picked from commit fd4d0e1cc23ff64d4d9b852e3f5cc7454c7b2018) --- .pick_status.json | 2 +- 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/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, 2 insertions(+), 11 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index c5c57e09934..efb0c682690 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -4540,7 +4540,7 @@ "description": "st/mesa: Set gl_config.floatMode based on color_format", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null }, diff --git a/src/broadcom/ci/broadcom-rpi4-fails.txt b/src/broadcom/ci/broadcom-rpi4-fails.txt index 6958ad4bf50..20a570f0c7f 100644 --- a/src/broadcom/ci/broadcom-rpi4-fails.txt +++ b/src/broadcom/ci/broadcom-rpi4-fails.txt @@ -338,7 +338,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 a345a898571..9d4d017268e 100644 --- a/src/freedreno/ci/freedreno-a618-fails.txt +++ b/src/freedreno/ci/freedreno-a618-fails.txt @@ -336,7 +336,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 17c781bb8c2..8ec0d245129 100644 --- a/src/freedreno/ci/freedreno-a630-fails.txt +++ b/src/freedreno/ci/freedreno-a630-fails.txt @@ -346,7 +346,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/intel/ci/iris-amly-fails.txt b/src/intel/ci/iris-amly-fails.txt index 517afec4c1c..1d3e2ddbcea 100644 --- a/src/intel/ci/iris-amly-fails.txt +++ b/src/intel/ci/iris-amly-fails.txt @@ -6,8 +6,6 @@ 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 - # New CTS failures in 1.3.5.0 KHR-GL46.polygon_offset_clamp.PolygonOffsetClampMinMax,Fail KHR-GL46.polygon_offset_clamp.PolygonOffsetClampZeroInfinity,Fail diff --git a/src/intel/ci/iris-apl-fails.txt b/src/intel/ci/iris-apl-fails.txt index 8bb5f72a577..553b13503c4 100644 --- a/src/intel/ci/iris-apl-fails.txt +++ b/src/intel/ci/iris-apl-fails.txt @@ -11,4 +11,3 @@ KHR-GL46.polygon_offset_clamp.PolygonOffsetClampZeroInfinity,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 6d7c90e17c1..e69e633a1f8 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 3817aed07e8..8a06882923f 100644 --- a/src/panfrost/ci/panfrost-t860-fails.txt +++ b/src/panfrost/ci/panfrost-t860-fails.txt @@ -89,4 +89,3 @@ x11-dEQP-EGL.functional.create_context_ext.robust_gl_31.rgba8888_depth_stencil,F x11-dEQP-EGL.functional.create_context_ext.robust_gl_31.rgba8888_no_depth_no_stencil,Fail wayland-dEQP-EGL.functional.wide_color.window_888_colorspace_default,Fail -wayland-dEQP-EGL.functional.wide_color.window_fp16_default_colorspace,Fail