diff options
| author | Nicolai Hähnle <nicolai.haehnle@amd.com> | 2016-07-08 19:12:00 +0200 |
|---|---|---|
| committer | Nicolai Hähnle <nicolai.haehnle@amd.com> | 2016-07-09 19:46:54 +0200 |
| commit | b479c47a9ce11048601c56c9e69222ad75c71458 (patch) | |
| tree | 87e0878913fde202f89066add65e7bfed9592dcf /src/gallium/drivers/radeonsi/si_state.c | |
| parent | 6624174c0aad2df9d551937ddcacd6964160a8fc (diff) | |
| download | external_mesa3d-b479c47a9ce11048601c56c9e69222ad75c71458.zip external_mesa3d-b479c47a9ce11048601c56c9e69222ad75c71458.tar.gz external_mesa3d-b479c47a9ce11048601c56c9e69222ad75c71458.tar.bz2 | |
radeonsi: fix bad assertion in si_emit_sample_mask
The blitter sets mask == 1, which is fine since it doesn't use smoothing.
Fixes a regression introduced in commit 5bcfbf91.
Reviewed-by: Edward O'Callaghan <funfunctor@folklore1984.net>
Diffstat (limited to 'src/gallium/drivers/radeonsi/si_state.c')
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_state.c | 3 |
1 files changed, 2 insertions, 1 deletions
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)); |