Merge branch 'mesa_7_5_branch'

Conflicts:

	src/mesa/vbo/vbo_exec_draw.c

diff --cc src/gallium/include/pipe/p_defines.h
Simple merge

diff --cc src/mesa/state_tracker/st_cb_bufferobjects.c
Simple merge

diff --cc src/mesa/vbo/vbo_exec_draw.c
index c939b7b63359bbb3ab11c0c703135921d4b44ca5,fdacb42e3571d9ffd395e992fff822602eea2de4..5442a409ad486132a12ab685f8151f6df81e8b4e
--- 1/src/mesa/vbo/vbo_exec_draw.c
--- 2/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;