Merge branch 'mesa_7_5_branch'

Conflicts: src/mesa/vbo/vbo_exec_draw.c
2009-06-30 08:56:53 -06:00
parent b750b9fc3d 4c31632817
commit b40dc7e7fc
11 changed files with 54 additions and 19 deletions
--- a/src/mesa/state_tracker/st_cb_bufferobjects.c
+++ b/src/mesa/state_tracker/st_cb_bufferobjects.c
@@ -236,6 +236,9 @@ st_bufferobj_map_range(GLcontext *ctx, GLenum target,
   if (access & GL_MAP_READ_BIT)
      flags |= PIPE_BUFFER_USAGE_CPU_READ;

+   if (access & GL_MAP_FLUSH_EXPLICIT_BIT)
+      flags |= PIPE_BUFFER_USAGE_FLUSH_EXPLICIT;
+   
   /* ... other flags ...
    */