Merge commit 'origin/master' into gallium-map-range

diff --cc src/mesa/vbo/vbo_exec_draw.c
index c85e142a5a7e026871eccfb238ff033bf9e0f2b3,59e176b8375e535a33eeb108c35929870849edfc..6f8d1f8eb0786176c69a061c28f9adf16b27a241
--- 1/src/mesa/vbo/vbo_exec_draw.c
--- 2/src/mesa/vbo/vbo_exec_draw.c
+++ b/src/mesa/vbo/vbo_exec_draw.c
@@@ -287,9 -284,13 +291,10 @@@ void vbo_exec_vtx_map( struct vbo_exec_
                                                  GL_MAP_UNSYNCHRONIZED_BIT | 
                                                  MESA_MAP_NOWAIT_BIT),
                                                 exec->vtx.bufferobj);
+       exec->vtx.buffer_ptr = exec->vtx.buffer_map;
     }
 -
 -   if (exec->vtx.buffer_map) {
 -      exec->vtx.buffer_map += exec->vtx.buffer_used / sizeof(float);
 -   }
 -   else {
 +   
 +   if (!exec->vtx.buffer_map) {
        exec->vtx.buffer_used = 0;
  
        ctx->Driver.BufferData(ctx, target,