Mesa (master): radv: fix computation of user sgprs for 32-bit pointers

[Samuel Pitoiset]

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

Author: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Date:   Mon May 21 16:57:54 2018 +0200

radv: fix computation of user sgprs for 32-bit pointers

With 32-bit pointers we only need one user SGPR per desc set.

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

---

 src/amd/vulkan/radv_nir_to_llvm.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/amd/vulkan/radv_nir_to_llvm.c b/src/amd/vulkan/radv_nir_to_llvm.c
index 39692e99fd..b174c027d9 100644
--- a/src/amd/vulkan/radv_nir_to_llvm.c
+++ b/src/amd/vulkan/radv_nir_to_llvm.c
@@ -694,8 +694,10 @@ static void allocate_user_sgprs(struct radv_shader_context *ctx,
 
 	uint32_t available_sgprs = ctx->options->chip_class >= GFX9 ? 32 : 16;
 	uint32_t remaining_sgprs = available_sgprs - user_sgpr_count;
+	uint32_t num_desc_set =
+		util_bitcount(ctx->shader_info->info.desc_set_used_mask);
 
-	if (remaining_sgprs / 2 < util_bitcount(ctx->shader_info->info.desc_set_used_mask)) {
+	if (remaining_sgprs / (HAVE_32BIT_POINTERS ? 1 : 2) < num_desc_set) {
 		user_sgpr_info->indirect_all_descriptor_sets = true;
 	}
 }