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/version.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/version.c')
| -rw-r--r-- | src/mesa/main/version.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/mesa/main/version.c b/src/mesa/main/version.c index c497317473d..f006a494aaf 100644 --- a/src/mesa/main/version.c +++ b/src/mesa/main/version.c @@ -85,8 +85,7 @@ compute_version(struct gl_context *ctx) GLuint major, minor; static const int max = 100; - const GLboolean ver_1_3 = (ctx->Extensions.ARB_multitexture && - ctx->Extensions.ARB_texture_border_clamp && + const GLboolean ver_1_3 = (ctx->Extensions.ARB_texture_border_clamp && ctx->Extensions.ARB_texture_cube_map && ctx->Extensions.EXT_texture_env_add && ctx->Extensions.ARB_texture_env_combine && @@ -245,8 +244,7 @@ compute_version_es1(struct gl_context *ctx) static const int max = 100; /* OpenGL ES 1.0 is derived from OpenGL 1.3 */ - const GLboolean ver_1_0 = (ctx->Extensions.ARB_multitexture && - ctx->Extensions.EXT_texture_env_add && + const GLboolean ver_1_0 = (ctx->Extensions.EXT_texture_env_add && ctx->Extensions.ARB_texture_env_combine && ctx->Extensions.ARB_texture_env_dot3); /* OpenGL ES 1.1 is derived from OpenGL 1.5 */ @@ -277,8 +275,7 @@ compute_version_es2(struct gl_context *ctx) static const int max = 100; /* OpenGL ES 2.0 is derived from OpenGL 2.0 */ - const GLboolean ver_2_0 = (ctx->Extensions.ARB_multitexture && - ctx->Extensions.ARB_texture_cube_map && + const GLboolean ver_2_0 = (ctx->Extensions.ARB_texture_cube_map && ctx->Extensions.ARB_texture_mirrored_repeat && ctx->Extensions.EXT_blend_color && ctx->Extensions.EXT_blend_func_separate && |