From: Icecream95 <ixn@keemail.me>
Date: Tue, 24 Mar 2020 01:45:45 +0000 (+1300)
Subject: st/mesa: Fall back on R3G3B2 for R3_G3_B2
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;ds=sidebyside;h=49a81a431e0b5aef53da2319b327da717603fbc6;p=mesa.git

st/mesa: Fall back on R3G3B2 for R3_G3_B2

It's simpler for Panfrost to use R3G3B2 instead of B2G3R3, but
format_map only listed the BGR variation.

Reviewed-by: Eric Anholt <eric@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4292>
---

diff --git a/src/mesa/state_tracker/st_format.c b/src/mesa/state_tracker/st_format.c
index 310c5b62ab7..99e91ca96de 100644
--- a/src/mesa/state_tracker/st_format.c
+++ b/src/mesa/state_tracker/st_format.c
@@ -229,8 +229,9 @@ static const struct format_mapping format_map[] = {
    },
    {
       { GL_R3_G3_B2, 0 },
-      { PIPE_FORMAT_B2G3R3_UNORM, PIPE_FORMAT_B5G6R5_UNORM,
-        PIPE_FORMAT_B5G5R5A1_UNORM, DEFAULT_RGB_FORMATS }
+      { PIPE_FORMAT_B2G3R3_UNORM, PIPE_FORMAT_R3G3B2_UNORM,
+        PIPE_FORMAT_B5G6R5_UNORM, PIPE_FORMAT_B5G5R5A1_UNORM,
+        DEFAULT_RGB_FORMATS }
    },
    {
       { GL_RGB4 },