diff options
| author | Marek Olšák <[email protected]> | 2018-05-31 23:47:17 -0400 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2018-06-13 22:00:37 -0400 |
| commit | 2f51081a9355866ee18adfe829e417a518c9fc21 (patch) | |
| tree | cf7b086c3841380ae528f5cb93115f3e1ff4c311 | |
| parent | 22e994bb7511c375fcad0163952258be28856840 (diff) | |
radeonsi/gfx9: update primitive binning code for EQAA
Tested-by: Dieter Nützel <[email protected]>
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_state_binning.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/gallium/drivers/radeonsi/si_state_binning.c b/src/gallium/drivers/radeonsi/si_state_binning.c index 665c11fe61f..3928d045df0 100644 --- a/src/gallium/drivers/radeonsi/si_state_binning.c +++ b/src/gallium/drivers/radeonsi/si_state_binning.c @@ -66,7 +66,7 @@ static struct uvec2 si_find_bin_size(struct si_screen *sscreen, static struct uvec2 si_get_color_bin_size(struct si_context *sctx, unsigned cb_target_enabled_4bit) { - unsigned nr_samples = sctx->framebuffer.nr_samples; + unsigned num_fragments = sctx->framebuffer.nr_color_samples; unsigned sum = 0; /* Compute the sum of all Bpp. */ @@ -80,9 +80,9 @@ static struct uvec2 si_get_color_bin_size(struct si_context *sctx, } /* Multiply the sum by some function of the number of samples. */ - if (nr_samples >= 2) { + if (num_fragments >= 2) { if (si_get_ps_iter_samples(sctx) >= 2) - sum *= nr_samples; + sum *= num_fragments; else sum *= 2; } @@ -205,7 +205,7 @@ static struct uvec2 si_get_depth_bin_size(struct si_context *sctx) unsigned stencil_coeff = rtex->surface.has_stencil && dsa->stencil_enabled ? 1 : 0; unsigned sum = 4 * (depth_coeff + stencil_coeff) * - sctx->framebuffer.nr_samples; + rtex->buffer.b.b.nr_samples; static const si_bin_size_subtable table[] = { { @@ -393,8 +393,13 @@ void si_emit_dpbb_state(struct si_context *sctx) /* Enable DFSM if it's preferred. */ unsigned punchout_mode = V_028060_FORCE_OFF; bool disable_start_of_prim = true; + bool zs_eqaa_dfsm_bug = sctx->chip_class == GFX9 && + sctx->framebuffer.state.zsbuf && + sctx->framebuffer.nr_samples != + MAX2(1, sctx->framebuffer.state.zsbuf->texture->nr_samples); if (sscreen->dfsm_allowed && + !zs_eqaa_dfsm_bug && cb_target_enabled_4bit && !G_02880C_KILL_ENABLE(db_shader_control) && /* These two also imply that DFSM is disabled when PS writes to memory. */ |