[Mesa-dev] [PATCH 3/3] radeonsi: catch a potential state tracker error with non-MSAA FBs

[Marek Olšák]

For the series:

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

Marek

On Wed, Jul 6, 2016 at 6:07 PM, Nicolai Hähnle <nhaehnle at gmail.com> wrote:
> From: Nicolai Hähnle <nicolai.haehnle at amd.com>
>
> At least st/mesa ensures this, so I'd rather not handle deviations in radeonsi.
> ---
>  src/gallium/drivers/radeonsi/si_state.c | 6 ++++++
>  1 file changed, 6 insertions(+)
>
> diff --git a/src/gallium/drivers/radeonsi/si_state.c b/src/gallium/drivers/radeonsi/si_state.c
> index ee92f15..df6b610 100644
> --- a/src/gallium/drivers/radeonsi/si_state.c
> +++ b/src/gallium/drivers/radeonsi/si_state.c
> @@ -3193,6 +3193,12 @@ static void si_emit_sample_mask(struct si_context *sctx, struct r600_atom *atom)
>         struct radeon_winsys_cs *cs = sctx->b.gfx.cs;
>         unsigned mask = sctx->sample_mask.sample_mask;
>
> +       /* Needed for line and polygon smoothing as well as for the Polaris
> +        * small primitive filter. We expect the state tracker to take care of
> +        * this for us.
> +        */
> +       assert(mask == 0xffff || sctx->framebuffer.nr_samples > 1);
> +
>         radeon_set_context_reg_seq(cs, R_028C38_PA_SC_AA_MASK_X0Y0_X1Y0, 2);
>         radeon_emit(cs, mask | (mask << 16));
>         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