[Mesa-dev] [PATCH] radeonsi: Number of SGPRs retrieved from LLVM already includes VCC

[Christian König]

Am 06.08.2013 10:53, schrieb Michel Dänzer:
> From: Michel Dänzer <michel.daenzer at amd.com>
>
> Fixes spurious 'Assertion `num_sgprs <= 104' failed.' with shaders using
> all 104 SGPRs.
>
> Cc: mesa-stable at lists.freedesktop.org
> Signed-off-by: Michel Dänzer <michel.daenzer at amd.com>

Reviewed-by: Christian König <christian.koenig at amd.com>

> ---
>   src/gallium/drivers/radeonsi/si_state_draw.c | 16 ++++++++--------
>   1 file changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/src/gallium/drivers/radeonsi/si_state_draw.c b/src/gallium/drivers/radeonsi/si_state_draw.c
> index 29d960d..0d1bd81 100644
> --- a/src/gallium/drivers/radeonsi/si_state_draw.c
> +++ b/src/gallium/drivers/radeonsi/si_state_draw.c
> @@ -91,10 +91,10 @@ static void si_pipe_shader_vs(struct pipe_context *ctx, struct si_pipe_shader *s
>   
>   	num_user_sgprs = SI_VS_NUM_USER_SGPR;
>   	num_sgprs = shader->num_sgprs;
> -	if (num_user_sgprs > num_sgprs)
> -		num_sgprs = num_user_sgprs;
> -	/* Last 2 reserved SGPRs are used for VCC */
> -	num_sgprs += 2;
> +	if (num_user_sgprs > num_sgprs) {
> +		/* Last 2 reserved SGPRs are used for VCC */
> +		num_sgprs = num_user_sgprs + 2;
> +	}
>   	assert(num_sgprs <= 104);
>   
>   	vgpr_comp_cnt = shader->shader.uses_instanceid ? 3 : 0;
> @@ -235,10 +235,10 @@ static void si_pipe_shader_ps(struct pipe_context *ctx, struct si_pipe_shader *s
>   
>   	num_user_sgprs = SI_PS_NUM_USER_SGPR;
>   	num_sgprs = shader->num_sgprs;
> -	if (num_user_sgprs > num_sgprs)
> -		num_sgprs = num_user_sgprs;
> -	/* Last 2 reserved SGPRs are used for VCC */
> -	num_sgprs += 2;
> +	if (num_user_sgprs > num_sgprs) {
> +		/* Last 2 reserved SGPRs are used for VCC */
> +		num_sgprs = num_user_sgprs + 2;
> +	}
>   	assert(num_sgprs <= 104);
>   
>   	si_pm4_set_reg(pm4, R_00B028_SPI_SHADER_PGM_RSRC1_PS,