commit b5bc09358416a07190e2535eea548141efaebf46
author Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com> Fri Oct 30 14:43:37 2020 -0400
committer Marge Bot <eric+marge@anholt.net> Sat Oct 31 14:09:19 2020 +0000
tree ab71a7cf7f6591ff9439ff4836baa6edb67c52ef
parent f2af23bd1208d1ccf6bee44c3aa37d0a4a544c9d

panfrost: Fix RGB5A1 formats

Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Reported-by: Icecream95 <ixn@disroot.org>
Suggested-by: Boris Brezillon <boris.brezillon@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7352>

src/panfrost/lib/midgard.xml

diff --git a/src/panfrost/lib/midgard.xml b/src/panfrost/lib/midgard.xml
index 938d76a..b2367ec 100644
--- a/src/panfrost/lib/midgard.xml
+++ b/src/panfrost/lib/midgard.xml
@@ -110,8 +110,8 @@
     <value name="R8G8B8G8" value="30"/>
     <value name="G8R8G8B8" value="31"/>
     <value name="RGB565" value="64"/>
-    <value name="RGB5 X1 UNORM" value="65"/>
-    <value name="RGB5 A1 UNORM" value="66"/>
+    <value name="RGB5 A1 UNORM" value="65"/>
+    <value name="A1 BGR5 UNORM" value="66"/>
     <value name="RGB10 A2 UNORM" value="67"/>
     <value name="RGB10 A2 SNORM" value="69"/>
     <value name="RGB10 A2UI" value="71"/>

src/panfrost/lib/pan_format.c

diff --git a/src/panfrost/lib/pan_format.c b/src/panfrost/lib/pan_format.c
index 6a85ddd..08fcbbc 100644
--- a/src/panfrost/lib/pan_format.c
+++ b/src/panfrost/lib/pan_format.c
@@ -187,7 +187,7 @@
         PAN_V6(ASTC_12x10_SRGB,         ASTC_2D_LDR,     RGBA, S, _T__),
         PAN_V6(ASTC_12x12_SRGB,         ASTC_2D_LDR,     RGBA, S, _T__),
         PAN_V6(B5G6R5_UNORM,            RGB565,          BGR1, L, VTR_),
-        PAN_V6(B5G5R5X1_UNORM,          RGB5_X1_UNORM,   BGR1, L, VT__),
+        PAN_V6(B5G5R5X1_UNORM,          RGB5_A1_UNORM,   BGR1, L, VT__),
         PAN_V6(R5G5B5A1_UNORM,          RGB5_A1_UNORM,   RGBA, L, VTR_),
         PAN_V6(R10G10B10X2_UNORM,       RGB10_A2_UNORM,  RGB1, L, VTR_),
         PAN_V6(B10G10R10X2_UNORM,       RGB10_A2_UNORM,  BGR1, L, VTR_),
@@ -437,7 +437,7 @@
         PAN_V7(ASTC_12x10_SRGB,         ASTC_2D_LDR,     RGBA, S, _T__),
         PAN_V7(ASTC_12x12_SRGB,         ASTC_2D_LDR,     RGBA, S, _T__),
         PAN_V7(B5G6R5_UNORM,            RGB565,          BGR1, L, VTR_),
-        PAN_V7(B5G5R5X1_UNORM,          RGB5_X1_UNORM,   BGR1, L, VT__),
+        PAN_V7(B5G5R5X1_UNORM,          RGB5_A1_UNORM,   BGR1, L, VT__),
         PAN_V7(R5G5B5A1_UNORM,          RGB5_A1_UNORM,   RGBA, L, VTR_),
         PAN_V7(R10G10B10X2_UNORM,       RGB10_A2_UNORM,  RGB1, L, VTR_),
         PAN_V7(B10G10R10X2_UNORM,       RGB10_A2_UNORM,  BGR1, L, VTR_),