Mesa (main): radv: Ignore GS copy shader when determining NGG GS wave size.

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Mon May 10 11:48:42 UTC 2021


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

Author: Timur Kristóf <timur.kristof at gmail.com>
Date:   Fri May  7 13:06:08 2021 +0200

radv: Ignore GS copy shader when determining NGG GS wave size.

The GS copy shader is not used with NGG GS.
This fixes a big bug when NGG GS is running in Wave32 mode.

Signed-off-by: Timur Kristóf <timur.kristof at gmail.com>
Reviewed-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10683>

---

 src/amd/vulkan/radv_pipeline.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/amd/vulkan/radv_pipeline.c b/src/amd/vulkan/radv_pipeline.c
index 4f676917642..5a07d652a0e 100644
--- a/src/amd/vulkan/radv_pipeline.c
+++ b/src/amd/vulkan/radv_pipeline.c
@@ -5075,7 +5075,7 @@ radv_pipeline_generate_vgt_shader_config(struct radeon_cmdbuf *ctx_cs,
 
       if (pipeline->shaders[MESA_SHADER_GEOMETRY]) {
          vs_size = gs_size = pipeline->shaders[MESA_SHADER_GEOMETRY]->info.wave_size;
-         if (pipeline->gs_copy_shader)
+         if (radv_pipeline_has_gs_copy_shader(pipeline))
             vs_size = pipeline->gs_copy_shader->info.wave_size;
       } else if (pipeline->shaders[MESA_SHADER_TESS_EVAL])
          vs_size = pipeline->shaders[MESA_SHADER_TESS_EVAL]->info.wave_size;



More information about the mesa-commit mailing list