Mesa (master): radeonsi: use correct wave size in gfx10_ngg_calculate_subgroup_info

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: b6fb09fd843293a4e5269cc457b6685435822d31
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=b6fb09fd843293a4e5269cc457b6685435822d31

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Thu Jul 30 07:47:42 2020 -0400

radeonsi: use correct wave size in gfx10_ngg_calculate_subgroup_info

Fixes: 88efb63cafc ("radeonsi/gfx10: implement Wave32")

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

---

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

diff --git a/src/gallium/drivers/radeonsi/gfx10_shader_ngg.c b/src/gallium/drivers/radeonsi/gfx10_shader_ngg.c
index 36e84ec12e0..c7b55568502 100644
--- a/src/gallium/drivers/radeonsi/gfx10_shader_ngg.c
+++ b/src/gallium/drivers/radeonsi/gfx10_shader_ngg.c
@@ -2008,7 +2008,7 @@ retry_select_mode:
 
    /* Round up towards full wave sizes for better ALU utilization. */
    if (!max_vert_out_per_gs_instance) {
-      const unsigned wavesize = gs_sel->screen->ge_wave_size;
+      const unsigned wavesize = si_get_shader_wave_size(shader);
       unsigned orig_max_esverts;
       unsigned orig_max_gsprims;
       do {