diff options
| author | Nicolai Hähnle <nicolai.haehnle@amd.com> | 2016-07-06 16:55:08 +0200 |
|---|---|---|
| committer | Nicolai Hähnle <nicolai.haehnle@amd.com> | 2016-07-08 10:53:05 +0200 |
| commit | 5bcfbf91e53e4f66310fc4ab63a7caf931a1e45c (patch) | |
| tree | a6ca3feec95c3119394a8a88a4d9e8785f9cb99c /src/gallium/drivers/radeonsi/si_state.c | |
| parent | d938b8c0bf32ab5f0103ac68071c4cc467846108 (diff) | |
| download | external_mesa3d-5bcfbf91e53e4f66310fc4ab63a7caf931a1e45c.zip external_mesa3d-5bcfbf91e53e4f66310fc4ab63a7caf931a1e45c.tar.gz external_mesa3d-5bcfbf91e53e4f66310fc4ab63a7caf931a1e45c.tar.bz2 | |
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 <marek.olsak@amd.com>
Diffstat (limited to 'src/gallium/drivers/radeonsi/si_state.c')
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_state.c | 6 |
1 files changed, 6 insertions, 0 deletions
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)); |