radeonsi: allow fewer input SGPRs in 2nd shader of merged shaders

Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>

diff --git a/src/gallium/drivers/radeonsi/si_shader.c b/src/gallium/drivers/radeonsi/si_shader.c
index 7af0bdb99ce6a1d5fc7332ae7bc1cdca27c49d9c..288f7434bb21dfd1508e6d7fa15bec2a71911dff 100644 (file)
--- 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];