diff options
| author | Nicolai Hähnle <[email protected]> | 2017-07-12 15:38:57 +0200 |
|---|---|---|
| committer | Nicolai Hähnle <[email protected]> | 2017-07-13 13:01:15 +0200 |
| commit | c22e3c5373ad0df160f13fe8271c32e8d7e61b43 (patch) | |
| tree | 84661af454b0d93378513602d68208125216cfc3 /src/gallium/drivers/radeonsi | |
| parent | 81fb1547772d42c527318837d4207ecdb6899e5d (diff) | |
radeonsi/gfx9: fix crash building monolithic merged ES-GS shader
Forwarding from the ES prolog to the ES just barely exceeds the current
maximum array size when 16 vertex attributes are used. Give it a decent
bump to account for merged shaders having up to 32 user SGPRs.
Fixes a crash in GL45-CTS.multi_bind.draw_bind_vertex_buffers.
Cc: [email protected]
Reviewed-by: Marek Olšák <[email protected]>
Diffstat (limited to 'src/gallium/drivers/radeonsi')
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_shader.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/gallium/drivers/radeonsi/si_shader.c b/src/gallium/drivers/radeonsi/si_shader.c index 349e57b3a98..4c0cda58fb7 100644 --- a/src/gallium/drivers/radeonsi/si_shader.c +++ b/src/gallium/drivers/radeonsi/si_shader.c @@ -5892,9 +5892,11 @@ static void si_build_wrapper_function(struct si_shader_context *ctx, { struct gallivm_state *gallivm = &ctx->gallivm; LLVMBuilderRef builder = ctx->gallivm.builder; - /* PS epilog has one arg per color component */ - LLVMTypeRef param_types[48]; - LLVMValueRef initial[48], out[48]; + /* PS epilog has one arg per color component; gfx9 merged shader + * prologs need to forward 32 user SGPRs. + */ + LLVMTypeRef param_types[64]; + LLVMValueRef initial[64], out[64]; LLVMTypeRef function_type; unsigned num_params; unsigned num_out, initial_num_out; @@ -6114,6 +6116,7 @@ static void si_build_wrapper_function(struct si_shader_context *ctx, LLVMValueRef val = LLVMBuildExtractValue(builder, ret, i, ""); + assert(num_out < ARRAY_SIZE(out)); out[num_out++] = val; if (LLVMTypeOf(val) == ctx->i32) { |