X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Famd%2Fvulkan%2Fradv_nir_to_llvm.c;h=a6b48e297da7541923ccdd85f87b7dac3d0b0112;hb=72ab499c9f9fbfa27645168b688ad03ad5d51242;hp=c8d383e021d0fbf51624cd94d81fbf14e37703b9;hpb=4e9b0b39b592e2bf79ac577ec6cd091a924359ae;p=mesa.git

diff --git a/src/amd/vulkan/radv_nir_to_llvm.c b/src/amd/vulkan/radv_nir_to_llvm.c
index c8d383e021d..a6b48e297da 100644
--- a/src/amd/vulkan/radv_nir_to_llvm.c
+++ b/src/amd/vulkan/radv_nir_to_llvm.c
@@ -32,6 +32,9 @@
 #include <llvm-c/Core.h>
 #include <llvm-c/TargetMachine.h>
 #include <llvm-c/Transforms/Scalar.h>
+#if HAVE_LLVM >= 0x0700
+#include <llvm-c/Transforms/Utils.h>
+#endif
 
 #include "sid.h"
 #include "gfx9d.h"
@@ -1699,7 +1702,8 @@ static LLVMValueRef radv_get_sampler_desc(struct ac_shader_abi *abi,
 					  unsigned constant_index,
 					  LLVMValueRef index,
 					  enum ac_descriptor_type desc_type,
-					  bool image, bool write)
+					  bool image, bool write,
+					  bool bindless)
 {
 	struct radv_shader_context *ctx = radv_shader_context_from_abi(abi);
 	LLVMValueRef list = ctx->descriptor_sets[descriptor_set];
@@ -1790,14 +1794,26 @@ handle_vs_input_decl(struct radv_shader_context *ctx,
 
 	for (unsigned i = 0; i < attrib_count; ++i, ++idx) {
 		if (ctx->options->key.vs.instance_rate_inputs & (1u << (index + i))) {
-			buffer_index = LLVMBuildAdd(ctx->ac.builder, ctx->abi.instance_id,
-			                            ctx->abi.start_instance, "");
-			if (ctx->options->key.vs.as_ls) {
-				ctx->shader_info->vs.vgpr_comp_cnt =
-					MAX2(2, ctx->shader_info->vs.vgpr_comp_cnt);
+			uint32_t divisor = ctx->options->key.vs.instance_rate_divisors[index + i];
+
+			if (divisor) {
+				buffer_index = LLVMBuildAdd(ctx->ac.builder, ctx->abi.instance_id,
+				                            ctx->abi.start_instance, "");
+
+				if (divisor != 1) {
+					buffer_index = LLVMBuildUDiv(ctx->ac.builder, buffer_index,
+					                             LLVMConstInt(ctx->ac.i32, divisor, 0), "");
+				}
+
+				if (ctx->options->key.vs.as_ls) {
+					ctx->shader_info->vs.vgpr_comp_cnt =
+						MAX2(2, ctx->shader_info->vs.vgpr_comp_cnt);
+				} else {
+					ctx->shader_info->vs.vgpr_comp_cnt =
+						MAX2(1, ctx->shader_info->vs.vgpr_comp_cnt);
+				}
 			} else {
-				ctx->shader_info->vs.vgpr_comp_cnt =
-					MAX2(1, ctx->shader_info->vs.vgpr_comp_cnt);
+				buffer_index = ctx->ac.i32_0;
 			}
 		} else
 			buffer_index = LLVMBuildAdd(ctx->ac.builder, ctx->abi.vertex_id,
@@ -3067,6 +3083,7 @@ LLVMModuleRef ac_translate_nir_to_llvm(LLVMTargetMachineRef tm,
 	ctx.abi.load_sampler_desc = radv_get_sampler_desc;
 	ctx.abi.load_resource = radv_load_resource;
 	ctx.abi.clamp_shadow_reference = false;
+	ctx.abi.gfx9_stride_size_workaround = ctx.ac.chip_class == GFX9;
 
 	if (shader_count >= 2)
 		ac_init_exec_full_mask(&ctx.ac);