Mesa (master): radeonsi: don' t flag renderbuffer feedback loop if DCC has just been disabled

[Marek Olšák]

Module: Mesa
Branch: master
Commit: 2fd74a05bb1a53f2edbc2df3f7e77f84c630ac5f
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=2fd74a05bb1a53f2edbc2df3f7e77f84c630ac5f

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Fri Jun  3 20:51:47 2016 +0200

radeonsi: don't flag renderbuffer feedback loop if DCC has just been disabled

Reviewed-by: Nicolai Hähnle <nicolai.haehnle at amd.com>
Reviewed-by: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>

---

 src/gallium/drivers/radeonsi/si_descriptors.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/gallium/drivers/radeonsi/si_descriptors.c b/src/gallium/drivers/radeonsi/si_descriptors.c
index b2c3713..e0c9666 100644
--- a/src/gallium/drivers/radeonsi/si_descriptors.c
+++ b/src/gallium/drivers/radeonsi/si_descriptors.c
@@ -606,7 +606,9 @@ static void si_set_shader_image(struct si_context *ctx,
 			 * The decompression is relatively cheap if the surface
 			 * has been decompressed already.
 			 */
-			if (!r600_texture_disable_dcc(&screen->b, tex))
+			if (r600_texture_disable_dcc(&screen->b, tex))
+				uses_dcc = false;
+			else
 				ctx->b.decompress_dcc(&ctx->b.b, tex);
 		}
 
@@ -616,7 +618,7 @@ static void si_set_shader_image(struct si_context *ctx,
 			images->compressed_colortex_mask &= ~(1 << slot);
 		}
 
-		if (tex->dcc_offset &&
+		if (uses_dcc &&
 		    p_atomic_read(&tex->framebuffers_bound))
 			ctx->need_check_render_feedback = true;