[Mesa-dev] [PATCH 2/2] radeonsi: port some of get_shader_param changes from r600g

[Michel Dänzer]

On Fre, 2013-02-01 at 00:20 +0100, Marek Olšák wrote: 
> ---
>  src/gallium/drivers/radeonsi/radeonsi_pipe.c |    8 ++------
>  1 file changed, 2 insertions(+), 6 deletions(-)
> 
> diff --git a/src/gallium/drivers/radeonsi/radeonsi_pipe.c b/src/gallium/drivers/radeonsi/radeonsi_pipe.c
> index 471dd48..860e70f 100644
> --- a/src/gallium/drivers/radeonsi/radeonsi_pipe.c
> +++ b/src/gallium/drivers/radeonsi/radeonsi_pipe.c
> @@ -438,7 +438,6 @@ static int r600_get_shader_param(struct pipe_screen* pscreen, unsigned shader, e
>  		return 0;
>  	}
>  
> -	/* TODO: all these should be fixed, since r600 surely supports much more! */
>  	switch (param) {
>  	case PIPE_SHADER_CAP_MAX_INSTRUCTIONS:
>  	case PIPE_SHADER_CAP_MAX_ALU_INSTRUCTIONS:
> @@ -446,12 +445,9 @@ static int r600_get_shader_param(struct pipe_screen* pscreen, unsigned shader, e
>  	case PIPE_SHADER_CAP_MAX_TEX_INDIRECTIONS:
>  		return 16384;
>  	case PIPE_SHADER_CAP_MAX_CONTROL_FLOW_DEPTH:
> -		return 8; /* FIXME */
> +		return 32;
>  	case PIPE_SHADER_CAP_MAX_INPUTS:
> -		if(shader == PIPE_SHADER_FRAGMENT)
> -			return 34;
> -		else
> -			return 32;
> +		return 32;
>  	case PIPE_SHADER_CAP_MAX_TEMPS:
>  		return 256; /* Max native temporaries. */
>  	case PIPE_SHADER_CAP_MAX_ADDRS:

Reviewed-by: Michel Dänzer <michel.daenzer at amd.com>


P.S. The subject of patch 1 should say 'control flow' instead of 'flow
control'. :)

-- 
Earthling Michel Dänzer           |                   http://www.amd.com
Libre software enthusiast         |          Debian, X and DRI developer