diff options
author | marha <marha@users.sourceforge.net> | 2012-08-03 08:16:19 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2012-08-03 09:35:02 +0200 |
commit | 18e75aa6ae27a6e44d93babd96afbbe0cd6077c8 (patch) | |
tree | a6124cc965bba51de50907418ce63ab4540f582d /mesalib/src/mesa/main/mtypes.h | |
parent | 49838240b7d4cff1ffed1bd91e495f6919061f90 (diff) | |
download | vcxsrv-18e75aa6ae27a6e44d93babd96afbbe0cd6077c8.tar.gz vcxsrv-18e75aa6ae27a6e44d93babd96afbbe0cd6077c8.tar.bz2 vcxsrv-18e75aa6ae27a6e44d93babd96afbbe0cd6077c8.zip |
pixman mesa git update 3 Aug 2012
Diffstat (limited to 'mesalib/src/mesa/main/mtypes.h')
-rw-r--r-- | mesalib/src/mesa/main/mtypes.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/mesalib/src/mesa/main/mtypes.h b/mesalib/src/mesa/main/mtypes.h index 7d7213f4d..e8adac99d 100644 --- a/mesalib/src/mesa/main/mtypes.h +++ b/mesalib/src/mesa/main/mtypes.h @@ -1253,9 +1253,6 @@ struct gl_sampler_object 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 */ }; @@ -1272,6 +1269,8 @@ struct gl_texture_object struct gl_sampler_object Sampler; + GLenum DepthMode; /**< GL_ARB_depth_texture */ + GLfloat Priority; /**< in [0,1] */ GLint BaseLevel; /**< min mipmap level, OpenGL 1.2 */ GLint MaxLevel; /**< max mipmap level, OpenGL 1.2 */ @@ -2966,7 +2965,6 @@ struct gl_extensions GLboolean ARB_occlusion_query; GLboolean ARB_occlusion_query2; GLboolean ARB_point_sprite; - GLboolean ARB_sampler_objects; GLboolean ARB_seamless_cube_map; GLboolean ARB_shader_bit_encoding; GLboolean ARB_shader_objects; |