From: Marek Olšák <marek.ol...@amd.com>

---
 src/gallium/drivers/radeonsi/si_shader.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/gallium/drivers/radeonsi/si_shader.c 
b/src/gallium/drivers/radeonsi/si_shader.c
index 783d57f..6d0c81d 100644
--- a/src/gallium/drivers/radeonsi/si_shader.c
+++ b/src/gallium/drivers/radeonsi/si_shader.c
@@ -6583,23 +6583,27 @@ static void si_build_wrapper_function(struct 
si_shader_context *ctx,
                        unsigned param_size;
                        LLVMValueRef arg = NULL;
 
                        param = LLVMGetParam(parts[part], param_idx);
                        param_type = LLVMTypeOf(param);
                        param_size = ac_get_type_size(param_type) / 4;
                        is_sgpr = ac_is_sgpr_param(param);
 
                        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];
                        else
                                arg = lp_build_gather_values(&ctx->gallivm, 
&out[out_idx], param_size);
 
                        if (LLVMTypeOf(arg) != param_type) {
                                if (LLVMGetTypeKind(param_type) == 
LLVMPointerTypeKind) {
                                        if 
(LLVMGetPointerAddressSpace(param_type) ==
                                            AC_CONST_32BIT_ADDR_SPACE) {
-- 
2.7.4

_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

Reply via email to