From 494a5c350126268c45f3055687e22593a3fd74f4 Mon Sep 17 00:00:00 2001 From: Timothy Arceri Date: Thu, 22 Mar 2018 11:55:20 +1100 Subject: [PATCH] radeonsi/nir: tidy up si_nir_load_sampler_desc() MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This makes it easier to follow the code, and also initialises dynamic_index which will be useful for adding bindless textures support. Reviewed-by: Marek Olšák --- src/gallium/drivers/radeonsi/si_shader_nir.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/gallium/drivers/radeonsi/si_shader_nir.c b/src/gallium/drivers/radeonsi/si_shader_nir.c index 45cbf1ce7f3..c0e08c79a56 100644 --- a/src/gallium/drivers/radeonsi/si_shader_nir.c +++ b/src/gallium/drivers/radeonsi/si_shader_nir.c @@ -885,14 +885,12 @@ si_nir_load_sampler_desc(struct ac_shader_abi *abi, struct si_shader_context *ctx = si_shader_context_from_abi(abi); LLVMBuilderRef builder = ctx->ac.builder; LLVMValueRef list = LLVMGetParam(ctx->main_fn, ctx->param_samplers_and_images); - LLVMValueRef index = dynamic_index; + LLVMValueRef index; assert(!descriptor_set); - if (!index) - index = ctx->ac.i32_0; - - index = LLVMBuildAdd(builder, index, + dynamic_index = dynamic_index ? dynamic_index : ctx->ac.i32_0; + index = LLVMBuildAdd(builder, dynamic_index, LLVMConstInt(ctx->ac.i32, base_index + constant_index, false), ""); -- 2.30.2