From 38ee3246d2a93b0b87e5fc9d214d35217d7a1845 Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Wed, 15 Mar 2017 13:00:02 +0100 Subject: [PATCH] radeonsi: clean up tex_fetch_ptrs() MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Will also help when the src sampler register will be TGSI_FILE_CONSTANT for bindless. Signed-off-by: Samuel Pitoiset Reviewed-by: Marek Olšák --- src/gallium/drivers/radeonsi/si_shader.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/gallium/drivers/radeonsi/si_shader.c b/src/gallium/drivers/radeonsi/si_shader.c index 4abea854aa6..0a931362cea 100644 --- a/src/gallium/drivers/radeonsi/si_shader.c +++ b/src/gallium/drivers/radeonsi/si_shader.c @@ -4234,23 +4234,21 @@ static void tex_fetch_ptrs( { struct si_shader_context *ctx = si_shader_context(bld_base); const struct tgsi_full_instruction *inst = emit_data->inst; + const struct tgsi_full_src_register *reg; unsigned target = inst->Texture.Texture; unsigned sampler_src; - unsigned sampler_index; LLVMValueRef index; sampler_src = emit_data->inst->Instruction.NumSrcRegs - 1; - sampler_index = emit_data->inst->Src[sampler_src].Register.Index; - - if (emit_data->inst->Src[sampler_src].Register.Indirect) { - const struct tgsi_full_src_register *reg = &emit_data->inst->Src[sampler_src]; + reg = &emit_data->inst->Src[sampler_src]; + if (reg->Register.Indirect) { index = get_bounded_indirect_index(ctx, ®->Indirect, reg->Register.Index, SI_NUM_SAMPLERS); } else { - index = LLVMConstInt(ctx->i32, sampler_index, 0); + index = LLVMConstInt(ctx->i32, reg->Register.Index, 0); } if (target == TGSI_TEXTURE_BUFFER) -- 2.30.2