From fa0bf725bca14ed76a7e4a93a957283ecce7bf91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Fri, 3 Jan 2025 23:41:54 -0500 Subject: [PATCH] radeonsi: ignore PIPE_RESOURCE_FLAG_TEXTURING_MORE_LIKELY for TC-compatible HTILE We enable it on demand anyway, which seems better than relying on a flag. Reviewed-by: Pierre-Eric Pelloux-Prayer Part-of: --- src/gallium/drivers/radeonsi/si_texture.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/gallium/drivers/radeonsi/si_texture.c b/src/gallium/drivers/radeonsi/si_texture.c index a00e46c8521..0ff6f8609ea 100644 --- a/src/gallium/drivers/radeonsi/si_texture.c +++ b/src/gallium/drivers/radeonsi/si_texture.c @@ -1409,16 +1409,9 @@ si_texture_create_with_modifier(struct pipe_screen *screen, bool is_flushed_depth = templ->flags & SI_RESOURCE_FLAG_FLUSHED_DEPTH || templ->flags & SI_RESOURCE_FLAG_FORCE_LINEAR; - /* We enable TC-compatible HTILE for all Z/S on GFX11+ by default because non-TC-compatible - * HTILE causes corruption on Navi31. - * - * See: https://gitlab.freedesktop.org/mesa/mesa/-/issues/11891 - */ bool tc_compatible_htile = is_zs && !is_flushed_depth && !(sscreen->debug_flags & DBG(NO_HYPERZ)) && - sscreen->info.has_tc_compatible_htile && - (sscreen->info.gfx_level >= GFX11 || - templ->flags & PIPE_RESOURCE_FLAG_TEXTURING_MORE_LIKELY); + sscreen->info.has_tc_compatible_htile; enum radeon_surf_mode tile_mode = si_choose_tiling(sscreen, templ, tc_compatible_htile);