From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Mon, 23 Jun 2008 15:47:12 +0000 (-0600)
Subject: gallium: fix Y-inverted copies
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f738c3acaca235c68a26c7b7d41903c64a36ae9f;p=mesa.git

gallium: fix Y-inverted copies

Don't require the caller to pass a non-intuitive negative src_y coord anymore
when doing a src-inverted copy.
---

diff --git a/src/gallium/auxiliary/util/p_util.c b/src/gallium/auxiliary/util/p_util.c
index 0e3f082b3ee..4e60b1b8418 100644
--- a/src/gallium/auxiliary/util/p_util.c
+++ b/src/gallium/auxiliary/util/p_util.c
@@ -37,6 +37,7 @@
 /**
  * Copy 2D rect from one place to another.
  * Position and sizes are in pixels.
+ * src_pitch may be negative to do vertical flip of pixels from source.
  */
 void
 pipe_copy_rect(ubyte * dst,
@@ -52,6 +53,7 @@ pipe_copy_rect(ubyte * dst,
                int src_y)
 {
    unsigned i;
+   int src_pitch_pos = src_pitch < 0 ? -src_pitch : src_pitch;
 
    assert(cpp > 0);
    assert(src_x >= 0);
@@ -61,10 +63,11 @@ pipe_copy_rect(ubyte * dst,
 
    dst_pitch *= cpp;
    src_pitch *= cpp;
+   src_pitch_pos *= cpp;
    dst += dst_x * cpp;
    src += src_x * cpp;
    dst += dst_y * dst_pitch;
-   src += src_y * src_pitch;
+   src += src_y * src_pitch_pos;
    width *= cpp;
 
    if (width == dst_pitch && width == src_pitch)