summaryrefslogtreecommitdiffstats
path: root/src/mesa/main/texenv.c
diff options
context:
space:
mode:
authorIan Romanick <[email protected]>2011-08-30 16:51:57 -0700
committerIan Romanick <[email protected]>2011-09-29 10:40:47 -0700
commit5c4f914f9a883be67a93a78c853de103bb6a2d2a (patch)
treeecbce0a15e3496f4ab04a3d585f6622b6653b702 /src/mesa/main/texenv.c
parent677743f7d598a599281d420a60e45be9f6af584f (diff)
mesa: Remove EXT_texture_env_add 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. This extension was previously not supported on mach64, mga (G200), savage (Savage3D and other pre-Savage4), sis, and 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/texenv.c')
-rw-r--r--src/mesa/main/texenv.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/mesa/main/texenv.c b/src/mesa/main/texenv.c
index 1df3890d471..9d47c7bba45 100644
--- a/src/mesa/main/texenv.c
+++ b/src/mesa/main/texenv.c
@@ -60,15 +60,13 @@ set_env_mode(struct gl_context *ctx,
case GL_BLEND:
case GL_DECAL:
case GL_REPLACE:
+ case GL_ADD:
legal = GL_TRUE;
break;
case GL_REPLACE_EXT:
mode = GL_REPLACE; /* GL_REPLACE_EXT != GL_REPLACE */
legal = GL_TRUE;
break;
- case GL_ADD:
- legal = ctx->Extensions.EXT_texture_env_add;
- break;
case GL_COMBINE:
legal = (ctx->Extensions.EXT_texture_env_combine ||
ctx->Extensions.ARB_texture_env_combine);