diff options
| author | Alan Hourihane <[email protected]> | 2008-11-25 09:28:30 +0000 |
|---|---|---|
| committer | Alan Hourihane <[email protected]> | 2008-11-25 09:28:30 +0000 |
| commit | 4af0d940a35536f096a9289470af0268a79402b3 (patch) | |
| tree | 811a00ed03b1bcd5a99713108f831b41484153ff /src/gallium/include | |
| parent | c5b52b5e0e6f6e47c3953076fa788921b1c5a5e2 (diff) | |
| parent | 55839ae064d64b7fcc180fcddb364bf31ab760dc (diff) | |
Merge commit 'origin/gallium-0.1' into gallium-0.2
Conflicts:
scons/gallium.py
src/gallium/auxiliary/pipebuffer/pb_buffer.h
Diffstat (limited to 'src/gallium/include')
| -rw-r--r-- | src/gallium/include/pipe/p_defines.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/gallium/include/pipe/p_defines.h b/src/gallium/include/pipe/p_defines.h index cda10a2f06d..dc8a92dccb0 100644 --- a/src/gallium/include/pipe/p_defines.h +++ b/src/gallium/include/pipe/p_defines.h @@ -204,6 +204,14 @@ enum pipe_texture_target { /** Pipe driver custom usage flags should be greater or equal to this value */ #define PIPE_BUFFER_USAGE_CUSTOM (1 << 16) +/* Convenient shortcuts */ +#define PIPE_BUFFER_USAGE_CPU_READ_WRITE \ + ( PIPE_BUFFER_USAGE_CPU_READ | PIPE_BUFFER_USAGE_CPU_WRITE ) +#define PIPE_BUFFER_USAGE_GPU_READ_WRITE \ + ( PIPE_BUFFER_USAGE_GPU_READ | PIPE_BUFFER_USAGE_GPU_WRITE ) +#define PIPE_BUFFER_USAGE_WRITE \ + ( PIPE_BUFFER_USAGE_CPU_WRITE | PIPE_BUFFER_USAGE_GPU_WRITE ) + /** * Flush types: |