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

radeonsi: fix random PS wave size

Browse source 
Fixes: b3b2f97f2e "radeonsi: add Wave32 heuristics and shader profiles"

Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17410>
(cherry picked from commit 3b36700162)
This commit is contained in:
Marek Olšák 2022-06-29 15:18:55 -04:00 • committed by Dylan Baker
parent 6da016cded
commit 4514fdff78
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -634,7 +634,7 @@
"description": "radeonsi: fix random PS wave size",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": "b3b2f97f2e25b2c4c72e5f04c945ce9c48ce6cd6"
},

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

@ -124,7 +124,7 @@ unsigned si_determine_wave_size(struct si_screen *sscreen, struct si_shader *sha
/* TODO: Merged shaders must use the same wave size because the driver doesn't recompile
* individual shaders of merged shaders to match the wave size between them.
*/
bool merged_shader = shader && !shader->is_gs_copy_shader &&
bool merged_shader = stage <= MESA_SHADER_GEOMETRY && shader && !shader->is_gs_copy_shader &&
(shader->key.ge.as_ls || shader->key.ge.as_es ||
stage == MESA_SHADER_TESS_CTRL || stage == MESA_SHADER_GEOMETRY);