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

radeonsi: don't use wave32 for GE on gfx10 if culling is used

Browse source 
This is a workaround for issue #6457: it fixes the rendering and
prevent the hang but I can't explain why.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/6457
Cc: mesa-stable
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16427>
(cherry picked from commit 1f31564607)
This commit is contained in:
Pierre-Eric Pelloux-Prayer 2022-05-09 22:20:12 +02:00 • committed by Dylan Baker
parent 9ecad9dfcb
commit c0777e3a4d
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -860,7 +860,7 @@
"description": "radeonsi: don't use wave32 for GE on gfx10 if culling is used",
"nominated": true,
"nomination_type": 0,
"resolution": 0,
"resolution": 1,
"because_sha": null
},
{

5
src/gallium/drivers/radeonsi/si_state_shaders.cpp
View file

@ -114,8 +114,11 @@ unsigned si_determine_wave_size(struct si_screen *sscreen, struct si_shader *sha
/* There are a few very rare cases where VS is better with Wave32, and there are no known
* cases where Wave64 is better.
* Wave32 is disabled for GFX10 when culling is active as a workaround for #6457. I don't
* know why this helps.
*/
if (stage <= MESA_SHADER_GEOMETRY)
if (stage <= MESA_SHADER_GEOMETRY &&
!(sscreen->info.chip_class == GFX10 && shader && shader->key.ge.opt.ngg_culling))
return 32;
/* TODO: Merged shaders must use the same wave size because the driver doesn't recompile