fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-23 13:20:14 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

radeon/llvm: don't use a static array size for radeon_llvm_context::arrays (v2)

Browse source 
v2: - don't use realloc (tgsi_shader_info provides the size)

Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
This commit is contained in:
Marek Olšák 2015-05-26 15:35:10 +02:00
parent 065978d36b
commit 7afc992c20
2 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/gallium/drivers/radeon/radeon_llvm.h
View file

@ -33,7 +33,6 @@
#define RADEON_LLVM_MAX_INPUTS 32 * 4 #define RADEON_LLVM_MAX_INPUTS 32 * 4
#define RADEON_LLVM_MAX_OUTPUTS 32 * 4 #define RADEON_LLVM_MAX_OUTPUTS 32 * 4
#define RADEON_LLVM_MAX_ARRAYS 16
#define RADEON_LLVM_INITIAL_CF_DEPTH 4 #define RADEON_LLVM_INITIAL_CF_DEPTH 4
@ -130,8 +129,7 @@ struct radeon_llvm_context {
unsigned loop_depth; unsigned loop_depth;
unsigned loop_depth_max; unsigned loop_depth_max;
struct tgsi_declaration_range arrays[RADEON_LLVM_MAX_ARRAYS]; struct tgsi_declaration_range *arrays;
unsigned num_arrays;
LLVMValueRef main_fn; LLVMValueRef main_fn;

15
src/gallium/drivers/radeon/radeon_setup_tgsi_llvm.c
View file

@ -85,8 +85,9 @@ get_array_range(struct lp_build_tgsi_context *bld_base,
unsigned File, const struct tgsi_ind_register *reg) unsigned File, const struct tgsi_ind_register *reg)
{ {
struct radeon_llvm_context * ctx = radeon_llvm_context(bld_base); struct radeon_llvm_context * ctx = radeon_llvm_context(bld_base);
if (File != TGSI_FILE_TEMPORARY || reg->ArrayID == 0 || if (File != TGSI_FILE_TEMPORARY || reg->ArrayID == 0 ||
reg->ArrayID > RADEON_LLVM_MAX_ARRAYS) { reg->ArrayID > bld_base->info->array_max[TGSI_FILE_TEMPORARY]) {
struct tgsi_declaration_range range; struct tgsi_declaration_range range;
range.First = 0; range.First = 0;
range.Last = bld_base->info->file_max[File]; range.Last = bld_base->info->file_max[File];
@ -252,8 +253,14 @@ static void emit_declaration(
} }
case TGSI_FILE_TEMPORARY: case TGSI_FILE_TEMPORARY:
if (decl->Declaration.Array && decl->Array.ArrayID <= RADEON_LLVM_MAX_ARRAYS) if (decl->Declaration.Array) {
if (!ctx->arrays) {
int size = bld_base->info->array_max[TGSI_FILE_TEMPORARY];
ctx->arrays = MALLOC(sizeof(ctx->arrays[0]) * size);
}
ctx->arrays[decl->Array.ArrayID - 1] = decl->Range; ctx->arrays[decl->Array.ArrayID - 1] = decl->Range;
}
if (uses_temp_indirect_addressing(bld_base)) { if (uses_temp_indirect_addressing(bld_base)) {
lp_emit_declaration_soa(bld_base, decl); lp_emit_declaration_soa(bld_base, decl);
break; break;
@ -1432,8 +1439,6 @@ void radeon_llvm_context_init(struct radeon_llvm_context * ctx)
/* Allocate outputs */ /* Allocate outputs */
ctx->soa.outputs = ctx->outputs; ctx->soa.outputs = ctx->outputs;
ctx->num_arrays = 0;
/* XXX: Is there a better way to initialize all this ? */ /* XXX: Is there a better way to initialize all this ? */
lp_set_default_actions(bld_base); lp_set_default_actions(bld_base);
@ -1622,6 +1627,8 @@ void radeon_llvm_dispose(struct radeon_llvm_context * ctx)
{ {
LLVMDisposeModule(ctx->soa.bld_base.base.gallivm->module); LLVMDisposeModule(ctx->soa.bld_base.base.gallivm->module);
LLVMContextDispose(ctx->soa.bld_base.base.gallivm->context); LLVMContextDispose(ctx->soa.bld_base.base.gallivm->context);
FREE(ctx->arrays);
ctx->arrays = NULL;
FREE(ctx->temps); FREE(ctx->temps);
ctx->temps = NULL; ctx->temps = NULL;
FREE(ctx->loop); FREE(ctx->loop);