diff options
| author | Marek Olšák <[email protected]> | 2012-08-05 02:46:41 +0200 |
|---|---|---|
| committer | Ian Romanick <[email protected]> | 2012-10-24 11:41:05 -0700 |
| commit | 0504ee8f354be331ebaf9267b26ae1743c95ed3f (patch) | |
| tree | af26e7c26a71ded44ab35f75bbd47a66ac90a07b /src/gallium | |
| parent | d98eb4b2f0ce93ee43ebdf954234509282497e4d (diff) | |
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)
Diffstat (limited to 'src/gallium')
| -rw-r--r-- | src/gallium/auxiliary/util/u_blit.c | 2 |
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 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, |