added GL_ARB_texture_env_add

diff --git a/docs/RELNOTES-3.5 b/docs/RELNOTES-3.5
index 4b305f75f3ee0813bbb55b240dd9c100f117e19c..de4da200438508fc312b5d77ab093ca5ffb4a66f 100644 (file)
--- a/docs/RELNOTES-3.5
+++ b/docs/RELNOTES-3.5
@@ -41,6 +41,9 @@ GL_ARB_texture_compression
        This is supported in Mesa but only used by the 3dfx DRI drivers
        for Voodoo4 and later.
 
+GL_ARB_texture_env_add
+       This is identical to GL_EXT_texture_env_add.
+
 GL_NV_blend_square
        Adds extra blend source and dest factors which allow squaring
        of color values.
@@ -73,4 +76,4 @@ and are obsolete w.r.t. the way state updates are done in DRI drivers.
 
 
 ----------------------------------------------------------------------
-$Id: RELNOTES-3.5,v 1.4 2000/09/08 22:39:09 brianp Exp $
+$Id: RELNOTES-3.5,v 1.5 2000/09/25 16:04:35 brianp Exp $

diff --git a/docs/VERSIONS b/docs/VERSIONS
index 54452378e522e9e8abee2c3d502a9af5d0e00df3..00f5a1527529af240f3ac63c33e786c77c0320bf 100644 (file)
--- a/docs/VERSIONS
+++ b/docs/VERSIONS
@@ -1,4 +1,4 @@
-$Id: VERSIONS,v 1.42 2000/09/08 16:42:44 brianp Exp $
+$Id: VERSIONS,v 1.43 2000/09/25 16:04:35 brianp Exp $
 
 
 Mesa Version History
@@ -760,6 +760,7 @@ Mesa Version History
        - GL_EXT_convolution extension
        - GL_ARB_imaging subset
        - OSMesaCreateContextExt() function
+       - GL_ARB_texture_env_add extension (same as GL_EXT_texture_env_add)
     Bug Fixes:
        - fbiRev and tmuRev were unitialized when using Glide3
     Changes:

diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c
index 7be40ef5446fefde99d707ee316e24a34044deef..e687cd16c73d578b986e2e20c0ff723688855272 100644 (file)
--- 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");