Mesa (master): radeonsi: allow copying between compatible compressed and uncompressed formats

[Marek Olšák]

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

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Mon Aug 24 01:08:48 2015 +0200

radeonsi: allow copying between compatible compressed and uncompressed formats

which is where a block in src maps to a pixel in dst and vice versa.
e.g. DXT1 <-> R32G32_UINT
     DXT5 <-> R32G32B32A32_UINT

Reviewed-by: Michel Dänzer <michel.daenzer at amd.com>

---

 src/gallium/drivers/radeonsi/si_blit.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gallium/drivers/radeonsi/si_blit.c b/src/gallium/drivers/radeonsi/si_blit.c
index 302b75c..fce014a 100644
--- a/src/gallium/drivers/radeonsi/si_blit.c
+++ b/src/gallium/drivers/radeonsi/si_blit.c
@@ -507,7 +507,7 @@ void si_resource_copy_region(struct pipe_context *ctx,
 	util_blitter_default_dst_texture(&dst_templ, dst, dst_level, dstz);
 	util_blitter_default_src_texture(&src_templ, src, src_level);
 
-	if (util_format_is_compressed(src->format) &&
+	if (util_format_is_compressed(src->format) ||
 	    util_format_is_compressed(dst->format)) {
 		unsigned blocksize = util_format_get_blocksize(src->format);