Mesa (main): panfrost: RGB332_UNORM is not a valid texture format on v6+

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 8805509fff8811b906c112e6b3e78101eb205bc1
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=8805509fff8811b906c112e6b3e78101eb205bc1

Author: Boris Brezillon <boris.brezillon at collabora.com>
Date:   Mon Sep 20 11:53:23 2021 +0200

panfrost: RGB332_UNORM is not a valid texture format on v6+

Cc: mesa-stable
Fixes: c6bdd976e611 ("panfrost: Split out v6/v7 format tables")
Signed-off-by: Boris Brezillon <boris.brezillon at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12508>

---

 src/panfrost/lib/pan_format.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/panfrost/lib/pan_format.c b/src/panfrost/lib/pan_format.c
index 546de507a7f..d4cc3817e0d 100644
--- a/src/panfrost/lib/pan_format.c
+++ b/src/panfrost/lib/pan_format.c
@@ -240,6 +240,7 @@ const struct panfrost_format GENX(panfrost_pipe_format)[PIPE_FORMAT_COUNT] = {
         FMT(R10G10B10X2_SNORM,       RGB10_A2_SNORM,  RGB1, L, VT__),
         FMT(R10G10B10A2_SNORM,       RGB10_A2_SNORM,  RGBA, L, VT__),
         FMT(B10G10R10A2_SNORM,       RGB10_A2_SNORM,  BGRA, L, VT__),
+        FMT(R3G3B2_UNORM,            RGB332_UNORM,    RGB1, L, VT__),
 #else
         FMT(R10G10B10X2_SNORM,       RGB10_A2_SNORM,  RGB1, L, V___),
         FMT(R10G10B10A2_SNORM,       RGB10_A2_SNORM,  RGBA, L, V___),
@@ -283,7 +284,6 @@ const struct panfrost_format GENX(panfrost_pipe_format)[PIPE_FORMAT_COUNT] = {
         FMT(R32G32_SSCALED,          RG32I,           RG01, L, V___),
         FMT(R32G32B32_SSCALED,       RGB32I,          RGB1, L, V___),
         FMT(R32G32B32A32_SSCALED,    RGBA32I,         RGBA, L, V___),
-        FMT(R3G3B2_UNORM,            RGB332_UNORM,    RGB1, L, VT__),
         FMT(R32_FIXED,               R32_FIXED,       R001, L, V___),
         FMT(R32G32_FIXED,            RG32_FIXED,      RG01, L, V___),
         FMT(R32G32B32_FIXED,         RGB32_FIXED,     RGB1, L, V___),