From ea414e331802e49d59eb2ddd2466d58a383bc931 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Thu, 29 Oct 2009 11:04:11 -0600
Subject: intel: check for single memcpy() in memcpy_get_tex_image()

---
 src/mesa/drivers/dri/intel/intel_tex_image.c | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/mesa/drivers/dri/intel/intel_tex_image.c b/src/mesa/drivers/dri/intel/intel_tex_image.c
index c861fc552f2..6301444c340 100644
--- a/src/mesa/drivers/dri/intel/intel_tex_image.c
+++ b/src/mesa/drivers/dri/intel/intel_tex_image.c
@@ -696,11 +696,16 @@ memcpy_get_tex_image(GLcontext *ctx, GLenum target, GLint level,
          const GLint srcRowStride = texImage->RowStride * bpp;
          GLuint row;
 
-         for (row = 0; row < texImage->Height; row++) {
-            memcpy(dst, src, bytesPerRow);
-            dst += dstRowStride;
-            src += srcRowStride;
-         }         
+         if (bytesPerRow == dstRowStride && bytesPerRow == dstRowStride) {
+            memcpy(dst, src, bytesPerRow * texImage->Height);
+         }
+         else {
+            for (row = 0; row < texImage->Height; row++) {
+               memcpy(dst, src, bytesPerRow);
+               dst += dstRowStride;
+               src += srcRowStride;
+            }
+         }
       }
 
       if (_mesa_is_bufferobj(pack->BufferObj)) {
-- 
cgit v1.2.3