summaryrefslogtreecommitdiffstats
path: root/src/mesa/main
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2000-09-25 16:03:59 +0000
committerBrian Paul <[email protected]>2000-09-25 16:03:59 +0000
commit423f2b28845dc8cc93c16a4608d6e19b6b059e6f (patch)
tree487c775a39f601d38672a36d6f22d229e153bedf /src/mesa/main
parentb9b329d1e536896368f7035086bca62b98fd43e9 (diff)
added GL_ARB_texture_env_add
Diffstat (limited to 'src/mesa/main')
-rw-r--r--src/mesa/main/extensions.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c
index 7be40ef5446..e687cd16c73 100644
--- a/src/mesa/main/extensions.c
+++ b/src/mesa/main/extensions.c
@@ -1,4 +1,4 @@
-/* $Id: extensions.c,v 1.35 2000/09/02 17:52:53 brianp Exp $ */
+/* $Id: extensions.c,v 1.36 2000/09/25 16:03:59 brianp Exp $ */
/*
* Mesa 3-D graphics library
@@ -53,6 +53,7 @@ static struct { int enabled; const char *name; } default_extensions[] = {
{ DEFAULT_ON, "GL_ARB_multitexture" },
{ DEFAULT_OFF, "GL_ARB_texture_compression" },
{ DEFAULT_OFF, "GL_ARB_texture_cube_map" },
+ { DEFAULT_ON, "GL_ARB_texture_env_add" },
{ ALWAYS_ENABLED, "GL_ARB_tranpose_matrix" },
{ ALWAYS_ENABLED, "GL_EXT_abgr" },
{ DEFAULT_ON, "GL_EXT_blend_color" },
@@ -108,7 +109,7 @@ update_extension_flags( GLcontext *ctx )
ctx->Extensions.HaveHistogram = gl_extension_is_enabled(ctx, "GL_EXT_histogram") || gl_extension_is_enabled(ctx, "GL_ARB_imaging");
ctx->Extensions.HaveHpOcclusionTest = gl_extension_is_enabled(ctx, "GL_HP_occlusion_test");
ctx->Extensions.HaveStencilWrap = gl_extension_is_enabled(ctx, "GL_EXT_stencil_wrap");
- ctx->Extensions.HaveTextureEnvAdd = gl_extension_is_enabled(ctx, "GL_EXT_texture_env_add");
+ ctx->Extensions.HaveTextureEnvAdd = gl_extension_is_enabled(ctx, "GL_EXT_texture_env_add") || gl_extension_is_enabled(ctx, "GL_ARB_texture_env_add");
ctx->Extensions.HaveTextureEnvCombine = gl_extension_is_enabled(ctx, "GL_EXT_texture_env_combine");
ctx->Extensions.HaveTextureCubeMap = gl_extension_is_enabled(ctx, "GL_ARB_texture_cube_map");
ctx->Extensions.HaveTextureCompression = gl_extension_is_enabled(ctx, "GL_ARB_texture_compression");