Mesa (main): i965: Enable RGBX8888_SRGB format.

[GitLab Mirror]

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

Author: Lepton Wu <lepton at chromium.org>
Date:   Sat Aug 14 15:52:47 2021 -0700

i965: Enable RGBX8888_SRGB format.

This is required by Android. Some Android games like nier reincarnation
show a black screen without this.

Signed-off-by: Lepton Wu <lepton at chromium.org>
Reviewed-by: Tapani Pälli <tapani.palli at intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12393>

---

 src/mesa/drivers/dri/i965/brw_screen.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/mesa/drivers/dri/i965/brw_screen.c b/src/mesa/drivers/dri/i965/brw_screen.c
index 08f86ab7e3b..73bb1a03c22 100644
--- a/src/mesa/drivers/dri/i965/brw_screen.c
+++ b/src/mesa/drivers/dri/i965/brw_screen.c
@@ -2164,7 +2164,8 @@ brw_allowed_format(__DRIscreen *dri_screen, mesa_format format)
    if (!allow_rgba_ordering &&
        (format == MESA_FORMAT_R8G8B8A8_UNORM ||
         format == MESA_FORMAT_R8G8B8X8_UNORM ||
-        format == MESA_FORMAT_R8G8B8A8_SRGB))
+        format == MESA_FORMAT_R8G8B8A8_SRGB ||
+        format == MESA_FORMAT_R8G8B8X8_SRGB))
       return false;
 
     /* Shall we expose 10 bpc formats? */
@@ -2228,11 +2229,11 @@ brw_screen_make_configs(__DRIscreen *dri_screen)
 
       /* Required by Android, for HAL_PIXEL_FORMAT_RGBA_8888. */
       MESA_FORMAT_R8G8B8A8_UNORM,
+      MESA_FORMAT_R8G8B8A8_SRGB,
 
       /* Required by Android, for HAL_PIXEL_FORMAT_RGBX_8888. */
       MESA_FORMAT_R8G8B8X8_UNORM,
-
-      MESA_FORMAT_R8G8B8A8_SRGB,
+      MESA_FORMAT_R8G8B8X8_SRGB,
    };
 
    /* __DRI_ATTRIB_SWAP_COPY is not supported due to page flipping. */