diff options
| author | Marek Olšák <[email protected]> | 2018-02-07 01:09:32 +0100 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2018-02-26 12:01:03 +0100 |
| commit | f852b24ce04431ecde639cefd5d86f64975894d5 (patch) | |
| tree | 911678b47aeedb4054feabead60ac6daac00afbf /src/gallium | |
| parent | 8d6e6b1d7c9ad73f6d829c6c40ce20a499e334fc (diff) | |
radeonsi: allow fewer input SGPRs in 2nd shader of merged shaders
Reviewed-by: Nicolai Hähnle <[email protected]>
Diffstat (limited to 'src/gallium')
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_shader.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/gallium/drivers/radeonsi/si_shader.c b/src/gallium/drivers/radeonsi/si_shader.c index 7af0bdb99ce..288f7434bb2 100644 --- a/src/gallium/drivers/radeonsi/si_shader.c +++ b/src/gallium/drivers/radeonsi/si_shader.c @@ -6600,9 +6600,13 @@ static void si_build_wrapper_function(struct si_shader_context *ctx, if (is_sgpr) lp_add_function_attr(parts[part], param_idx + 1, LP_FUNC_ATTR_INREG); + else if (out_idx < num_out_sgpr) { + /* Skip returned SGPRs the current part doesn't + * declare on the input. */ + out_idx = num_out_sgpr; + } assert(out_idx + param_size <= (is_sgpr ? num_out_sgpr : num_out)); - assert(is_sgpr || out_idx >= num_out_sgpr); if (param_size == 1) arg = out[out_idx]; |