From: Marek Olšák <marek.olsak@amd.com>
Date: Fri, 24 Mar 2017 11:21:20 +0000 (+0100)
Subject: radeonsi: handle incompatible DCC formats in resource_copy_region
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=45a71d5de588926dc682f9d0167b08b8d061d8da;p=mesa.git

radeonsi: handle incompatible DCC formats in resource_copy_region

Required because of later commits.

Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
Tested-by: Edmondo Tommasina <edmondo.tommasina@gmail.com>
---

diff --git a/src/gallium/drivers/radeonsi/si_blit.c b/src/gallium/drivers/radeonsi/si_blit.c
index cb0b2d35822..864c5be58c7 100644
--- a/src/gallium/drivers/radeonsi/si_blit.c
+++ b/src/gallium/drivers/radeonsi/si_blit.c
@@ -946,6 +946,11 @@ void si_resource_copy_region(struct pipe_context *ctx,
 		}
 	}
 
+	vi_dcc_disable_if_incompatible_format(&sctx->b, dst, dst_level,
+					      dst_templ.format);
+	vi_dcc_disable_if_incompatible_format(&sctx->b, src, src_level,
+					      src_templ.format);
+
 	/* Initialize the surface. */
 	dst_view = r600_create_surface_custom(ctx, dst, &dst_templ,
 					      dst_width0, dst_height0,