diff options
| author | Brian Paul <brianp@vmware.com> | 2010-02-19 08:09:01 -0700 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2010-02-19 08:09:01 -0700 |
| commit | e197de56cdb86835f1437688a9161cd909792d80 (patch) | |
| tree | bbdf4447d51a43093d27c3a1016b6f661dc24fa8 /src/mesa/drivers/glide | |
| parent | 2efa86ea3040c37965987160733b22e2a0541a3e (diff) | |
mesa: replace old MEMCPY macro with memcpy
Diffstat (limited to 'src/mesa/drivers/glide')
| -rw-r--r-- | src/mesa/drivers/glide/fxdd.c | 6 | ||||
| -rw-r--r-- | src/mesa/drivers/glide/fxddtex.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/mesa/drivers/glide/fxdd.c b/src/mesa/drivers/glide/fxdd.c index 2bc60399ea..d94bf08a88 100644 --- a/src/mesa/drivers/glide/fxdd.c +++ b/src/mesa/drivers/glide/fxdd.c @@ -840,7 +840,7 @@ fxDDReadPixels565 (GLcontext * ctx, const GLint widthInBytes = width * 2; GLint row; for (row = 0; row < height; row++) { - MEMCPY(dst, src, widthInBytes); + memcpy(dst, src, widthInBytes); dst += dstStride; src -= srcStride; } @@ -953,7 +953,7 @@ fxDDReadPixels555 (GLcontext * ctx, const GLint widthInBytes = width * 2; GLint row; for (row = 0; row < height; row++) { - MEMCPY(dst, src, widthInBytes); + memcpy(dst, src, widthInBytes); dst += dstStride; src -= srcStride; } @@ -1572,7 +1572,7 @@ fxDDDrawPixels8888 (GLcontext * ctx, GLint x, GLint y, for (row = 0; row < height; row++) { GLubyte *src = (GLubyte *) _mesa_image_address2d(finalUnpack, pixels, width, height, format, type, row, 0); - MEMCPY(dst, src, widthInBytes); + memcpy(dst, src, widthInBytes); dst += dstStride; } } diff --git a/src/mesa/drivers/glide/fxddtex.c b/src/mesa/drivers/glide/fxddtex.c index 9dd4f1e9c3..a87a28ac3e 100644 --- a/src/mesa/drivers/glide/fxddtex.c +++ b/src/mesa/drivers/glide/fxddtex.c @@ -1688,7 +1688,7 @@ fxDDCompressedTexImage2D (GLcontext *ctx, GLenum target, texImage->Data); ti->padded = GL_TRUE; } else { - MEMCPY(texImage->Data, data, texImage->CompressedSize); + memcpy(texImage->Data, data, texImage->CompressedSize); } ti->info.format = mml->glideFormat; @@ -1739,7 +1739,7 @@ fxDDCompressedTexSubImage2D( GLcontext *ctx, GLenum target, rows = height / 4; /* hardcoded 4, but works for FXT1/DXTC */ for (i = 0; i < rows; i++) { - MEMCPY(dest, data, srcRowStride); + memcpy(dest, data, srcRowStride); dest += destRowStride; data = (GLvoid *)((GLuint)data + (GLuint)srcRowStride); } |