From: Marek Olšák <maraeo@gmail.com>
Date: Sun, 5 Aug 2012 00:46:41 +0000 (+0200)
Subject: gallium/u_blit: set dst format from pipe_resource, not pipe_surface
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b7c4ee21c53a73d84e352d6f3db2547f6434d14e;p=mesa.git

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.
---

diff --git a/src/gallium/auxiliary/util/u_blit.c b/src/gallium/auxiliary/util/u_blit.c
index 3887e65fbd4..7ec4aa3a4dc 100644
--- a/src/gallium/auxiliary/util/u_blit.c
+++ b/src/gallium/auxiliary/util/u_blit.c
@@ -464,7 +464,7 @@ util_blit_pixels(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);
 
    /* See whether we will blit depth or stencil. */
    is_depth = util_format_has_depth(src_desc);