summaryrefslogtreecommitdiff
path: root/src/gallium/auxiliary/util
diff options
context:
space:
mode:
authorRobert Ellison <papillo@tungstengraphics.com>2008-12-18 09:46:53 -0700
committerRobert Ellison <papillo@tungstengraphics.com>2008-12-18 11:25:27 -0700
commit36c7bb697d47560e2bf4798db11afd7f1751abef (patch)
tree2cef67227ab48db399f9a7dcf0a09d17ee20c7b1 /src/gallium/auxiliary/util
parent97d08366aa2a56705d32806845134cb4b5edbff0 (diff)
Gallium: fix for conform test
The following construction in util_surface_copy() in gallium/auxiliary/util/u_rect.c, introduced in commit d177c9ddda2c452cf7d6696d89cf4458ef986f98, incorrectly inverts the Y coordinate in the last parameter to pipe_copy_rect(). /* If do_flip, invert src_y position and pass negative src stride */ pipe_copy_rect(dst_map, &dst->block, dst->stride, dst_x, dst_y, w, h, src_map, do_flip ? -(int) src->stride : src->stride, src_x, do_flip ? w - src_y : src_y); The intention is to start at the last Y coordinate line and move backwards, in the case of a flip; in that case, the correct calculation is "src_y + h - 1", not "w - src_y". This fixes a Gallium assertion failure in the conformance tests: u_rect.c:65:pipe_copy_rect: Assertion `src_y >= 0' failed. debug_get_bool_option: GALLIUM_ABORT_ON_ASSERT = TRUE Trace/breakpoint trap
Diffstat (limited to 'src/gallium/auxiliary/util')
-rw-r--r--src/gallium/auxiliary/util/u_rect.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gallium/auxiliary/util/u_rect.c b/src/gallium/auxiliary/util/u_rect.c
index 30f32413d7..fe81a685be 100644
--- a/src/gallium/auxiliary/util/u_rect.c
+++ b/src/gallium/auxiliary/util/u_rect.c
@@ -223,7 +223,7 @@ util_surface_copy(struct pipe_context *pipe,
src_map,
do_flip ? -(int) src->stride : src->stride,
src_x,
- do_flip ? w - src_y : src_y);
+ do_flip ? src_y + h - 1 : src_y);
}
pipe->screen->surface_unmap(pipe->screen, src);