zink: convert luminance/alpha clear colors in dynamic texture clear

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22025>

diff --git a/src/gallium/drivers/zink/ci/zink-lvp-fails.txt b/src/gallium/drivers/zink/ci/zink-lvp-fails.txt
index 1538977..3edcc07 100644 (file)
--- a/src/gallium/drivers/zink/ci/zink-lvp-fails.txt
+++ b/src/gallium/drivers/zink/ci/zink-lvp-fails.txt
@@ -262,6 +262,4 @@ spec@glsl-4.50@execution@ssbo-atomiccompswap-int,Fail
 # New CTS failures in 1.3.5.0
 KHR-GL46.polygon_offset_clamp.PolygonOffsetClampMinMax,Fail
 KHR-GL46.polygon_offset_clamp.PolygonOffsetClampZeroInfinity,Fail
-fast_color_clear@fcc-clear-tex,Fail
-spec@arb_clear_texture@arb_clear_texture-base-formats,Fail
 spec@arb_texture_cube_map_array@texsubimage cube_map_array,Fail

diff --git a/src/gallium/drivers/zink/zink_clear.c b/src/gallium/drivers/zink/zink_clear.c
index 64f8b19..35e6d9d 100644 (file)
--- a/src/gallium/drivers/zink/zink_clear.c
+++ b/src/gallium/drivers/zink/zink_clear.c
@@ -490,6 +490,7 @@ zink_clear_texture_dynamic(struct pipe_context *pctx,
    uint8_t stencil = 0;
    if (res->aspect & VK_IMAGE_ASPECT_COLOR_BIT) {
       util_format_unpack_rgba(pres->format, color.ui, data, 1);
+      convert_color(surf, &color);
    } else {
       if (res->aspect & VK_IMAGE_ASPECT_DEPTH_BIT)
          util_format_unpack_z_float(pres->format, &depth, data, 1);