summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland Scheidegger <sroland@vmware.com>2010-05-19 18:33:28 +0200
committerRoland Scheidegger <sroland@vmware.com>2010-05-19 18:34:01 +0200
commitce65caba846b03b5ef4144e311b85cfd48ab9bbb (patch)
tree79bc4c08bc5ebf2b45c1f2dcf163ac42ef7d30af
parent23808f1b5e88373534c7ff546cdd89030ce1e935 (diff)
util: fix obvious util_blitter_copy bugs...
-rw-r--r--src/gallium/auxiliary/util/u_blitter.c7
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 8b18ba35f0..d603c7ac06 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;
}