From c6efb4870b7c735e4dc1907dfdfd1be3159dc451 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michel=20D=C3=A4nzer?= Date: Wed, 27 Mar 2013 12:43:32 +0100 Subject: [PATCH] radeonsi: Handle arbitrary 2-byte formats in resource_copy_region MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes mplayer -vo vdpau OSD. NOTE: This is a candidate for the 9.1 branch. Reported-by: Igor Vagulin Reviewed-by: Christian König Tested-by: Christian König --- src/gallium/drivers/radeonsi/r600_blit.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/gallium/drivers/radeonsi/r600_blit.c b/src/gallium/drivers/radeonsi/r600_blit.c index eb69cd54ee0..f9d2568d3aa 100644 --- a/src/gallium/drivers/radeonsi/r600_blit.c +++ b/src/gallium/drivers/radeonsi/r600_blit.c @@ -417,6 +417,12 @@ static void r600_resource_copy_region(struct pipe_context *ctx, r600_change_format(dst, dst_level, &orig_info[1], PIPE_FORMAT_R8_UNORM); break; + case 2: + r600_change_format(src, src_level, &orig_info[0], + PIPE_FORMAT_R8G8_UNORM); + r600_change_format(dst, dst_level, &orig_info[1], + PIPE_FORMAT_R8G8_UNORM); + break; case 4: r600_change_format(src, src_level, &orig_info[0], PIPE_FORMAT_R8G8B8A8_UNORM);