fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-08 04:48:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

radeonsi: fix fb_too_small condition

Browse source 
fb->num_layers can be 0 so use util_num_layers(tex) instead.

Fixes: f7c58559f5 ("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>
(cherry picked from commit b72c7c6c56)
This commit is contained in:
Pierre-Eric Pelloux-Prayer 2021-06-21 15:11:27 +02:00 • committed by Eric Engestrom
parent f1e122758e
commit bea0897878
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -148,7 +148,7 @@
"description": "radeonsi: fix fb_too_small condition",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": "f7c58559f5731790f4e68f1b1cb38c10818efa96"
},

4
src/gallium/drivers/radeonsi/si_clear.c
View file

@ -548,7 +548,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
@ -602,6 +602,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;
@ -791,6 +792,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) {