summaryrefslogtreecommitdiffstats
path: root/src/gallium/include/pipe/p_defines.h
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2009-06-30 08:56:53 -0600
committerBrian Paul <[email protected]>2009-06-30 08:56:53 -0600
commitb40dc7e7fcafc30ebaa3778ee847c8983987de83 (patch)
treeb8ed89d7d8ba3fc2c25b3e2f95a62b1820557aac /src/gallium/include/pipe/p_defines.h
parentb750b9fc3d12e4c23ef74181a6252e0e054a3985 (diff)
parent4c31632817a0bde28ad6c9ee8032d838ce4b7bfb (diff)
Merge branch 'mesa_7_5_branch'
Conflicts: src/mesa/vbo/vbo_exec_draw.c
Diffstat (limited to 'src/gallium/include/pipe/p_defines.h')
-rw-r--r--src/gallium/include/pipe/p_defines.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gallium/include/pipe/p_defines.h b/src/gallium/include/pipe/p_defines.h
index 96030e788db..b7857c5be8c 100644
--- a/src/gallium/include/pipe/p_defines.h
+++ b/src/gallium/include/pipe/p_defines.h
@@ -210,6 +210,7 @@ enum pipe_transfer_usage {
#define PIPE_BUFFER_USAGE_CONSTANT (1 << 7)
#define PIPE_BUFFER_USAGE_DISCARD (1 << 8)
#define PIPE_BUFFER_USAGE_DONTBLOCK (1 << 9)
+#define PIPE_BUFFER_USAGE_FLUSH_EXPLICIT (1 << 10) /**< See pipe_screen::buffer_flush_mapped_range */
/** Pipe driver custom usage flags should be greater or equal to this value */
#define PIPE_BUFFER_USAGE_CUSTOM (1 << 16)