[Mesa-dev] [PATCH 34/61] radeonsi: rename declare_tess_lds -> declare_lds_as_pointer

[Marek Olšák]

From: Marek Olšák <marek.ol...@amd.com>

---
 src/gallium/drivers/radeonsi/si_shader.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/gallium/drivers/radeonsi/si_shader.c 
b/src/gallium/drivers/radeonsi/si_shader.c
index 2b25a32..752f819 100644
--- a/src/gallium/drivers/radeonsi/si_shader.c
+++ b/src/gallium/drivers/radeonsi/si_shader.c
@@ -5684,28 +5684,28 @@ static unsigned llvm_get_type_size(LLVMTypeRef type)
                       llvm_get_type_size(LLVMGetElementType(type));
        case LLVMArrayTypeKind:
                return LLVMGetArrayLength(type) *
                       llvm_get_type_size(LLVMGetElementType(type));
        default:
                assert(0);
                return 0;
        }
 }
 
-static void declare_tess_lds(struct si_shader_context *ctx)
+static void declare_lds_as_pointer(struct si_shader_context *ctx)
 {
        struct gallivm_state *gallivm = &ctx->gallivm;
 
        unsigned lds_size = ctx->screen->b.chip_class >= CIK ? 65536 : 32768;
        ctx->lds = LLVMBuildIntToPtr(gallivm->builder, ctx->i32_0,
                LLVMPointerType(LLVMArrayType(ctx->i32, lds_size / 4), 
LOCAL_ADDR_SPACE),
-               "tess_lds");
+               "lds");
 }
 
 static unsigned si_get_max_workgroup_size(struct si_shader *shader)
 {
        const unsigned *properties = shader->selector->info.properties;
        unsigned max_work_group_size =
                       properties[TGSI_PROPERTY_CS_FIXED_BLOCK_WIDTH] *
                       properties[TGSI_PROPERTY_CS_FIXED_BLOCK_HEIGHT] *
                       properties[TGSI_PROPERTY_CS_FIXED_BLOCK_DEPTH];
 
@@ -6078,21 +6078,21 @@ static void create_function(struct si_shader_context 
*ctx)
             bld_base->info->opcode_count[TGSI_OPCODE_INTERP_OFFSET] > 0 ||
             bld_base->info->opcode_count[TGSI_OPCODE_INTERP_SAMPLE] > 0))
                ctx->lds =
                        LLVMAddGlobalInAddressSpace(gallivm->module,
                                                    LLVMArrayType(ctx->i32, 64),
                                                    "ddxy_lds",
                                                    LOCAL_ADDR_SPACE);
 
        if (shader->key.as_ls ||
            ctx->type == PIPE_SHADER_TESS_CTRL)
-               declare_tess_lds(ctx);
+               declare_lds_as_pointer(ctx);
 }
 
 /**
  * Load ESGS and GSVS ring buffer resource descriptors and save the variables
  * for later use.
  */
 static void preload_ring_buffers(struct si_shader_context *ctx)
 {
        struct gallivm_state *gallivm = &ctx->gallivm;
        LLVMBuilderRef builder = gallivm->builder;
@@ -8506,21 +8506,21 @@ static void si_build_tcs_epilog_function(struct 
si_shader_context *ctx,
                params[ctx->param_tcs_factor_offset = num_params++] = ctx->i32;
        }
        last_sgpr = num_params - 1;
 
        params[num_params++] = ctx->i32; /* patch index within the wave 
(REL_PATCH_ID) */
        params[num_params++] = ctx->i32; /* invocation ID within the patch */
        params[num_params++] = ctx->i32; /* LDS offset where tess factors 
should be loaded from */
 
        /* Create the function. */
        si_create_function(ctx, "tcs_epilog", NULL, 0, params, num_params, 
last_sgpr);
-       declare_tess_lds(ctx);
+       declare_lds_as_pointer(ctx);
        func = ctx->main_fn;
 
        si_write_tess_factors(bld_base,
                              LLVMGetParam(func, last_sgpr + 1),
                              LLVMGetParam(func, last_sgpr + 2),
                              LLVMGetParam(func, last_sgpr + 3));
 
        LLVMBuildRetVoid(gallivm->builder);
 }
 
-- 
2.7.4

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