diff options
| author | Marek Olšák <[email protected]> | 2017-02-27 23:17:07 +0100 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2017-03-31 21:41:56 +0200 |
| commit | 829bd7723558d2eca5e456f43a371c020e30caa5 (patch) | |
| tree | 314db2cff79d28c482d95dcb7e3bfdfd741ffcbb /src/gallium/drivers/radeonsi/si_state.c | |
| parent | 2936f5c37eba10d68ac27cd7b77a633a127a1688 (diff) | |
radeonsi: adjust checking for SC bug workarounds
no change in behavior, just making sure that no later chips will use
the workarounds
Reviewed-by: Nicolai Hähnle <[email protected]>
Diffstat (limited to 'src/gallium/drivers/radeonsi/si_state.c')
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_state.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/gallium/drivers/radeonsi/si_state.c b/src/gallium/drivers/radeonsi/si_state.c index f8c6faf9552..78d699632a8 100644 --- a/src/gallium/drivers/radeonsi/si_state.c +++ b/src/gallium/drivers/radeonsi/si_state.c @@ -921,7 +921,7 @@ static void si_bind_rs_state(struct pipe_context *ctx, void *state) si_mark_atom_dirty(sctx, &sctx->db_render_state); /* Update the small primitive filter workaround if necessary. */ - if (sctx->b.family >= CHIP_POLARIS10 && + if (sctx->screen->has_msaa_sample_loc_bug && sctx->framebuffer.nr_samples > 1) si_mark_atom_dirty(sctx, &sctx->msaa_sample_locs.atom); } @@ -2861,6 +2861,7 @@ static void si_emit_msaa_sample_locs(struct si_context *sctx, { struct radeon_winsys_cs *cs = sctx->b.gfx.cs; unsigned nr_samples = sctx->framebuffer.nr_samples; + bool has_msaa_sample_loc_bug = sctx->screen->has_msaa_sample_loc_bug; /* Smoothing (only possible with nr_samples == 1) uses the same * sample locations as the MSAA it simulates. @@ -2871,7 +2872,7 @@ static void si_emit_msaa_sample_locs(struct si_context *sctx, /* On Polaris, the small primitive filter uses the sample locations * even when MSAA is off, so we need to make sure they're set to 0. */ - if (sctx->b.family >= CHIP_POLARIS10) + if (has_msaa_sample_loc_bug) nr_samples = MAX2(nr_samples, 1); if (nr_samples >= 1 && @@ -2884,13 +2885,16 @@ static void si_emit_msaa_sample_locs(struct si_context *sctx, struct si_state_rasterizer *rs = sctx->queued.named.rasterizer; unsigned small_prim_filter_cntl = S_028830_SMALL_PRIM_FILTER_ENABLE(1) | - S_028830_LINE_FILTER_DISABLE(sctx->b.chip_class == VI); /* line bug */ + /* line bug */ + S_028830_LINE_FILTER_DISABLE(sctx->b.family <= CHIP_POLARIS12); /* The alternative of setting sample locations to 0 would * require a DB flush to avoid Z errors, see * https://bugs.freedesktop.org/show_bug.cgi?id=96908 */ - if (sctx->framebuffer.nr_samples > 1 && rs && !rs->multisample_enable) + if (has_msaa_sample_loc_bug && + sctx->framebuffer.nr_samples > 1 && + rs && !rs->multisample_enable) small_prim_filter_cntl &= C_028830_SMALL_PRIM_FILTER_ENABLE; radeon_set_context_reg(cs, R_028830_PA_SU_SMALL_PRIM_FILTER_CNTL, |