radeonsi: switch to using resource destribtors for constants v2
v2: remove superfluous mask, use buffer_size instead of constant
Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Tom Stellard <thomas.stellard@amd.com>
diff --git a/src/gallium/drivers/radeonsi/radeonsi_shader.c b/src/gallium/drivers/radeonsi/radeonsi_shader.c
index 95ccd1e..c407953 100644
--- a/src/gallium/drivers/radeonsi/radeonsi_shader.c
+++ b/src/gallium/drivers/radeonsi/radeonsi_shader.c
@@ -354,11 +354,10 @@
{
struct si_shader_context *si_shader_ctx = si_shader_context(bld_base);
struct lp_build_context * base = &bld_base->base;
- unsigned idx;
- LLVMValueRef const_ptr;
- LLVMValueRef offset;
- LLVMValueRef load;
+ LLVMValueRef ptr;
+ LLVMValueRef args[2];
+ LLVMValueRef result;
if (swizzle == LP_CHAN_ALL) {
unsigned chan;
@@ -369,23 +368,22 @@
return lp_build_gather_values(bld_base->base.gallivm, values, 4);
}
+ /* Load the resource descriptor */
+ ptr = LLVMGetParam(si_shader_ctx->radeon_bld.main_fn, SI_PARAM_CONST);
+ args[0] = build_indexed_load(base->gallivm, ptr, bld_base->uint_bld.zero);
+
/* currently not supported */
if (reg->Register.Indirect) {
assert(0);
- load = lp_build_const_int32(base->gallivm, 0);
- return bitcast(bld_base, type, load);
- }
+ result = lp_build_const_int32(base->gallivm, 0);
+ return bitcast(bld_base, type, result);
+ } else
+ args[1] = lp_build_const_int32(base->gallivm, (reg->Register.Index * 4 + swizzle) * 4);
- const_ptr = LLVMGetParam(si_shader_ctx->radeon_bld.main_fn, SI_PARAM_CONST);
+ result = build_intrinsic(base->gallivm->builder, "llvm.SI.load.const", base->elem_type,
+ args, 2, LLVMReadOnlyAttribute | LLVMNoUnwindAttribute);
- /* XXX: This assumes that the constant buffer is not packed, so
- * CONST[0].x will have an offset of 0 and CONST[1].x will have an
- * offset of 4. */
- idx = (reg->Register.Index * 4) + swizzle;
- offset = lp_build_const_int32(base->gallivm, idx);
-
- load = build_indexed_load(base->gallivm, const_ptr, offset);
- return bitcast(bld_base, type, load);
+ return bitcast(bld_base, type, result);
}
/* Initialize arguments for the shader export intrinsic */
@@ -931,8 +929,8 @@
v2i32 = LLVMVectorType(i32, 2);
v3i32 = LLVMVectorType(i32, 3);
- params[SI_PARAM_CONST] = LLVMPointerType(f32, CONST_ADDR_SPACE);
- params[SI_PARAM_SAMPLER] = LLVMPointerType(LLVMVectorType(i8, 16), CONST_ADDR_SPACE);
+ params[SI_PARAM_CONST] = LLVMPointerType(LLVMVectorType(i8, 16), CONST_ADDR_SPACE);
+ params[SI_PARAM_SAMPLER] = params[SI_PARAM_CONST];
params[SI_PARAM_RESOURCE] = LLVMPointerType(LLVMVectorType(i8, 32), CONST_ADDR_SPACE);
if (si_shader_ctx->type == TGSI_PROCESSOR_VERTEX) {