diff options
author | Roland Scheidegger <sroland@vmware.com> | 2010-05-19 18:33:28 +0200 |
---|---|---|
committer | Roland Scheidegger <sroland@vmware.com> | 2010-05-19 18:34:01 +0200 |
commit | ce65caba846b03b5ef4144e311b85cfd48ab9bbb (patch) | |
tree | 79bc4c08bc5ebf2b45c1f2dcf163ac42ef7d30af /src/gallium/auxiliary/util | |
parent | 23808f1b5e88373534c7ff546cdd89030ce1e935 (diff) | |
download | external_mesa3d-ce65caba846b03b5ef4144e311b85cfd48ab9bbb.zip external_mesa3d-ce65caba846b03b5ef4144e311b85cfd48ab9bbb.tar.gz external_mesa3d-ce65caba846b03b5ef4144e311b85cfd48ab9bbb.tar.bz2 |
util: fix obvious util_blitter_copy bugs...
Diffstat (limited to 'src/gallium/auxiliary/util')
-rw-r--r-- | src/gallium/auxiliary/util/u_blitter.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/gallium/auxiliary/util/u_blitter.c b/src/gallium/auxiliary/util/u_blitter.c index 8b18ba3..d603c7a 100644 --- a/src/gallium/auxiliary/util/u_blitter.c +++ b/src/gallium/auxiliary/util/u_blitter.c @@ -734,8 +734,7 @@ void util_blitter_copy(struct blitter_context *blitter, if (dst->texture == src->texture) { assert(!is_overlap(srcx, srcx + width, srcy, srcy + height, - dstx, dstx + width, dsty, dsty + height)) - } + dstx, dstx + width, dsty, dsty + height)); } is_depth = util_format_get_component_bits(src->format, UTIL_FORMAT_COLORSPACE_ZS, 0) != 0; @@ -755,8 +754,8 @@ void util_blitter_copy(struct blitter_context *blitter, subdst.level = dst->level; subsrc.face = src->face; subsrc.level = src->level; - util_resource_copy_region(pipe, dst, subdst, dstx, dsty, dst->zslice, - src, subsrc, srcx, srcy, src->zslice, + util_resource_copy_region(pipe, dst->texture, subdst, dstx, dsty, dst->zslice, + src->texture, subsrc, srcx, srcy, src->zslice, width, height); return; } |