Skip to content

Commit

Permalink
radeonsi: fix fb_too_small condition
Browse files Browse the repository at this point in the history
fb->num_layers can be 0 so use util_num_layers(tex) instead.

Fixes: f7c5855 ("radeonsi: refine fast clears for small buffers, always use them for large HTILE")
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/4764
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11625>
  • Loading branch information
peppsac committed Jun 29, 2021
1 parent b564ec7 commit b72c7c6
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion src/gallium/drivers/radeonsi/si_clear.c
Expand Up @@ -541,7 +541,7 @@ static void si_fast_clear(struct si_context *sctx, unsigned *buffers,
struct si_clear_info info[8 * 2 + 1]; /* MRTs * (CMASK + DCC) + ZS */
unsigned num_clears = 0;
unsigned clear_types = 0;
bool fb_too_small = fb->width * fb->height * fb->layers <= 512 * 512;
unsigned num_pixels = fb->width * fb->height;

/* This function is broken in BE, so just disable this path for now */
#if UTIL_ARCH_BIG_ENDIAN
Expand Down Expand Up @@ -595,6 +595,7 @@ static void si_fast_clear(struct si_context *sctx, unsigned *buffers,
*
* This helps on both dGPUs and APUs, even small APUs like Mullins.
*/
bool fb_too_small = num_pixels * num_layers <= 512 * 512;
bool too_small = tex->buffer.b.b.nr_samples <= 1 && fb_too_small;
bool eliminate_needed = false;
bool fmask_decompress_needed = false;
Expand Down Expand Up @@ -768,6 +769,7 @@ static void si_fast_clear(struct si_context *sctx, unsigned *buffers,
unsigned level = zsbuf->u.tex.level;
bool update_db_depth_clear = false;
bool update_db_stencil_clear = false;
bool fb_too_small = num_pixels * zs_num_layers <= 512 * 512;

/* Transition from TC-incompatible to TC-compatible HTILE if requested. */
if (zstex->enable_tc_compatible_htile_next_clear) {
Expand Down

0 comments on commit b72c7c6

Please sign in to comment.