From: Marek Olšák <marek.olsak@amd.com>
Date: Thu, 30 Jul 2020 11:47:42 +0000 (-0400)
Subject: radeonsi: use correct wave size in gfx10_ngg_calculate_subgroup_info
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b6fb09fd843293a4e5269cc457b6685435822d31;p=mesa.git

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@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6137>
---

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 {