summaryrefslogtreecommitdiffstats
path: root/src/gallium
diff options
context:
space:
mode:
authorMarek Olšák <maraeo@gmail.com>2012-08-05 02:46:41 +0200
committerMarek Olšák <maraeo@gmail.com>2012-08-15 19:20:57 +0200
commitb7c4ee21c53a73d84e352d6f3db2547f6434d14e (patch)
tree4e7eb0c5c3466743ba5212e274c4b7684e65e31c /src/gallium
parent1a17c4234431a17ec60503d69d7e84f85b3ae50d (diff)
downloadexternal_mesa3d-b7c4ee21c53a73d84e352d6f3db2547f6434d14e.zip
external_mesa3d-b7c4ee21c53a73d84e352d6f3db2547f6434d14e.tar.gz
external_mesa3d-b7c4ee21c53a73d84e352d6f3db2547f6434d14e.tar.bz2
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.
Diffstat (limited to 'src/gallium')
-rw-r--r--src/gallium/auxiliary/util/u_blit.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gallium/auxiliary/util/u_blit.c b/src/gallium/auxiliary/util/u_blit.c
index 3887e65..7ec4aa3 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);