aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/main/get.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-09-30 08:30:25 +0200
committermarha <marha@users.sourceforge.net>2011-09-30 08:30:25 +0200
commitaf72dcd109d7610b96863035541250997c7a172e (patch)
treeac1693ca03fe2564f8a63fa7373e459adb3a844f /mesalib/src/mesa/main/get.c
parentbee9191042416cbfb848615189ca1e2a0069f022 (diff)
downloadvcxsrv-af72dcd109d7610b96863035541250997c7a172e.tar.gz
vcxsrv-af72dcd109d7610b96863035541250997c7a172e.tar.bz2
vcxsrv-af72dcd109d7610b96863035541250997c7a172e.zip
mesa xkeyboard-config git update 30 sep 2011
Diffstat (limited to 'mesalib/src/mesa/main/get.c')
-rw-r--r--mesalib/src/mesa/main/get.c13
1 files changed, 4 insertions, 9 deletions
diff --git a/mesalib/src/mesa/main/get.c b/mesalib/src/mesa/main/get.c
index cddea8ea2..9c1771e16 100644
--- a/mesalib/src/mesa/main/get.c
+++ b/mesalib/src/mesa/main/get.c
@@ -289,13 +289,11 @@ static const int extra_ARB_sampler_objects[] = {
EXTRA_EXT(ARB_ES2_compatibility);
-EXTRA_EXT(ARB_multitexture);
EXTRA_EXT(ARB_texture_cube_map);
EXTRA_EXT(MESA_texture_array);
EXTRA_EXT2(EXT_secondary_color, ARB_vertex_program);
EXTRA_EXT(EXT_secondary_color);
EXTRA_EXT(EXT_fog_coord);
-EXTRA_EXT(EXT_texture_lod_bias);
EXTRA_EXT(EXT_texture_filter_anisotropic);
EXTRA_EXT(IBM_rasterpos_clip);
EXTRA_EXT(NV_point_sprite);
@@ -432,8 +430,7 @@ static const struct value_desc values[] = {
{ GL_VIEWPORT, LOC_CUSTOM, TYPE_INT_4, 0, NO_EXTRA },
/* GL_ARB_multitexture */
- { GL_ACTIVE_TEXTURE_ARB,
- LOC_CUSTOM, TYPE_INT, 0, extra_ARB_multitexture },
+ { GL_ACTIVE_TEXTURE, LOC_CUSTOM, TYPE_INT, 0, NO_EXTRA },
/* Note that all the OES_* extensions require that the Mesa "struct
* gl_extensions" include a member with the name of the extension.
@@ -612,10 +609,8 @@ static const struct value_desc values[] = {
extra_ARB_ES2_compatibility },
/* GL_ARB_multitexture */
- { GL_MAX_TEXTURE_UNITS_ARB,
- CONTEXT_INT(Const.MaxTextureUnits), extra_ARB_multitexture },
- { GL_CLIENT_ACTIVE_TEXTURE_ARB,
- LOC_CUSTOM, TYPE_INT, 0, extra_ARB_multitexture },
+ { GL_MAX_TEXTURE_UNITS, CONTEXT_INT(Const.MaxTextureUnits), NO_EXTRA },
+ { GL_CLIENT_ACTIVE_TEXTURE, LOC_CUSTOM, TYPE_INT, 0, NO_EXTRA },
/* GL_ARB_texture_cube_map */
{ GL_TEXTURE_CUBE_MAP_ARB, LOC_CUSTOM, TYPE_BOOLEAN, 0, NO_EXTRA },
@@ -655,7 +650,7 @@ static const struct value_desc values[] = {
/* GL_EXT_texture_lod_bias */
{ GL_MAX_TEXTURE_LOD_BIAS_EXT, CONTEXT_FLOAT(Const.MaxTextureLodBias),
- extra_EXT_texture_lod_bias },
+ NO_EXTRA },
/* GL_EXT_texture_filter_anisotropic */
{ GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT,