From 1c0cfc597ae1c9c430d133fc4228df3cf624876e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Tue, 26 Jan 2021 15:26:18 -0500 Subject: [PATCH] radeonsi: fix centroid with VRS coarse shading This has no effect on other shading. It should have been the default value. Fixes: c3432ad8524 - radeonsi: add an option to enable 2x2 coarse shading for non-GUI elements Acked-by: Pierre-Eric Pelloux-Prayer Part-of: (cherry picked from commit dbf09c0c26dda7296322491c35fce02f3147dfa9) --- .pick_status.json | 2 +- src/gallium/drivers/radeonsi/si_state.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 8b9eeb52bd7..25154362595 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -184,7 +184,7 @@ "description": "radeonsi: fix centroid with VRS coarse shading", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "c3432ad852449ec31580a0b77af785e37eaa48f9" }, diff --git a/src/gallium/drivers/radeonsi/si_state.c b/src/gallium/drivers/radeonsi/si_state.c index 9e3132e8c70..c0f218c414a 100644 --- a/src/gallium/drivers/radeonsi/si_state.c +++ b/src/gallium/drivers/radeonsi/si_state.c @@ -1392,7 +1392,7 @@ static void si_emit_db_render_state(struct si_context *sctx) S_028010_DISABLE_ZMASK_EXPCLEAR_OPTIMIZATION(sctx->db_depth_disable_expclear) | S_028010_DISABLE_SMEM_EXPCLEAR_OPTIMIZATION(sctx->db_stencil_disable_expclear) | S_028010_DECOMPRESS_Z_ON_FLUSH(sctx->framebuffer.nr_samples >= 4) | - S_028010_CENTROID_COMPUTATION_MODE(sctx->chip_class >= GFX10_3 ? 2 : 0)); + S_028010_CENTROID_COMPUTATION_MODE(sctx->chip_class >= GFX10_3 ? 1 : 0)); db_shader_control = sctx->ps_db_shader_control;