diff options
| author | Ian Romanick <[email protected]> | 2011-08-30 16:45:50 -0700 |
|---|---|---|
| committer | Ian Romanick <[email protected]> | 2011-09-29 10:40:39 -0700 |
| commit | 677743f7d598a599281d420a60e45be9f6af584f (patch) | |
| tree | 552eae38194c9cc9afbc2e2d4cc3032f2398d763 /src/mesa/main/get.c | |
| parent | 1da10443440800a6f5e4a4e6463737cce27706fd (diff) | |
mesa: Remove ARB_multitexture extension enable flag
All drivers remaining in Mesa support this extension. This extension
is either required or optional features in desktop OpenGL, OpenGL ES
1.x, and OpenGL ES 2.x. The existing support is already partially
broken in Mesa (e.g., querying GL_CLIENT_ACTIVE_TEXTURE in OpenGL ES
2.x). This patch does not change the situation in any way.
This extension was previously not supported on i810, mga (G200), or
tdfx (Voodoo Banshee).
Signed-off-by: Ian Romanick <[email protected]>
Reviewed-by: Brian Paul <[email protected]>
Reviewed-by: Kenneth Graunke <[email protected]>
Diffstat (limited to 'src/mesa/main/get.c')
| -rw-r--r-- | src/mesa/main/get.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c index cddea8ea2b9..e67e77b557e 100644 --- a/src/mesa/main/get.c +++ b/src/mesa/main/get.c @@ -289,7 +289,6 @@ 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); @@ -432,8 +431,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 +610,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 }, |