panfrost: Mark 16/32_UNORM as non-renderable (v5)
authorAlyssa Rosenzweig <alyssa@collabora.com>
Fri, 4 Jun 2021 21:36:26 +0000 (17:36 -0400)
committerMarge Bot <eric+marge@anholt.net>
Thu, 10 Jun 2021 18:06:10 +0000 (18:06 +0000)
You'd just get a blend shader anyway, and since they're not spec
requirements, let's not worry about backporting the Midgard lowerings.

Takes dEQP-GLES31.functional.fbo.color.tex2d.* on Midgard from crashing
to not supported.

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

src/panfrost/lib/pan_format.c

index 1a612fd..fec787b 100644 (file)
@@ -319,17 +319,17 @@ const struct panfrost_format panfrost_pipe_format_v6[PIPE_FORMAT_COUNT] = {
         PAN_V6(R32G32B32_FLOAT,         RGB32F,          RGB1, L, VTR_),
         PAN_V6(R32G32B32A32_FLOAT,      RGBA32F,         RGBA, L, VTR_),
         PAN_V6(R8_UNORM,                R8_UNORM,        R001, L, VTR_),
-        PAN_V6(R16_UNORM,               R16_UNORM,       R001, L, VTR_),
-        PAN_V6(R32_UNORM,               R32_UNORM,       R001, L, VTR_),
+        PAN_V6(R16_UNORM,               R16_UNORM,       R001, L, VT__),
+        PAN_V6(R32_UNORM,               R32_UNORM,       R001, L, VT__),
         PAN_V6(R8G8_UNORM,              RG8_UNORM,       RG01, L, VTR_),
-        PAN_V6(R16G16_UNORM,            RG16_UNORM,      RG01, L, VTR_),
-        PAN_V6(R32G32_UNORM,            RG32_UNORM,      RG01, L, VTR_),
+        PAN_V6(R16G16_UNORM,            RG16_UNORM,      RG01, L, VT__),
+        PAN_V6(R32G32_UNORM,            RG32_UNORM,      RG01, L, VT__),
         PAN_V6(R8G8B8_UNORM,            RGB8_UNORM,      RGB1, L, VTR_),
-        PAN_V6(R16G16B16_UNORM,         RGB16_UNORM,     RGB1, L, VTR_),
-        PAN_V6(R32G32B32_UNORM,         RGB32_UNORM,     RGB1, L, VTR_),
+        PAN_V6(R16G16B16_UNORM,         RGB16_UNORM,     RGB1, L, VT__),
+        PAN_V6(R32G32B32_UNORM,         RGB32_UNORM,     RGB1, L, VT__),
         PAN_V6(R4G4B4A4_UNORM,          RGBA4_UNORM,     RGBA, L, VTR_),
-        PAN_V6(R16G16B16A16_UNORM,      RGBA16_UNORM,    RGBA, L, VTR_),
-        PAN_V6(R32G32B32A32_UNORM,      RGBA32_UNORM,    RGBA, L, VTR_),
+        PAN_V6(R16G16B16A16_UNORM,      RGBA16_UNORM,    RGBA, L, VT__),
+        PAN_V6(R32G32B32A32_UNORM,      RGBA32_UNORM,    RGBA, L, VT__),
         PAN_V6(B8G8R8A8_UNORM,          RGBA8_UNORM,     BGRA, L, VTR_),
         PAN_V6(B8G8R8X8_UNORM,          RGBA8_UNORM,     BGR1, L, VTR_),
         PAN_V6(A8R8G8B8_UNORM,          RGBA8_UNORM,     GBAR, L, VTR_),
@@ -346,9 +346,9 @@ const struct panfrost_format panfrost_pipe_format_v6[PIPE_FORMAT_COUNT] = {
         PAN_V6(A8_UNORM,                R8_UNORM,        000R, L, VTR_),
         PAN_V6(I8_UNORM,                R8_UNORM,        RRRR, L, VTR_),
         PAN_V6(L8A8_UNORM,              RG8_UNORM,       RRRG, L, VTR_),
-        PAN_V6(L16_UNORM,               R16_UNORM,       RRR1, L, VTR_),
-        PAN_V6(A16_UNORM,               R16_UNORM,       000R, L, VTR_),
-        PAN_V6(I16_UNORM,               R16_UNORM,       RRRR, L, VTR_),
+        PAN_V6(L16_UNORM,               R16_UNORM,       RRR1, L, VT__),
+        PAN_V6(A16_UNORM,               R16_UNORM,       000R, L, VT__),
+        PAN_V6(I16_UNORM,               R16_UNORM,       RRRR, L, VT__),
         PAN_V6(L8_SNORM,                R8_SNORM,        RRR1, L, VT__),
         PAN_V6(A8_SNORM,                R8_SNORM,        000R, L, VT__),
         PAN_V6(I8_SNORM,                R8_SNORM,        RRRR, L, VT__),