OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

radeonsi: update db_eqaa even if msaa is disabled

Browse Source 
This seems to fix rendering in application toggling MSAA on and
off between draw calls.

Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/7537
Cc: mesa-stable
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19326>
This commit is contained in:
Pierre-Eric Pelloux-Prayer
2022-10-26 18:28:39 +02:00
parent abf3dea738
commit 4147add280
1 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/gallium/drivers/radeonsi/si_state.c
View File

@@ -3756,7 +3756,7 @@ static void si_emit_msaa_config(struct si_context *sctx)
unsigned db_eqaa = S_028804_HIGH_QUALITY_INTERSECTIONS(1) | S_028804_INCOHERENT_EQAA_READS(1) | unsigned db_eqaa = S_028804_HIGH_QUALITY_INTERSECTIONS(1) | S_028804_INCOHERENT_EQAA_READS(1) |
S_028804_INTERPOLATE_COMP_Z(sctx->gfx_level < GFX11) | S_028804_INTERPOLATE_COMP_Z(sctx->gfx_level < GFX11) |
S_028804_STATIC_ANCHOR_ASSOCIATIONS(1); S_028804_STATIC_ANCHOR_ASSOCIATIONS(1);
unsigned coverage_samples, color_samples, z_samples; unsigned coverage_samples, z_samples;
struct si_state_rasterizer *rs = sctx->queued.named.rasterizer; struct si_state_rasterizer *rs = sctx->queued.named.rasterizer;
/* S: Coverage samples (up to 16x): /* S: Coverage samples (up to 16x):
@@ -3800,18 +3800,7 @@ static void si_emit_msaa_config(struct si_context *sctx)
* EQAA 4s 4z 2f - might look the same as 4x MSAA with low-density geometry * EQAA 4s 4z 2f - might look the same as 4x MSAA with low-density geometry
* EQAA 2s 2z 2f = 2x MSAA * EQAA 2s 2z 2f = 2x MSAA
*/ */
coverage_samples = color_samples = z_samples = si_get_num_coverage_samples(sctx); coverage_samples = si_get_num_coverage_samples(sctx);
if (sctx->framebuffer.nr_samples > 1 && rs->multisample_enable) {
color_samples = sctx->framebuffer.nr_color_samples;
if (sctx->framebuffer.state.zsbuf) {
z_samples = sctx->framebuffer.state.zsbuf->texture->nr_samples;
z_samples = MAX2(1, z_samples);
} else {
z_samples = coverage_samples;
}
}
/* The DX10 diamond test is not required by GL and decreases line rasterization /* The DX10 diamond test is not required by GL and decreases line rasterization
* performance, so don't use it. * performance, so don't use it.
@@ -3819,7 +3808,7 @@ static void si_emit_msaa_config(struct si_context *sctx)
unsigned sc_line_cntl = 0; unsigned sc_line_cntl = 0;
unsigned sc_aa_config = 0; unsigned sc_aa_config = 0;
if (coverage_samples > 1) { if (coverage_samples > 1 && rs->multisample_enable) {
/* distance from the pixel center, indexed by log2(nr_samples) */ /* distance from the pixel center, indexed by log2(nr_samples) */
static unsigned max_dist[] = { static unsigned max_dist[] = {
0, /* unused */ 0, /* unused */
@@ -3829,9 +3818,6 @@ static void si_emit_msaa_config(struct si_context *sctx)
8, /* 16x MSAA */ 8, /* 16x MSAA */
}; };
unsigned log_samples = util_logbase2(coverage_samples); unsigned log_samples = util_logbase2(coverage_samples);
unsigned log_z_samples = util_logbase2(z_samples);
unsigned ps_iter_samples = si_get_ps_iter_samples(sctx);
unsigned log_ps_iter_samples = util_logbase2(ps_iter_samples);
sc_line_cntl |= S_028BDC_EXPAND_LINE_WIDTH(1) | sc_line_cntl |= S_028BDC_EXPAND_LINE_WIDTH(1) |
S_028BDC_PERPENDICULAR_ENDCAP_ENA(rs->perpendicular_end_caps) | S_028BDC_PERPENDICULAR_ENDCAP_ENA(rs->perpendicular_end_caps) |
@@ -3842,7 +3828,19 @@ static void si_emit_msaa_config(struct si_context *sctx)
S_028BE0_MAX_SAMPLE_DIST(max_dist[log_samples]) | S_028BE0_MAX_SAMPLE_DIST(max_dist[log_samples]) |
S_028BE0_MSAA_EXPOSED_SAMPLES(log_samples) | S_028BE0_MSAA_EXPOSED_SAMPLES(log_samples) |
S_028BE0_COVERED_CENTROID_IS_CENTER(sctx->gfx_level >= GFX10_3); S_028BE0_COVERED_CENTROID_IS_CENTER(sctx->gfx_level >= GFX10_3);
}
if (sctx->framebuffer.nr_samples > 1) {
if (sctx->framebuffer.state.zsbuf) {
z_samples = sctx->framebuffer.state.zsbuf->texture->nr_samples;
z_samples = MAX2(1, z_samples);
} else {
z_samples = coverage_samples;
}
unsigned log_samples = util_logbase2(coverage_samples);
unsigned log_z_samples = util_logbase2(z_samples);
unsigned ps_iter_samples = si_get_ps_iter_samples(sctx);
unsigned log_ps_iter_samples = util_logbase2(ps_iter_samples);
if (sctx->framebuffer.nr_samples > 1) { if (sctx->framebuffer.nr_samples > 1) {
db_eqaa |= S_028804_MAX_ANCHOR_SAMPLES(log_z_samples) | db_eqaa |= S_028804_MAX_ANCHOR_SAMPLES(log_z_samples) |
S_028804_PS_ITER_SAMPLES(log_ps_iter_samples) | S_028804_PS_ITER_SAMPLES(log_ps_iter_samples) |