radeonsi: simplify logic around vi_separate_dcc_try_enable

2 files changed, 15 insertions, 14 deletions

diff --git a/src/gallium/drivers/radeonsi/si_clear.c b/src/gallium/drivers/radeonsi/si_clear.c
index 5cbbc89b60e..6313f904b41 100644
--- a/src/gallium/drivers/radeonsi/si_clear.c
+++ b/src/gallium/drivers/radeonsi/si_clear.c
@@ -435,19 +435,16 @@ static void si_do_fast_color_clear(struct si_context *sctx,
 		/* Fast clear is the most appropriate place to enable DCC for
 		 * displayable surfaces.
 		 */
-		if (sctx->chip_class >= VI &&
-		    !(sctx->screen->debug_flags & DBG(NO_DCC_FB))) {
-			vi_separate_dcc_try_enable(sctx, tex);
-
-			/* RB+ isn't supported with a CMASK clear only on Stoney,
-			 * so all clears are considered to be hypothetically slow
-			 * clears, which is weighed when determining whether to
-			 * enable separate DCC.
-			 */
-			if (tex->dcc_gather_statistics &&
-			    sctx->family == CHIP_STONEY)
-				tex->num_slow_clears++;
-		}
+		vi_separate_dcc_try_enable(sctx, tex);
+
+		/* RB+ isn't supported with a CMASK clear only on Stoney,
+		 * so all clears are considered to be hypothetically slow
+		 * clears, which is weighed when determining whether to
+		 * enable separate DCC.
+		 */
+		if (tex->dcc_gather_statistics &&
+		    sctx->family == CHIP_STONEY)
+			tex->num_slow_clears++;
 
 		bool need_decompress_pass = false;
 
diff --git a/src/gallium/drivers/radeonsi/si_texture.c b/src/gallium/drivers/radeonsi/si_texture.c
index bbfac7cc4be..46df4aecf09 100644
--- a/src/gallium/drivers/radeonsi/si_texture.c
+++ b/src/gallium/drivers/radeonsi/si_texture.c
@@ -2231,9 +2231,13 @@ void vi_separate_dcc_try_enable(struct si_context *sctx,
 	    !(tex->buffer.external_usage & PIPE_HANDLE_USAGE_EXPLICIT_FLUSH) ||
 	    tex->buffer.b.b.target != PIPE_TEXTURE_2D ||
 	    tex->buffer.b.b.last_level > 0 ||
-	    !tex->surface.dcc_size)
+	    !tex->surface.dcc_size ||
+	    sctx->screen->debug_flags & DBG(NO_DCC) ||
+	    sctx->screen->debug_flags & DBG(NO_DCC_FB))
 		return;
 
+	assert(sctx->chip_class >= VI);
+
 	if (tex->dcc_offset)
 		return; /* already enabled */