radeonsi: implement and use ac_shader_abi::load_ssbo

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
This commit is contained in:
Nicolai Hähnle 2017-06-24 20:03:46 +02:00
parent d46018a4d7
commit a0af3daf9c
2 changed files with 20 additions and 11 deletions

View file

@ -1806,6 +1806,21 @@ static LLVMValueRef load_ubo(struct ac_shader_abi *abi, LLVMValueRef index)
return ac_build_indexed_load_const(&ctx->ac, ptr, index);
}
static LLVMValueRef
load_ssbo(struct ac_shader_abi *abi, LLVMValueRef index, bool write)
{
struct si_shader_context *ctx = si_shader_context_from_abi(abi);
LLVMValueRef rsrc_ptr = LLVMGetParam(ctx->main_fn,
ctx->param_const_and_shader_buffers);
index = si_llvm_bound_index(ctx, index, ctx->num_shader_buffers);
index = LLVMBuildSub(ctx->gallivm.builder,
LLVMConstInt(ctx->i32, SI_NUM_SHADER_BUFFERS - 1, 0),
index, "");
return ac_build_indexed_load_const(&ctx->ac, rsrc_ptr, index);
}
static LLVMValueRef fetch_constant(
struct lp_build_tgsi_context *bld_base,
const struct tgsi_full_src_register *reg,
@ -5646,6 +5661,7 @@ static bool si_compile_tgsi_main(struct si_shader_context *ctx,
}
ctx->abi.load_ubo = load_ubo;
ctx->abi.load_ssbo = load_ssbo;
create_function(ctx);
preload_ring_buffers(ctx);

View file

@ -76,22 +76,15 @@ shader_buffer_fetch_rsrc(struct si_shader_context *ctx,
const struct tgsi_full_src_register *reg)
{
LLVMValueRef index;
LLVMValueRef rsrc_ptr = LLVMGetParam(ctx->main_fn,
ctx->param_const_and_shader_buffers);
if (!reg->Register.Indirect) {
index = LLVMConstInt(ctx->i32,
si_get_shaderbuf_slot(reg->Register.Index), 0);
index = LLVMConstInt(ctx->i32, reg->Register.Index, false);
} else {
index = si_get_bounded_indirect_index(ctx, &reg->Indirect,
reg->Register.Index,
ctx->num_shader_buffers);
index = LLVMBuildSub(ctx->gallivm.builder,
LLVMConstInt(ctx->i32, SI_NUM_SHADER_BUFFERS - 1, 0),
index, "");
index = si_get_indirect_index(ctx, &reg->Indirect,
reg->Register.Index);
}
return ac_build_indexed_load_const(&ctx->ac, rsrc_ptr, index);
return ctx->abi.load_ssbo(&ctx->abi, index, false);
}
static bool tgsi_is_array_sampler(unsigned target)