Module: Mesa Branch: master Commit: b63e7d4c6f65622171e55f6e9da220d8c913bde6 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=b63e7d4c6f65622171e55f6e9da220d8c913bde6
Author: Marek Olšák <[email protected]> Date: Thu Nov 9 23:34:26 2017 +0100 radeonsi: use ac.lds for shared memory Reviewed-by: Nicolai Hähnle <[email protected]> --- src/gallium/drivers/radeonsi/si_shader.c | 4 ++-- src/gallium/drivers/radeonsi/si_shader_internal.h | 2 -- src/gallium/drivers/radeonsi/si_shader_tgsi_mem.c | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/gallium/drivers/radeonsi/si_shader.c b/src/gallium/drivers/radeonsi/si_shader.c index d7c130a706..bca0ca9224 100644 --- a/src/gallium/drivers/radeonsi/si_shader.c +++ b/src/gallium/drivers/radeonsi/si_shader.c @@ -1905,7 +1905,7 @@ void si_declare_compute_memory(struct si_shader_context *ctx, assert(decl->Declaration.MemType == TGSI_MEMORY_TYPE_SHARED); assert(decl->Range.First == decl->Range.Last); - assert(!ctx->shared_memory); + assert(!ctx->ac.lds); var = LLVMAddGlobalInAddressSpace(ctx->ac.module, LLVMArrayType(ctx->i8, sel->local_size), @@ -1913,7 +1913,7 @@ void si_declare_compute_memory(struct si_shader_context *ctx, LOCAL_ADDR_SPACE); LLVMSetAlignment(var, 4); - ctx->shared_memory = LLVMBuildBitCast(ctx->ac.builder, var, i8p, ""); + ctx->ac.lds = LLVMBuildBitCast(ctx->ac.builder, var, i8p, ""); } static LLVMValueRef load_const_buffer_desc(struct si_shader_context *ctx, int i) diff --git a/src/gallium/drivers/radeonsi/si_shader_internal.h b/src/gallium/drivers/radeonsi/si_shader_internal.h index ebe11fad56..4bd128ef56 100644 --- a/src/gallium/drivers/radeonsi/si_shader_internal.h +++ b/src/gallium/drivers/radeonsi/si_shader_internal.h @@ -221,8 +221,6 @@ struct si_shader_context { LLVMValueRef i32_0; LLVMValueRef i32_1; - - LLVMValueRef shared_memory; }; static inline struct si_shader_context * diff --git a/src/gallium/drivers/radeonsi/si_shader_tgsi_mem.c b/src/gallium/drivers/radeonsi/si_shader_tgsi_mem.c index ec11c75b88..5552cc8c8b 100644 --- a/src/gallium/drivers/radeonsi/si_shader_tgsi_mem.c +++ b/src/gallium/drivers/radeonsi/si_shader_tgsi_mem.c @@ -449,7 +449,7 @@ static LLVMValueRef get_memory_ptr(struct si_shader_context *ctx, offset = lp_build_emit_fetch(&ctx->bld_base, inst, arg, 0); offset = ac_to_integer(&ctx->ac, offset); - ptr = ctx->shared_memory; + ptr = ctx->ac.lds; ptr = LLVMBuildGEP(builder, ptr, &offset, 1, ""); addr_space = LLVMGetPointerAddressSpace(LLVMTypeOf(ptr)); ptr = LLVMBuildBitCast(builder, ptr, LLVMPointerType(type, addr_space), ""); _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
