diff options
| author | Keith Whitwell <keithw@vmware.com> | 2009-06-30 16:28:37 +0100 |
|---|---|---|
| committer | Keith Whitwell <keithw@vmware.com> | 2009-06-30 16:28:54 +0100 |
| commit | 4147bb24d49a10498e00039fc1dc9aa5f1316777 (patch) | |
| tree | ceb027c40f52dd7e0471a3534bac7cd270b6953b /src/gallium/include/pipe/p_inlines.h | |
| parent | 53f8dccd0c9ab0b55e24dd5d624bbaaf0c8c284b (diff) | |
| parent | 6af783bea0e171582f86c8456ca521ac242abc39 (diff) | |
Merge branch 'mesa_7_5_branch' into dlist-statechange-shortcircuit
Need this to pick up fixes for per-vertex materials.
Diffstat (limited to 'src/gallium/include/pipe/p_inlines.h')
| -rw-r--r-- | src/gallium/include/pipe/p_inlines.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gallium/include/pipe/p_inlines.h b/src/gallium/include/pipe/p_inlines.h index 1232c87968..cf176c9209 100644 --- a/src/gallium/include/pipe/p_inlines.h +++ b/src/gallium/include/pipe/p_inlines.h @@ -117,7 +117,9 @@ pipe_buffer_write(struct pipe_screen *screen, assert(offset + size <= buf->size); assert(size); - map = pipe_buffer_map_range(screen, buf, offset, size, PIPE_BUFFER_USAGE_CPU_WRITE); + map = pipe_buffer_map_range(screen, buf, offset, size, + PIPE_BUFFER_USAGE_CPU_WRITE | + PIPE_BUFFER_USAGE_FLUSH_EXPLICIT); assert(map); if(map) { memcpy(map + offset, data, size); |