diff options
| author | marha <marha@users.sourceforge.net> | 2014-10-19 11:18:56 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-10-19 11:18:56 +0200 |
| commit | 9fc852414dd4e841c4e2229f55a3e41abca64ac5 (patch) | |
| tree | a524a96442c2a28243826f91f43680f4bcf012d3 /mesalib/src/mesa/main/mtypes.h | |
| parent | 8d44af7cf8bdc4f42223dfef737ebf4e8c7fe55e (diff) | |
| parent | fa5a6df66cfe9b19014ea9d2fca35b762f457041 (diff) | |
| download | vcxsrv-9fc852414dd4e841c4e2229f55a3e41abca64ac5.tar.gz vcxsrv-9fc852414dd4e841c4e2229f55a3e41abca64ac5.tar.bz2 vcxsrv-9fc852414dd4e841c4e2229f55a3e41abca64ac5.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/src/mesa/main/bufferobj.c
Diffstat (limited to 'mesalib/src/mesa/main/mtypes.h')
| -rw-r--r-- | mesalib/src/mesa/main/mtypes.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/mesalib/src/mesa/main/mtypes.h b/mesalib/src/mesa/main/mtypes.h index 5e9453b2f..9f44edac6 100644 --- a/mesalib/src/mesa/main/mtypes.h +++ b/mesalib/src/mesa/main/mtypes.h @@ -1465,6 +1465,16 @@ struct gl_buffer_mapping { /** + * Usages we've seen for a buffer object. + */ +typedef enum { + USAGE_UNIFORM_BUFFER = 0x1, + USAGE_TEXTURE_BUFFER = 0x2, + USAGE_ATOMIC_COUNTER_BUFFER = 0x4, +} gl_buffer_usage; + + +/** * GL_ARB_vertex/pixel_buffer_object buffer object */ struct gl_buffer_object @@ -1481,6 +1491,7 @@ struct gl_buffer_object GLboolean Written; /**< Ever written to? (for debugging) */ GLboolean Purgeable; /**< Is the buffer purgeable under memory pressure? */ GLboolean Immutable; /**< GL_ARB_buffer_storage */ + gl_buffer_usage UsageHistory; /**< How has this buffer been used so far? */ struct gl_buffer_mapping Mappings[MAP_COUNT]; }; @@ -4060,6 +4071,8 @@ struct gl_driver_flags */ uint64_t NewUniformBuffer; + uint64_t NewTextureBuffer; + /** * gl_context::AtomicBufferBindings */ |