<div dir="ltr"><span style="color:rgb(34,34,34);font-family:arial,sans-serif;font-size:12.8px;font-style:normal;font-variant-ligatures:normal;font-variant-caps:normal;font-weight:400;letter-spacing:normal;text-align:start;text-indent:0px;text-transform:none;white-space:normal;word-spacing:0px;background-color:rgb(255,255,255);text-decoration-style:initial;text-decoration-color:initial;float:none;display:inline">Reviewed-by: Bas Nieuwenhuizen <<a href="mailto:bas@basnieuwenhuizen.nl">bas@basnieuwenhuizen.nl</a>> <div><span style="color:rgb(34,34,34);font-family:arial,sans-serif;font-size:12.8px;font-style:normal;font-variant-ligatures:normal;font-variant-caps:normal;font-weight:400;letter-spacing:normal;text-align:start;text-indent:0px;text-transform:none;white-space:normal;word-spacing:0px;background-color:rgb(255,255,255);text-decoration-style:initial;text-decoration-color:initial;float:none;display:inline"> </div><div><span style="color:rgb(34,34,34);font-family:arial,sans-serif;font-size:12.8px;font-style:normal;font-variant-ligatures:normal;font-variant-caps:normal;font-weight:400;letter-spacing:normal;text-align:start;text-indent:0px;text-transform:none;white-space:normal;word-spacing:0px;background-color:rgb(255,255,255);text-decoration-style:initial;text-decoration-color:initial;float:none;display:inline">for the series.</div></div><div class="gmail_extra"> <div class="gmail_quote">On Tue, Feb 20, 2018 at 11:11 AM, Samuel Pitoiset <<a href="mailto:samuel.pitoiset@gmail.com" target="_blank">samuel.pitoiset@gmail.com</a>> wrote: <blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">For consistency. Signed-off-by: Samuel Pitoiset <<a href="mailto:samuel.pitoiset@gmail.com">samuel.pitoiset@gmail.com</a>> --- src/amd/common/ac_nir_to_llvm.c | 41 ++++++++++++++++++----------------------- 1 file changed, 18 insertions(+), 23 deletions(-) diff --git a/src/amd/common/ac_nir_to_llvm.c b/src/amd/common/ac_nir_to_llvm.c index 9244f8bc7b..8840bc8cc3 100644 --- a/src/amd/common/ac_nir_to_llvm.c +++ b/src/amd/common/ac_nir_to_llvm.c @@ -3419,6 +3419,19 @@ static int image_type_to_components_count(enum glsl_sampler_dim dim, bool array) return 0; } +static bool +glsl_is_array_image(const struct glsl_type *type) +{ + const enum glsl_sampler_dim dim = glsl_get_sampler_dim(type); + + if (glsl_sampler_type_is_array(type)) + return true; + + return dim == GLSL_SAMPLER_DIM_CUBE || + dim == GLSL_SAMPLER_DIM_3D || + dim == GLSL_SAMPLER_DIM_SUBPASS || + dim == GLSL_SAMPLER_DIM_SUBPASS_MS; +} /* Adjust the sample index according to FMASK. @@ -3623,12 +3636,7 @@ static LLVMValueRef visit_image_load(struct ac_nir_context *ctx, res = trim_vector(&ctx->ac, res, instr->dest.ssa.num_components); res = ac_to_integer(&ctx->ac, res); } else { - bool is_da = glsl_sampler_type_is_array(type) || - dim == GLSL_SAMPLER_DIM_CUBE || - dim == GLSL_SAMPLER_DIM_3D || - dim == GLSL_SAMPLER_DIM_SUBPASS || - dim == GLSL_SAMPLER_DIM_SUBPASS_MS; - LLVMValueRef da = is_da ? ctx->ac.i1true : ctx->ac.i1false; + LLVMValueRef da = glsl_is_array_image(type) ? ctx->ac.i1true : ctx->ac.i1false; LLVMValueRef glc = ctx->ac.i1false; LLVMValueRef slc = ctx->ac.i1false; @@ -3676,10 +3684,7 @@ static void visit_image_store(struct ac_nir_context *ctx, ac_build_intrinsic(&ctx->ac, "llvm.amdgcn.buffer.store.format.v4f32", ctx->ac.voidt, params, 6, 0); } else { - bool is_da = glsl_sampler_type_is_array(type) || - dim == GLSL_SAMPLER_DIM_CUBE || - dim == GLSL_SAMPLER_DIM_3D; - LLVMValueRef da = is_da ? ctx->ac.i1true : ctx->ac.i1false; + LLVMValueRef da = glsl_is_array_image(type) ? ctx->ac.i1true : ctx->ac.i1false; LLVMValueRef slc = ctx->ac.i1false; params[0] = ac_to_float(&ctx->ac, get_src(ctx, instr->src[2])); @@ -3763,15 +3768,11 @@ static LLVMValueRef visit_image_atomic(struct ac_nir_context *ctx, } else { char coords_type[8]; - bool da = glsl_sampler_type_is_array(type) || - glsl_get_sampler_dim(type) == GLSL_SAMPLER_DIM_CUBE || - glsl_get_sampler_dim(type) == GLSL_SAMPLER_DIM_3D; - LLVMValueRef coords = params[param_count++] = get_image_coords(ctx, instr); params[param_count++] = get_sampler_desc(ctx, instr->variables[0], AC_DESC_IMAGE, NULL, true, true); params[param_count++] = ctx->ac.i1false; /* r128 */ - params[param_count++] = da ? ctx->ac.i1true : ctx->ac.i1false; /* da */ + params[param_count++] = glsl_is_array_image(type) ? ctx->ac.i1true : ctx->ac.i1false; /* da */ params[param_count++] = ctx->ac.i1false; /* slc */ build_int_type_name(LLVMTypeOf(coords), @@ -3790,12 +3791,9 @@ static LLVMValueRef visit_image_samples(struct ac_nir_context *ctx, { const nir_variable *var = instr->variables[0]->var; const struct glsl_type *type = glsl_without_array(var->type); - bool da = glsl_sampler_type_is_array(type) || - glsl_get_sampler_dim(type) == GLSL_SAMPLER_DIM_CUBE || - glsl_get_sampler_dim(type) == GLSL_SAMPLER_DIM_3D; struct ac_image_args args = { 0 }; - args.da = da; + args.da = glsl_is_array_image(type); args.dmask = 0xf; args.resource = get_sampler_desc(ctx, instr->variables[0], AC_DESC_IMAGE, NULL, true, false); @@ -3811,9 +3809,6 @@ static LLVMValueRef visit_image_size(struct ac_nir_context *ctx, LLVMValueRef res; const nir_variable *var = instr->variables[0]->var; const struct glsl_type *type = glsl_without_array(var->type); - bool da = glsl_sampler_type_is_array(type) || - glsl_get_sampler_dim(type) == GLSL_SAMPLER_DIM_CUBE || - glsl_get_sampler_dim(type) == GLSL_SAMPLER_DIM_3D; if (glsl_get_sampler_dim(type) == GLSL_SAMPLER_DIM_BUF) return get_buffer_size(ctx, @@ -3822,7 +3817,7 @@ static LLVMValueRef visit_image_size(struct ac_nir_context *ctx, struct ac_image_args args = { 0 }; - args.da = da; + args.da = glsl_is_array_image(type); args.dmask = 0xf; args.resource = get_sampler_desc(ctx, instr->variables[0], AC_DESC_IMAGE, NULL, true, false); args.opcode = ac_image_get_resinfo; -- 2.16.2 _______________________________________________ mesa-dev mailing list <a href="mailto:mesa-dev@lists.freedesktop.org">mesa-dev@lists.freedesktop.org</a> <a href="https://lists.freedesktop.org/mailman/listinfo/mesa-dev" rel="noreferrer" target="_blank">https://lists.freedesktop.org/mailman/listinfo/mesa-dev</a> </blockquote></div> </div>