diff options
author | marha <marha@users.sourceforge.net> | 2011-05-09 10:10:32 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2011-05-09 10:10:32 +0000 |
commit | 5bb5135182a1a50b1b6659d8aa5168ebfbe71979 (patch) | |
tree | 7c8f16bf0832a90195bdbc4e8a9477158e0acf9b /mesalib/src/mesa/main/mtypes.h | |
parent | c721bc9b176ec37d8b80a92c89840658f8f6c458 (diff) | |
parent | 43b2398ee28e9144fd51eb9994d67c4c9a198c9c (diff) | |
download | vcxsrv-5bb5135182a1a50b1b6659d8aa5168ebfbe71979.tar.gz vcxsrv-5bb5135182a1a50b1b6659d8aa5168ebfbe71979.tar.bz2 vcxsrv-5bb5135182a1a50b1b6659d8aa5168ebfbe71979.zip |
svn merge ^/branches/released .
Diffstat (limited to 'mesalib/src/mesa/main/mtypes.h')
-rw-r--r-- | mesalib/src/mesa/main/mtypes.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mesalib/src/mesa/main/mtypes.h b/mesalib/src/mesa/main/mtypes.h index 02fdeffb6..4ec15d1e2 100644 --- a/mesalib/src/mesa/main/mtypes.h +++ b/mesalib/src/mesa/main/mtypes.h @@ -1339,6 +1339,7 @@ struct gl_sampler_object GLenum CompareFunc; /**< GL_ARB_shadow */
GLfloat CompareFailValue; /**< GL_ARB_shadow_ambient */
GLenum sRGBDecode; /**< GL_DECODE_EXT or GL_SKIP_DECODE_EXT */
+ GLboolean CubeMapSeamless; /**< GL_AMD_seamless_cubemap_per_texture */
/* deprecated sampler state */
GLenum DepthMode; /**< GL_ARB_depth_texture */
@@ -2885,6 +2886,7 @@ struct gl_extensions GLboolean OES_standard_derivatives;
/* vendor extensions */
GLboolean AMD_conservative_depth;
+ GLboolean AMD_seamless_cubemap_per_texture;
GLboolean APPLE_client_storage;
GLboolean APPLE_packed_pixels;
GLboolean APPLE_vertex_array_object;
|