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

[Marek Olšák]

Reviewed-by: Marek Olšák <marek.olsak at amd.com>

Marek

On Fri, Jul 8, 2016 at 7:42 PM, Nicolai Hähnle <nhaehnle at gmail.com> 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));
> --
> 2.7.4
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev