Mesa (staging/19.1): radv: fix allocating number of user sgprs if streamout is used

[GitLab Mirror]

Module: Mesa
Branch: staging/19.1
Commit: 2959de1f92018919c42f2c445fadfc4a01a699e7
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=2959de1f92018919c42f2c445fadfc4a01a699e7

Author: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Date:   Thu Sep 12 15:58:25 2019 +0200

radv: fix allocating number of user sgprs if streamout is used

streamout_buffers is assigned after that function, so the previous
fix was completely wrong. This probably fix something when streamout
buffers and push constants are used/inlined in the same shader.

Fixes: 378e2d24143 ("radv: fix computing number of user SGPRs for streamout buffers")
Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
(cherry picked from commit 8137df3a46abc6aa6ad0c7179d042e76ca2b2299)
[Juan A. Suarez: fix the structure usage]
Signed-off-by: Juan A. Suarez Romero <jasuarez at igalia.com>

---

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

diff --git a/src/amd/vulkan/radv_nir_to_llvm.c b/src/amd/vulkan/radv_nir_to_llvm.c
index 5201f46b3a8..6b2f176d465 100644
--- a/src/amd/vulkan/radv_nir_to_llvm.c
+++ b/src/amd/vulkan/radv_nir_to_llvm.c
@@ -737,7 +737,7 @@ static void allocate_user_sgprs(struct radv_shader_context *ctx,
 	if (ctx->shader_info->info.loads_push_constants)
 		user_sgpr_count++;
 
-	if (ctx->streamout_buffers)
+	if (ctx->shader_info->info.so.num_outputs)
 		user_sgpr_count++;
 
 	uint32_t available_sgprs = ctx->options->chip_class >= GFX9 && stage != MESA_SHADER_COMPUTE ? 32 : 16;