summaryrefslogtreecommitdiff
path: root/src/mesa/state_tracker
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2009-06-30 08:56:53 -0600
committerBrian Paul <brianp@vmware.com>2009-06-30 08:56:53 -0600
commitb40dc7e7fcafc30ebaa3778ee847c8983987de83 (patch)
treeb8ed89d7d8ba3fc2c25b3e2f95a62b1820557aac /src/mesa/state_tracker
parentb750b9fc3d12e4c23ef74181a6252e0e054a3985 (diff)
parent4c31632817a0bde28ad6c9ee8032d838ce4b7bfb (diff)
Merge branch 'mesa_7_5_branch'
Conflicts: src/mesa/vbo/vbo_exec_draw.c
Diffstat (limited to 'src/mesa/state_tracker')
-rw-r--r--src/mesa/state_tracker/st_cb_bufferobjects.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/mesa/state_tracker/st_cb_bufferobjects.c b/src/mesa/state_tracker/st_cb_bufferobjects.c
index 4d9ff01c77..8c1fd5ce02 100644
--- 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 ...
*/