panfrost: Handle PIPE_FORMAT_X24S8_UINT

We can treat it as RGBA32UI and swizzle away everything but R, like the
blob does. Maybe not the most efficient thing in the world.

Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5827>

diff --git a/src/panfrost/encoder/pan_format.c b/src/panfrost/encoder/pan_format.c
index 30423fa4e48be704c5002f3b29672a175c1e9e53..d7b0b207babaaef9bda2aa080d751dc2aea83060 100644 (file)
--- a/src/panfrost/encoder/pan_format.c
+++ b/src/panfrost/encoder/pan_format.c
@@ -140,6 +140,7 @@ struct panfrost_format panfrost_pipe_format_table[PIPE_FORMAT_COUNT] = {
         [PIPE_FORMAT_Z24X8_UNORM]              = { MALI_Z24X8_UNORM, _TZ },
         [PIPE_FORMAT_Z32_FLOAT]                        = { MALI_R32F, _TZ },
         [PIPE_FORMAT_Z32_FLOAT_S8X24_UINT]     = { MALI_R32F, _TZ },
+        [PIPE_FORMAT_X24S8_UINT]               = { MALI_RGBA8UI, _TZ },
 
         [PIPE_FORMAT_R32_FIXED]                = { MALI_R32_FIXED, _V },
         [PIPE_FORMAT_R32G32_FIXED]             = { MALI_RG32_FIXED, _V },

diff --git a/src/panfrost/encoder/pan_texture.c b/src/panfrost/encoder/pan_texture.c
index a333dadc0797af75471ebed566895b57fbaaeea4..18f7455442e5c874f8f82e4ec94314101e70fb7a 100644 (file)
--- a/src/panfrost/encoder/pan_texture.c
+++ b/src/panfrost/encoder/pan_texture.c
@@ -241,6 +241,12 @@ panfrost_emit_texture_payload(
         }
 }
 
+#define MALI_SWIZZLE_A001 \
+        (MALI_CHANNEL_ALPHA << 0) | \
+        (MALI_CHANNEL_ZERO << 3) | \
+        (MALI_CHANNEL_ZERO << 6) | \
+        (MALI_CHANNEL_ONE << 9)
+
 void
 panfrost_new_texture(
         void *out,
@@ -275,7 +281,9 @@ panfrost_new_texture(
                 .depth = MALI_POSITIVE(u_minify(depth, first_level)),
                 .array_size = MALI_POSITIVE(array_size),
                 .format = {
-                        .swizzle = panfrost_translate_swizzle_4(desc->swizzle),
+                        .swizzle = (format == PIPE_FORMAT_X24S8_UINT) ?
+                                MALI_SWIZZLE_A001 :
+                                panfrost_translate_swizzle_4(desc->swizzle),
                         .format = mali_format,
                         .srgb = (desc->colorspace == UTIL_FORMAT_COLORSPACE_SRGB),
                         .type = type,