[Mesa-dev] [PATCH] radeonsi: fix bad assertion in si_emit_sample_mask

[Edward O'Callaghan]

Reviewed-by: Edward O'Callaghan <funfunctor at folklore1984.net>

On 07/09/2016 03:42 AM, Nicolai Hähnle wrote:
> From: Nicolai Hähnle <nicolai.haehnle at amd.com>
> 
> The blitter sets mask == 1, which is fine since it doesn't use smoothing.
> Fixes a regression introduced in commit 5bcfbf91.
> ---
>  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 df6b610..bdd7ef4 100644
> --- a/src/gallium/drivers/radeonsi/si_state.c
> +++ b/src/gallium/drivers/radeonsi/si_state.c
> @@ -3197,7 +3197,8 @@ static void si_emit_sample_mask(struct si_context *sctx, struct r600_atom *atom)
>  	 * small primitive filter. We expect the state tracker to take care of
>  	 * this for us.
>  	 */
> -	assert(mask == 0xffff || sctx->framebuffer.nr_samples > 1);
> +	assert(mask == 0xffff || sctx->framebuffer.nr_samples > 1 ||
> +	       (mask & 1 && sctx->blitter->running));
>  
>  	radeon_set_context_reg_seq(cs, R_028C38_PA_SC_AA_MASK_X0Y0_X1Y0, 2);
>  	radeon_emit(cs, mask | (mask << 16));
> 

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: OpenPGP digital signature
URL: <https://lists.freedesktop.org/archives/mesa-dev/attachments/20160709/fd56429f/attachment.sig>