From: Marek Olšák <marek.olsak@amd.com>
Date: Fri, 7 Apr 2017 10:36:59 +0000 (+0200)
Subject: radeonsi: don't mark non-dirty textures with CMASK as compressed
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=bdd6449769527f55d7cba3443da08ae03448de34;p=mesa.git

radeonsi: don't mark non-dirty textures with CMASK as compressed

because the compression is skipped with non-dirty textures.

Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
---

diff --git a/src/gallium/drivers/radeonsi/si_descriptors.c b/src/gallium/drivers/radeonsi/si_descriptors.c
index 2f6f8eb57e8..971aa43c436 100644
--- a/src/gallium/drivers/radeonsi/si_descriptors.c
+++ b/src/gallium/drivers/radeonsi/si_descriptors.c
@@ -555,8 +555,9 @@ static void si_set_sampler_view(struct si_context *sctx,
 
 static bool is_compressed_colortex(struct r600_texture *rtex)
 {
-	return rtex->cmask.size || rtex->fmask.size ||
-	       (rtex->dcc_offset && rtex->dirty_level_mask);
+	return rtex->fmask.size ||
+	       (rtex->dirty_level_mask &&
+		(rtex->cmask.size || rtex->dcc_offset));
 }
 
 static bool depth_needs_decompression(struct r600_texture *rtex,