Mesa (master): radeonsi: handle incompatible DCC formats in resource_copy_region

[Marek Olšák]

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

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Fri Mar 24 12:21:20 2017 +0100

radeonsi: handle incompatible DCC formats in resource_copy_region

Required because of later commits.

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

---

 src/gallium/drivers/radeonsi/si_blit.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/gallium/drivers/radeonsi/si_blit.c b/src/gallium/drivers/radeonsi/si_blit.c
index cb0b2d3582..864c5be58c 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,