diff options
| author | glider@chromium.org <glider@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-31 08:30:40 +0000 |
|---|---|---|
| committer | glider@chromium.org <glider@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-31 08:30:40 +0000 |
| commit | 3f869667a8206993904b53faf62325dd333ec14e (patch) | |
| tree | 4cabb00cb44a477c2661c0905ec62fc8520e9c45 /third_party/mesa | |
| parent | cd4e8086fb9b969ab6ebec9cacb0845756cf7a6c (diff) | |
| download | chromium_src-3f869667a8206993904b53faf62325dd333ec14e.zip chromium_src-3f869667a8206993904b53faf62325dd333ec14e.tar.gz chromium_src-3f869667a8206993904b53faf62325dd333ec14e.tar.bz2 | |
Fix clip_span() to use memmove() instead of memcpy().
This is actually a merge of upstream commit a44d715d2b19dc2f8f48b01144cc38e4e2c5015a
BUG=139587,132211
Review URL: https://chromiumcodereview.appspot.com/10833067
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149148 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/mesa')
| -rw-r--r-- | third_party/mesa/MesaLib/src/mesa/swrast/s_span.c | 2 | ||||
| -rw-r--r-- | third_party/mesa/README.chromium | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/third_party/mesa/MesaLib/src/mesa/swrast/s_span.c b/third_party/mesa/MesaLib/src/mesa/swrast/s_span.c index 28c8299..b9e4606 100644 --- a/third_party/mesa/MesaLib/src/mesa/swrast/s_span.c +++ b/third_party/mesa/MesaLib/src/mesa/swrast/s_span.c @@ -762,7 +762,7 @@ clip_span( GLcontext *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)) { diff --git a/third_party/mesa/README.chromium b/third_party/mesa/README.chromium index 435f60e..77c62a7 100644 --- a/third_party/mesa/README.chromium +++ b/third_party/mesa/README.chromium @@ -98,3 +98,6 @@ Later modifications (see chromium.patch): - Merged fix for https://bugs.freedesktop.org/show_bug.cgi?id=51574 (commit b1802a2115323233352da558430e109ff187b8af) + +- Merged the replacement of memcpy() with memmove() in SHIFT_ARRAY declared in + s_span.c (commit a44d715d2b19dc2f8f48b01144cc38e4e2c5015a) |