Mesa (master): util: use util_same_surface() to compare surface pointers
Keith Whitwell
keithw at kemper.freedesktop.org
Thu Aug 13 14:59:02 UTC 2009
Module: Mesa
Branch: master
Commit: 24fdf8aadb6cd1f98d0ce54a1e4f28cb964b99e0
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=24fdf8aadb6cd1f98d0ce54a1e4f28cb964b99e0
Author: Brian Paul <brianp at vmware.com>
Date: Thu Aug 6 09:02:36 2009 -0600
util: use util_same_surface() to compare surface pointers
---
src/gallium/auxiliary/util/u_blit.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/gallium/auxiliary/util/u_blit.c b/src/gallium/auxiliary/util/u_blit.c
index f7cc7dd..739aa51 100644
--- a/src/gallium/auxiliary/util/u_blit.c
+++ b/src/gallium/auxiliary/util/u_blit.c
@@ -328,8 +328,9 @@ util_blit_pixels(struct blit_state *ctx,
PIPE_TEXTURE_USAGE_SAMPLER, 0));
/* do the regions overlap? */
- overlap = (src == dst) && regions_overlap(srcX0, srcY0, srcX1, srcY1,
- dstX0, dstY0, dstX1, dstY1);
+ overlap = util_same_surface(src, dst) &&
+ regions_overlap(srcX0, srcY0, srcX1, srcY1,
+ dstX0, dstY0, dstX1, dstY1);
/*
* Check for simple case: no format conversion, no flipping, no stretching,
@@ -343,7 +344,6 @@ util_blit_pixels(struct blit_state *ctx,
(dstX1 - dstX0) == (srcX1 - srcX0) &&
(dstY1 - dstY0) == (srcY1 - srcY0) &&
!overlap) {
- /* FIXME: this will most surely fail for overlapping rectangles */
pipe->surface_copy(pipe,
dst, dstX0, dstY0, /* dest */
src, srcX0, srcY0, /* src */
More information about the mesa-commit
mailing list