Mesa (main): radeonsi: fix random PS wave size

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 3b36700162c8a3a950e930714003d60ba672db8c
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=3b36700162c8a3a950e930714003d60ba672db8c

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Wed Jun 29 15:18:55 2022 -0400

radeonsi: fix random PS wave size

Fixes: b3b2f97f2e25b2c "radeonsi: add Wave32 heuristics and shader profiles"

Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer at amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17410>

---

 src/gallium/drivers/radeonsi/si_state_shaders.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gallium/drivers/radeonsi/si_state_shaders.cpp b/src/gallium/drivers/radeonsi/si_state_shaders.cpp
index 7fd3f9cf934..fa349a20ce1 100644
--- a/src/gallium/drivers/radeonsi/si_state_shaders.cpp
+++ b/src/gallium/drivers/radeonsi/si_state_shaders.cpp
@@ -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);