[Mesa-dev] [PATCH] radeonsi: fix 2D array MSAA failures since image support landed

[eocallaghan at alterapraxis.com]

Reviewed-by: Edward O'Callaghan <eocallaghan at alterapraxis.com>

On 2016-03-23 04:27, Marek Olšák wrote:
> From: Marek Olšák <marek.olsak at amd.com>
> 
> ---
>  src/gallium/drivers/radeonsi/si_state.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/src/gallium/drivers/radeonsi/si_state.c
> b/src/gallium/drivers/radeonsi/si_state.c
> index b9bdd47..b8fde00 100644
> --- a/src/gallium/drivers/radeonsi/si_state.c
> +++ b/src/gallium/drivers/radeonsi/si_state.c
> @@ -2993,7 +2993,8 @@ si_make_texture_descriptor(struct si_screen 
> *screen,
>  	if (type == V_008F1C_SQ_RSRC_IMG_1D_ARRAY) {
>  	        height = 1;
>  		depth = res->array_size;
> -	} else if (type == V_008F1C_SQ_RSRC_IMG_2D_ARRAY) {
> +	} else if (type == V_008F1C_SQ_RSRC_IMG_2D_ARRAY ||
> +		   type == V_008F1C_SQ_RSRC_IMG_2D_MSAA_ARRAY) {
>  		if (sampler || res->target != PIPE_TEXTURE_3D)
>  			depth = res->array_size;
>  	} else if (type == V_008F1C_SQ_RSRC_IMG_CUBE)