diff options
author | marha <marha@users.sourceforge.net> | 2013-01-31 08:14:38 +0100 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2013-01-31 08:14:38 +0100 |
commit | 3dc034dda1a451ed7dc48cfb10caba11e66b4132 (patch) | |
tree | ac2f7522e5b3287afdb5dcd5af6d9c6bb9a3d079 /mesalib/src/mesa/main/mtypes.h | |
parent | 4e7e0bd9194a033f05179fb64126c56fc6f072b5 (diff) | |
parent | 436f8246cd5a377596f6e42e6562da186ef8df48 (diff) | |
download | vcxsrv-3dc034dda1a451ed7dc48cfb10caba11e66b4132.tar.gz vcxsrv-3dc034dda1a451ed7dc48cfb10caba11e66b4132.tar.bz2 vcxsrv-3dc034dda1a451ed7dc48cfb10caba11e66b4132.zip |
Merge remote-tracking branch 'origin/released'
* origin/released:
libxtrans mesa pixman xkeyboard-config git update 31 jan 2013
Diffstat (limited to 'mesalib/src/mesa/main/mtypes.h')
-rw-r--r-- | mesalib/src/mesa/main/mtypes.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/mesalib/src/mesa/main/mtypes.h b/mesalib/src/mesa/main/mtypes.h index 3369623f7..b92f98e7d 100644 --- a/mesalib/src/mesa/main/mtypes.h +++ b/mesalib/src/mesa/main/mtypes.h @@ -1295,6 +1295,9 @@ struct gl_texture_object GLenum BufferObjectFormat; /** Equivalent Mesa format for BufferObjectFormat. */ gl_format _BufferObjectFormat; + /** GL_ARB_texture_buffer_range */ + GLintptr BufferOffset; + GLsizeiptr BufferSize; /**< if this is -1, use BufferObject->Size instead */ /** GL_OES_EGL_image_external */ GLint RequiredTextureImageUnits; @@ -2851,6 +2854,8 @@ struct gl_constants GLfloat MaxTextureLodBias; /**< GL_EXT_texture_lod_bias */ GLuint MaxTextureBufferSize; /**< GL_ARB_texture_buffer_object */ + GLuint TextureBufferOffsetAlignment; /**< GL_ARB_texture_buffer_range */ + GLuint MaxArrayLockSize; GLint SubPixelBits; @@ -3075,6 +3080,7 @@ struct gl_extensions GLboolean ARB_texture_border_clamp; GLboolean ARB_texture_buffer_object; GLboolean ARB_texture_buffer_object_rgb32; + GLboolean ARB_texture_buffer_range; GLboolean ARB_texture_compression_rgtc; GLboolean ARB_texture_cube_map; GLboolean ARB_texture_cube_map_array; |