From: Nicolai Hähnle <nicolai.haehnle@amd.com>
Date: Sat, 20 May 2017 15:19:50 +0000 (+0200)
Subject: ac/nir,radeonsi: add ac_shader_abi::load_ubo
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d007919d999c812bbef481f0605c64f7e0f225b7;p=mesa.git

ac/nir,radeonsi: add ac_shader_abi::load_ubo

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
---

diff --git a/src/amd/common/ac_nir_to_llvm.c b/src/amd/common/ac_nir_to_llvm.c
index b3c18d391b1..e6befff861c 100644
--- a/src/amd/common/ac_nir_to_llvm.c
+++ b/src/amd/common/ac_nir_to_llvm.c
@@ -2454,6 +2454,9 @@ static LLVMValueRef visit_load_ubo_buffer(struct ac_nir_context *ctx,
 	LLVMValueRef offset = get_src(ctx, instr->src[1]);
 	int num_components = instr->num_components;
 
+	if (ctx->abi->load_ubo)
+		rsrc = ctx->abi->load_ubo(ctx->abi, rsrc);
+
 	if (instr->dest.ssa.bit_size == 64)
 		num_components *= 2;
 
diff --git a/src/amd/common/ac_shader_abi.h b/src/amd/common/ac_shader_abi.h
index 81fbc22bb4d..b0161d9f220 100644
--- a/src/amd/common/ac_shader_abi.h
+++ b/src/amd/common/ac_shader_abi.h
@@ -46,6 +46,8 @@ struct ac_shader_abi {
 	void (*emit_outputs)(struct ac_shader_abi *abi,
 			     unsigned max_outputs,
 			     LLVMValueRef *addrs);
+
+	LLVMValueRef (*load_ubo)(struct ac_shader_abi *abi, LLVMValueRef index);
 };
 
 #endif /* AC_SHADER_ABI_H */
diff --git a/src/gallium/drivers/radeonsi/si_shader.c b/src/gallium/drivers/radeonsi/si_shader.c
index 900b3c3a7f1..0d25773cc3d 100644
--- a/src/gallium/drivers/radeonsi/si_shader.c
+++ b/src/gallium/drivers/radeonsi/si_shader.c
@@ -1776,6 +1776,18 @@ static LLVMValueRef load_const_buffer_desc(struct si_shader_context *ctx, int i)
 			LLVMConstInt(ctx->i32, si_get_constbuf_slot(i), 0));
 }
 
+static LLVMValueRef load_ubo(struct ac_shader_abi *abi, LLVMValueRef index)
+{
+	struct si_shader_context *ctx = si_shader_context_from_abi(abi);
+	LLVMValueRef ptr = LLVMGetParam(ctx->main_fn, ctx->param_const_and_shader_buffers);
+
+	index = si_llvm_bound_index(ctx, index, ctx->num_const_buffers);
+	index = LLVMBuildAdd(ctx->gallivm.builder, index,
+			     LLVMConstInt(ctx->i32, SI_NUM_SHADER_BUFFERS, 0), "");
+
+	return ac_build_indexed_load_const(&ctx->ac, ptr, index);
+}
+
 static LLVMValueRef fetch_constant(
 	struct lp_build_tgsi_context *bld_base,
 	const struct tgsi_full_src_register *reg,
@@ -5609,6 +5621,8 @@ static bool si_compile_tgsi_main(struct si_shader_context *ctx,
 		return false;
 	}
 
+	ctx->abi.load_ubo = load_ubo;
+
 	create_function(ctx);
 	preload_ring_buffers(ctx);