Mesa (main): radeonsi: fix ALPHA_IS_ON_MSB determination

[GitLab Mirror]

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

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Tue Mar 22 03:15:01 2022 -0400

radeonsi: fix ALPHA_IS_ON_MSB determination

based on PAL

Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer at amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15965>

---

 src/gallium/drivers/radeonsi/si_clear.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/gallium/drivers/radeonsi/si_clear.c b/src/gallium/drivers/radeonsi/si_clear.c
index c54f1fd0bfb..69b1163f807 100644
--- a/src/gallium/drivers/radeonsi/si_clear.c
+++ b/src/gallium/drivers/radeonsi/si_clear.c
@@ -169,15 +169,15 @@ bool vi_alpha_is_on_msb(struct si_screen *sscreen, enum pipe_format format)
 {
    format = si_simplify_cb_format(format);
    const struct util_format_description *desc = util_format_description(format);
+   unsigned comp_swap = si_translate_colorswap(format, false);
 
-   /* Formats with 3 channels can't have alpha. */
-   if (desc->nr_channels == 3)
-      return true; /* same as xxxA; is any value OK here? */
-
-   if (sscreen->info.chip_class >= GFX10 && desc->nr_channels == 1)
-      return desc->swizzle[3] == PIPE_SWIZZLE_X;
+   /* The following code matches the hw behavior. */
+   if (desc->nr_channels == 1) {
+      return (comp_swap == V_028C70_SWAP_ALT_REV) != (sscreen->info.family == CHIP_RAVEN2 ||
+                                                      sscreen->info.family == CHIP_RENOIR);
+   }
 
-   return si_translate_colorswap(format, false) <= 1;
+   return comp_swap != V_028C70_SWAP_STD_REV && comp_swap != V_028C70_SWAP_ALT_REV;
 }
 
 static bool vi_get_fast_clear_parameters(struct si_screen *sscreen, enum pipe_format base_format,