Mesa (master): mesa: only map src/dest regions in _mesa_copy_buffer_subdata ()

[Brian Paul]

Module: Mesa
Branch: master
Commit: 6aed626c35db96c99106e2c12ef23dc58965ece0
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=6aed626c35db96c99106e2c12ef23dc58965ece0

Author: Brian Paul <brianp at vmware.com>
Date:   Wed Jan  4 14:53:55 2012 -0700

mesa: only map src/dest regions in _mesa_copy_buffer_subdata()

We were wastefully mapping the whole source/dest buffers before.

Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Yuanhan Liu <yuanhan.liu at linux.intel.com>

---

 src/mesa/main/bufferobj.c |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/mesa/main/bufferobj.c b/src/mesa/main/bufferobj.c
index 66957e4..4625198 100644
--- a/src/mesa/main/bufferobj.c
+++ b/src/mesa/main/bufferobj.c
@@ -502,19 +502,20 @@ _mesa_copy_buffer_subdata(struct gl_context *ctx,
                           GLintptr readOffset, GLintptr writeOffset,
                           GLsizeiptr size)
 {
-   GLubyte *srcPtr, *dstPtr;
+   void *srcPtr, *dstPtr;
 
    /* buffer should not already be mapped */
    assert(!_mesa_bufferobj_mapped(src));
    assert(!_mesa_bufferobj_mapped(dst));
 
-   srcPtr = (GLubyte *) ctx->Driver.MapBufferRange(ctx, 0, src->Size,
-						   GL_MAP_READ_BIT, src);
-   dstPtr = (GLubyte *) ctx->Driver.MapBufferRange(ctx, 0, dst->Size,
-						   GL_MAP_WRITE_BIT, dst);
+   srcPtr = ctx->Driver.MapBufferRange(ctx, readOffset, size,
+                                       GL_MAP_READ_BIT, src);
+   dstPtr = ctx->Driver.MapBufferRange(ctx, writeOffset, size,
+                                       (GL_MAP_WRITE_BIT |
+                                        GL_MAP_INVALIDATE_RANGE_BIT), dst);
 
    if (srcPtr && dstPtr)
-      memcpy(dstPtr + writeOffset, srcPtr + readOffset, size);
+      memcpy(dstPtr, srcPtr, size);
 
    ctx->Driver.UnmapBuffer(ctx, src);
    ctx->Driver.UnmapBuffer(ctx, dst);