From: Nicolai Hähnle Date: Wed, 6 Jul 2016 14:55:08 +0000 (+0200) Subject: radeonsi: catch a potential state tracker error with non-MSAA FBs X-Git-Tag: upstream/17.1.0~8224 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5bcfbf91e53e4f66310fc4ab63a7caf931a1e45c;p=platform%2Fupstream%2Fmesa.git radeonsi: catch a potential state tracker error with non-MSAA FBs At least st/mesa ensures this, so I'd rather not handle deviations in radeonsi. Reviewed-by: Marek Olšák --- 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));