Re: [Mesa-dev] [PATCH] ac/nir: call glsl_get_sampler_dim() only once, where possible

[Dieter Nützel]

Tested-by: Dieter Nützel <die...@nuetzel-hh.de>

radeonsi | + NIR and vulkan

Am 20.01.2018 10:15, schrieb Kai Wasserbäch:

Signed-off-by: Kai Wasserbäch <k...@dev.carbon-project.org>
---

Hey,

if you accept this patch, please commit it for me – I do not have commit

access.

Thanks,
Kai


 src/amd/common/ac_nir_to_llvm.c | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/amd/common/ac_nir_to_llvm.c b/src/amd/common/ac_nir_to_llvm.c

index 2aef51be85..999e095019 100644
--- a/src/amd/common/ac_nir_to_llvm.c
+++ b/src/amd/common/ac_nir_to_llvm.c
@@ -3622,7 +3622,9 @@ static LLVMValueRef visit_image_load(struct
ac_nir_context *ctx,
                type = instr->variables[0]->deref.child->type;

        type = glsl_without_array(type);
-       if (glsl_get_sampler_dim(type) == GLSL_SAMPLER_DIM_BUF) {
+
+       const enum glsl_sampler_dim dim = glsl_get_sampler_dim(type);
+       if (dim == GLSL_SAMPLER_DIM_BUF) {
                params[0] = get_sampler_desc(ctx, instr->variables[0],
AC_DESC_BUFFER, NULL, true, false);
                params[1] = LLVMBuildExtractElement(ctx->ac.builder, 
get_src(ctx,
instr->src[0]),
                                                    ctx->ac.i32_0, ""); /* 
vindex */
@@ -3636,9 +3638,9 @@ static LLVMValueRef visit_image_load(struct
ac_nir_context *ctx,
                res = ac_to_integer(&ctx->ac, res);
        } else {
                bool is_da = glsl_sampler_type_is_array(type) ||
-                            glsl_get_sampler_dim(type) == 
GLSL_SAMPLER_DIM_CUBE ||
-                            glsl_get_sampler_dim(type) == 
GLSL_SAMPLER_DIM_SUBPASS ||
-                            glsl_get_sampler_dim(type) == 
GLSL_SAMPLER_DIM_SUBPASS_MS;
+                            dim == GLSL_SAMPLER_DIM_CUBE ||
+                            dim == GLSL_SAMPLER_DIM_SUBPASS ||
+                            dim == GLSL_SAMPLER_DIM_SUBPASS_MS;
                LLVMValueRef da = is_da ? ctx->ac.i1true : ctx->ac.i1false;
                LLVMValueRef glc = ctx->ac.i1false;
                LLVMValueRef slc = ctx->ac.i1false;
@@ -3678,12 +3680,13 @@ static void visit_image_store(struct
ac_nir_context *ctx,
        char intrinsic_name[64];
        const nir_variable *var = instr->variables[0]->var;
        const struct glsl_type *type = glsl_without_array(var->type);
+       const enum glsl_sampler_dim dim = glsl_get_sampler_dim(type);
        LLVMValueRef glc = ctx->ac.i1false;
        bool force_glc = ctx->ac.chip_class == SI;
        if (force_glc)
                glc = ctx->ac.i1true;

-       if (glsl_get_sampler_dim(type) == GLSL_SAMPLER_DIM_BUF) {
+       if (dim == GLSL_SAMPLER_DIM_BUF) {

params[0] = ac_to_float(&ctx->ac, get_src(ctx, instr->src[2])); /* data */

                params[1] = get_sampler_desc(ctx, instr->variables[0],
AC_DESC_BUFFER, NULL, true, true);
                params[2] = LLVMBuildExtractElement(ctx->ac.builder, 
get_src(ctx,
instr->src[0]),

@@ -3695,7 +3698,7 @@ static void visit_image_store(struct ac_nir_context *ctx,

                                   params, 6, 0);
        } else {
                bool is_da = glsl_sampler_type_is_array(type) ||
-                            glsl_get_sampler_dim(type) == 
GLSL_SAMPLER_DIM_CUBE;
+                            dim == GLSL_SAMPLER_DIM_CUBE;
                LLVMValueRef da = is_da ? ctx->ac.i1true : ctx->ac.i1false;
                LLVMValueRef slc = ctx->ac.i1false;

_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev