From 0504ee8f354be331ebaf9267b26ae1743c95ed3f Mon Sep 17 00:00:00 2001 From: Marek Olšák Date: Sun, 5 Aug 2012 02:46:41 +0200 Subject: gallium/u_blit: set dst format from pipe_resource, not pipe_surface We use it to decide whether we can use resource_copy_region. NOTE: This is a candidate for the 8.0 branch. (cherry picked from commit b7c4ee21c53a73d84e352d6f3db2547f6434d14e) --- src/gallium/auxiliary/util/u_blit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/gallium') diff --git a/src/gallium/auxiliary/util/u_blit.c b/src/gallium/auxiliary/util/u_blit.c index a10fd17cbff..edf36034833 100644 --- a/src/gallium/auxiliary/util/u_blit.c +++ b/src/gallium/auxiliary/util/u_blit.c @@ -370,7 +370,7 @@ util_blit_pixels_writemask(struct blit_state *ctx, dstX0, dstY0, dstX1, dstY1); src_format = util_format_linear(src_tex->format); - dst_format = util_format_linear(dst->format); + dst_format = util_format_linear(dst->texture->format); /* * Check for simple case: no format conversion, no flipping, no stretching, -- cgit v1.2.3