From: Brian Paul <brianp@vmware.com>
Date: Thu, 5 Jan 2012 18:59:30 +0000 (-0700)
Subject: swrast: use memmove() instead of memcpy() in the SHIFT_ARRAY macro
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a44d715d2b19dc2f8f48b01144cc38e4e2c5015a;p=mesa.git

swrast: use memmove() instead of memcpy() in the SHIFT_ARRAY macro

The src/dst arrays would overlap but dst was less than src so a simple
version of memcpy() would do the right thing.  But this isn't guaranteed
when memcpy() is optimized.

Fixes demos/copypix when the dest region was clipped by the left side of
the window.

Reviewed-by: Adam Jackson <ajax@redhat.com>
---

diff --git a/src/mesa/swrast/s_span.c b/src/mesa/swrast/s_span.c
index 4124e444e00..8f02eeae79e 100644
--- a/src/mesa/swrast/s_span.c
+++ b/src/mesa/swrast/s_span.c
@@ -776,7 +776,7 @@ clip_span( struct gl_context *ctx, SWspan *span )
          span->intTex[1] += leftClip * span->intTexStep[1];
 
 #define SHIFT_ARRAY(ARRAY, SHIFT, LEN) \
-         memcpy(ARRAY, ARRAY + (SHIFT), (LEN) * sizeof(ARRAY[0]))
+         memmove(ARRAY, ARRAY + (SHIFT), (LEN) * sizeof(ARRAY[0]))
 
          for (i = 0; i < FRAG_ATTRIB_MAX; i++) {
             if (span->arrayAttribs & (1 << i)) {