diff options
| author | Ian Romanick <[email protected]> | 2011-08-30 17:24:13 -0700 |
|---|---|---|
| committer | Ian Romanick <[email protected]> | 2011-09-29 10:40:51 -0700 |
| commit | bde8bd99b64876b47f9d335320eb1ad5b3be8d9d (patch) | |
| tree | 33fc4bc0ea6903583e834b5f9c062f5de3eb82fe /src/mesa/main/extensions.c | |
| parent | 5c4f914f9a883be67a93a78c853de103bb6a2d2a (diff) | |
mesa: Remove EXT_texture_env_combine 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_TEXTURE_ENV_MODE in OpenGL ES 2.x).
This patch does not change the situation in any way.
It looks like the only hardware supported by Mesa that cannot do
ARB_texture_env_combine is pre-NV10 NVIDA chips. It appears that
these chips cannot do the GL_SUBTRACT mode. Based on looking at older
copies of nvOpenGLspecs.pdf found on the net, NVIDIA never supported
ARB_texture_env_combine on those chips either.
This extension was previously not supported on mach64, mga (G200),
r128, savage, sis, and tdfx (Voodoo Banshee and Voodoo3).
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/extensions.c')
| -rw-r--r-- | src/mesa/main/extensions.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c index d3ec064cc97..7d1956e7c34 100644 --- a/src/mesa/main/extensions.c +++ b/src/mesa/main/extensions.c @@ -192,7 +192,7 @@ static const struct extension extension_table[] = { { "GL_EXT_texture_cube_map", o(ARB_texture_cube_map), GL, 2001 }, { "GL_EXT_texture_edge_clamp", o(dummy_true), GL, 1997 }, { "GL_EXT_texture_env_add", o(dummy_true), GL, 1999 }, - { "GL_EXT_texture_env_combine", o(EXT_texture_env_combine), GL, 2000 }, + { "GL_EXT_texture_env_combine", o(dummy_true), GL, 2000 }, { "GL_EXT_texture_env_dot3", o(EXT_texture_env_dot3), GL, 2000 }, { "GL_EXT_texture_filter_anisotropic", o(EXT_texture_filter_anisotropic), GL | ES1 | ES2, 1999 }, { "GL_EXT_texture_format_BGRA8888", o(dummy_true), ES1 | ES2, 2005 }, @@ -473,7 +473,6 @@ _mesa_enable_sw_extensions(struct gl_context *ctx) ctx->Extensions.EXT_stencil_two_side = GL_TRUE; ctx->Extensions.EXT_texture_array = GL_TRUE; ctx->Extensions.EXT_texture_compression_latc = GL_TRUE; - ctx->Extensions.EXT_texture_env_combine = GL_TRUE; ctx->Extensions.EXT_texture_env_dot3 = GL_TRUE; ctx->Extensions.EXT_texture_filter_anisotropic = GL_TRUE; ctx->Extensions.EXT_texture_mirror_clamp = GL_TRUE; |