AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

radeonsi: respect smoothing_enabled

Browse Source 
When this was last changed, the smoothing_enabled flag seems to have
been forgotten about, breaking line-smoothing (and probably also polygon
smoothing).

Fixes: 4147add280 ("radeonsi: update db_eqaa even if msaa is disabled")
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20810>
This commit is contained in:
Erik Faye-Lund
2023-01-20 11:39:27 +01:00
committed by Marge Bot
parent 3325950648
commit 9f4f131f2e
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/amd/ci/radeonsi-raven-fails.txt
-1
View File
@@ -192,5 +192,4 @@ spec@!opengl 1.0@gl-1.0-user-clip-all-planes,Fail
# https://gitlab.freedesktop.org/mesa/mesa/-/issues/7152
spec@ext_transform_feedback@builtin-varyings gl_culldistance,Fail
spec@!opengl 1.1@line-smooth-coverage,Fail
spec@!opengl 1.1@line-smooth-stipple,Fail
src/amd/ci/radeonsi-stoney-fails.txt
-1
View File
@@ -237,5 +237,4 @@ spec@khr_texture_compression_astc@sliced-3d-miptree-gl srgb-fp@sRGB decode full
spec@khr_texture_compression_astc@sliced-3d-miptree-gles srgb-fp,Fail
spec@khr_texture_compression_astc@sliced-3d-miptree-gles srgb-fp@sRGB decode full precision,Fail
spec@!opengl 1.1@line-smooth-coverage,Fail
spec@!opengl 1.1@line-smooth-stipple,Fail
src/gallium/drivers/radeonsi/si_state.c
+4 -2
View File
@@ -3804,7 +3804,8 @@ static void si_emit_msaa_config(struct si_context *sctx)
unsigned sc_line_cntl = 0;
unsigned sc_aa_config = 0;
if (coverage_samples > 1 && rs->multisample_enable) {
if (coverage_samples > 1 && (rs->multisample_enable ||
sctx->smoothing_enabled)) {
/* distance from the pixel center, indexed by log2(nr_samples) */
static unsigned max_dist[] = {
0, /* unused */
@@ -3826,7 +3827,8 @@ static void si_emit_msaa_config(struct si_context *sctx)
S_028BE0_COVERED_CENTROID_IS_CENTER(sctx->gfx_level >= GFX10_3);
}
if (sctx->framebuffer.nr_samples > 1) {
if (sctx->framebuffer.nr_samples > 1 ||
sctx->smoothing_enabled) {
if (sctx->framebuffer.state.zsbuf) {
z_samples = sctx->framebuffer.state.zsbuf->texture->nr_samples;
z_samples = MAX2(1, z_samples);