From: Brian Paul <brianp@vmware.com>
Date: Tue, 30 Jun 2009 14:56:53 +0000 (-0600)
Subject: Merge branch 'mesa_7_5_branch'
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b40dc7e7fcafc30ebaa3778ee847c8983987de83;p=mesa.git

Merge branch 'mesa_7_5_branch'

Conflicts:

	src/mesa/vbo/vbo_exec_draw.c
---

b40dc7e7fcafc30ebaa3778ee847c8983987de83
diff --cc src/mesa/vbo/vbo_exec_draw.c
index c939b7b6335,fdacb42e357..5442a409ad4
--- a/src/mesa/vbo/vbo_exec_draw.c
+++ b/src/mesa/vbo/vbo_exec_draw.c
@@@ -277,14 -265,17 +277,19 @@@ vbo_exec_vtx_unmap( struct vbo_exec_con
     }
  }
  
 -void vbo_exec_vtx_map( struct vbo_exec_context *exec )
 +
 +void
 +vbo_exec_vtx_map( struct vbo_exec_context *exec )
  {
     GLcontext *ctx = exec->ctx;
-    GLenum target = GL_ARRAY_BUFFER_ARB;
-    GLenum access = GL_READ_WRITE_ARB;
-    GLenum usage = GL_STREAM_DRAW_ARB;
+    const GLenum target = GL_ARRAY_BUFFER_ARB;
+    const GLenum access = GL_READ_WRITE_ARB; /* for MapBuffer */
+    const GLenum accessRange = GL_MAP_WRITE_BIT |  /* for MapBufferRange */
+                               GL_MAP_INVALIDATE_RANGE_BIT |
+                               GL_MAP_UNSYNCHRONIZED_BIT |
+                               GL_MAP_FLUSH_EXPLICIT_BIT |
+                               MESA_MAP_NOWAIT_BIT;
+    const GLenum usage = GL_STREAM_DRAW_ARB;
     
     if (exec->vtx.bufferobj->Name == 0)
        return;