Mesa (master): radv/gfx10: enable NGG_WAVE_ID_EN for NGG streamout

[GitLab Mirror]

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

Author: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Date:   Tue Sep 10 21:45:57 2019 +0200

radv/gfx10: enable NGG_WAVE_ID_EN for NGG streamout

Otherwise the wave IDs are probably 0 and it hangs. NGG_WAVE_ID_EN
generates wave IDs for GDS OA.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>

---

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

diff --git a/src/amd/vulkan/radv_pipeline.c b/src/amd/vulkan/radv_pipeline.c
index 56d63e5f50f..52e5df03809 100644
--- a/src/amd/vulkan/radv_pipeline.c
+++ b/src/amd/vulkan/radv_pipeline.c
@@ -4284,6 +4284,8 @@ radv_compute_vgt_shader_stages_en(const struct radv_pipeline *pipeline)
 
 	if (radv_pipeline_has_ngg(pipeline)) {
 		stages |= S_028B54_PRIMGEN_EN(1);
+		if (pipeline->streamout_shader)
+			stages |= S_028B54_NGG_WAVE_ID_EN(1);
 	} else if (radv_pipeline_has_gs(pipeline)) {
 		stages |= S_028B54_VS_EN(V_028B54_VS_STAGE_COPY_SHADER);
 	}