diff options
| author | Marek Olšák <[email protected]> | 2020-01-08 15:52:44 -0500 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2020-01-13 15:57:07 -0500 |
| commit | 220d00314fd5af46cd9f71bed9baf13b51d40a7b (patch) | |
| tree | 013f91bdad624f3d3ee0eac4cef381fd0da6e1a2 | |
| parent | ef253c678983a554fc7cd6bc5424fc072c8179dc (diff) | |
ac,radeonsi: increase the maximum number of shader args and return values
Reviewed-by: Pierre-Eric Pelloux-Prayer <[email protected]>
| -rw-r--r-- | src/amd/common/ac_shader_args.h | 3 | ||||
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_shader.c | 12 |
2 files changed, 8 insertions, 7 deletions
diff --git a/src/amd/common/ac_shader_args.h b/src/amd/common/ac_shader_args.h index 0cd4b6aac90..5aa9125dbbc 100644 --- a/src/amd/common/ac_shader_args.h +++ b/src/amd/common/ac_shader_args.h @@ -50,7 +50,8 @@ struct ac_arg { }; -#define AC_MAX_ARGS 64 +#define AC_MAX_ARGS 128 + struct ac_shader_args { /* Info on how to declare arguments */ struct { diff --git a/src/gallium/drivers/radeonsi/si_shader.c b/src/gallium/drivers/radeonsi/si_shader.c index 75c54a4b112..f734221728b 100644 --- a/src/gallium/drivers/radeonsi/si_shader.c +++ b/src/gallium/drivers/radeonsi/si_shader.c @@ -3447,7 +3447,7 @@ static void add_arg_checked(struct ac_shader_args *args, static void create_function(struct si_shader_context *ctx) { struct si_shader *shader = ctx->shader; - LLVMTypeRef returns[16+32*4]; + LLVMTypeRef returns[AC_MAX_ARGS]; unsigned i, num_return_sgprs; unsigned num_returns = 0; unsigned num_prolog_vgprs = 0; @@ -5307,7 +5307,7 @@ static void si_build_gs_prolog_function(struct si_shader_context *ctx, { unsigned num_sgprs, num_vgprs; LLVMBuilderRef builder = ctx->ac.builder; - LLVMTypeRef returns[48]; + LLVMTypeRef returns[AC_MAX_ARGS]; LLVMValueRef func, ret; memset(&ctx->args, 0, sizeof(ctx->args)); @@ -5434,9 +5434,9 @@ static void si_build_wrapper_function(struct si_shader_context *ctx, { LLVMBuilderRef builder = ctx->ac.builder; /* PS epilog has one arg per color component; gfx9 merged shader - * prologs need to forward 32 user SGPRs. + * prologs need to forward 40 SGPRs. */ - LLVMValueRef initial[64], out[64]; + LLVMValueRef initial[AC_MAX_ARGS], out[AC_MAX_ARGS]; LLVMTypeRef function_type; unsigned num_first_params; unsigned num_out, initial_num_out; @@ -5502,7 +5502,7 @@ static void si_build_wrapper_function(struct si_shader_context *ctx, /* Prepare the return type. */ unsigned num_returns = 0; - LLVMTypeRef returns[32], last_func_type, return_type; + LLVMTypeRef returns[AC_MAX_ARGS], last_func_type, return_type; last_func_type = LLVMGetElementType(LLVMTypeOf(parts[num_parts - 1])); return_type = LLVMGetReturnType(last_func_type); @@ -5573,7 +5573,7 @@ static void si_build_wrapper_function(struct si_shader_context *ctx, /* Now chain the parts. */ LLVMValueRef ret = NULL; for (unsigned part = 0; part < num_parts; ++part) { - LLVMValueRef in[48]; + LLVMValueRef in[AC_MAX_ARGS]; LLVMTypeRef ret_type; unsigned out_idx = 0; unsigned num_params = LLVMCountParams(parts[part]); |