[Mesa-dev] [PATCH 10/10] radeonsi: decrease GS copy shader user SGPRs to 2

[Nicolai Hähnle]

Nice cleanup. Patches 1, 3-10 are:

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

On 20.04.2016 10:47, Marek Olšák wrote:
> From: Marek Olšák <marek.olsak at amd.com>
>
> const buffers are no longer used since the clip plane const buffer was
> moved to RW buffers
> ---
>   src/gallium/drivers/radeonsi/si_shader.c | 4 ++--
>   src/gallium/drivers/radeonsi/si_shader.h | 2 +-
>   2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/src/gallium/drivers/radeonsi/si_shader.c b/src/gallium/drivers/radeonsi/si_shader.c
> index 19452bf..efe7743 100644
> --- a/src/gallium/drivers/radeonsi/si_shader.c
> +++ b/src/gallium/drivers/radeonsi/si_shader.c
> @@ -4901,8 +4901,8 @@ static void create_function(struct si_shader_context *ctx)
>   			num_params = SI_PARAM_LS_OUT_LAYOUT+1;
>   		} else {
>   			if (ctx->is_gs_copy_shader) {
> -				last_array_pointer = SI_PARAM_CONST_BUFFERS;
> -				num_params = SI_PARAM_CONST_BUFFERS+1;
> +				last_array_pointer = SI_PARAM_RW_BUFFERS;
> +				num_params = SI_PARAM_RW_BUFFERS+1;
>   			} else {
>   				params[SI_PARAM_VS_STATE_BITS] = ctx->i32;
>   				num_params = SI_PARAM_VS_STATE_BITS+1;
> diff --git a/src/gallium/drivers/radeonsi/si_shader.h b/src/gallium/drivers/radeonsi/si_shader.h
> index a16e2a0..e40064b 100644
> --- a/src/gallium/drivers/radeonsi/si_shader.h
> +++ b/src/gallium/drivers/radeonsi/si_shader.h
> @@ -117,7 +117,7 @@ enum {
>
>   	/* GS limits */
>   	SI_GS_NUM_USER_SGPR = SI_NUM_RESOURCE_SGPRS,
> -	SI_GSCOPY_NUM_USER_SGPR = SI_SGPR_CONST_BUFFERS_HI + 1,
> +	SI_GSCOPY_NUM_USER_SGPR = SI_SGPR_RW_BUFFERS_HI + 1,
>
>   	/* PS only */
>   	SI_SGPR_ALPHA_REF	= SI_NUM_RESOURCE_SGPRS,
>