Mesa (master): radeonsi/gfx9: always use IMG_DATA_FORMAT_S8_32 for 8-bit stencil

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 04085bedc26535e47d81e333ee8969b7755421b2
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=04085bedc26535e47d81e333ee8969b7755421b2

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Sat May  2 16:35:16 2020 -0400

radeonsi/gfx9: always use IMG_DATA_FORMAT_S8_32 for 8-bit stencil

I wanna remove dependency on tc_compatible_htile from non-dynamic states.
This should be the same as 8_UINT if HTILE is disabled.

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

---

 src/gallium/drivers/radeonsi/si_state.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/gallium/drivers/radeonsi/si_state.c b/src/gallium/drivers/radeonsi/si_state.c
index baa65452e36..2efafe6b61a 100644
--- a/src/gallium/drivers/radeonsi/si_state.c
+++ b/src/gallium/drivers/radeonsi/si_state.c
@@ -3997,8 +3997,7 @@ static void si_make_texture_descriptor(struct si_screen *screen, struct si_textu
    }
 
    /* S8 with Z32 HTILE needs a special format. */
-   if (screen->info.chip_class == GFX9 && pipe_format == PIPE_FORMAT_S8_UINT &&
-       tex->tc_compatible_htile)
+   if (screen->info.chip_class == GFX9 && pipe_format == PIPE_FORMAT_S8_UINT)
       data_format = V_008F14_IMG_DATA_FORMAT_S8_32;
 
    if (!sampler && (res->target == PIPE_TEXTURE_CUBE || res->target == PIPE_TEXTURE_CUBE_ARRAY ||