added GL_EXT_blend_func_separate

diff --git a/docs/RELNOTES-3.3 b/docs/RELNOTES-3.3
index 128ec641d4f817b8af54d6ac871a46bd67b2d0e0..d93031d5685aba3488e45b57829f9e898b3d26e8 100644 (file)
--- a/docs/RELNOTES-3.3
+++ b/docs/RELNOTES-3.3
@@ -59,9 +59,9 @@ that several of the configuration names have changed:
 New extensions
 --------------
 
-GL_EXT_transpose_matrix
-       Adds glLoadTransposeMatrix() and glMultTransposeMatrix() functions.
-       See http://reality.sgi.com/opengl/arb/extensions/ext_text/GL_EXT_transpose_matrix.txt
+GL_ARB_transpose_matrix
+       Adds glLoadTransposeMatrixARB() and glMultTransposeMatrixARB()
+        functions.
 
 GL_EXT_texture_add_env
        Adds GL_ADD texture environment mode.
@@ -89,6 +89,12 @@ GL_SGI_color_table
 GL_EXT_histogram
        Compute histograms for glDraw/Read/CopyPixels.
 
+GL_EXT_blend_func_separate
+       This is the same as GL_INGR_blend_func_separate.
+
+Documentation for all these functions can be found at
+http://oss.sgi.com/projects/ogl-sample/registry/
+
 
 
 GLX_SGI_make_current_read functionality
@@ -207,4 +213,4 @@ Also added constants for NumAuxBuffers and SubPixelBits.
 
 
 ----------------------------------------------------------------------
-$Id: RELNOTES-3.3,v 1.4 2000/05/04 13:50:33 brianp Exp $
+$Id: RELNOTES-3.3,v 1.5 2000/05/22 18:47:29 brianp Exp $

diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c
index e8f7456705add334ef15366aa3112841456eedbc..bcb9e0c426c97a8355a9dfed9d5a6a9b94ea62f8 100644 (file)
--- a/src/mesa/main/extensions.c
+++ b/src/mesa/main/extensions.c
@@ -1,4 +1,4 @@
-/* $Id: extensions.c,v 1.26 2000/05/22 16:33:21 brianp Exp $ */
+/* $Id: extensions.c,v 1.27 2000/05/22 18:46:52 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -49,16 +49,18 @@ struct extension {
 
 
 static struct { int enabled; const char *name; } default_extensions[] = {
-   { DEFAULT_OFF,    "GL_ARB_imaging" },
+   { DEFAULT_OFF,    "GL_ARB_imaging" },  /* in progress */
    { DEFAULT_ON,     "GL_ARB_multitexture" },
-   { DEFAULT_OFF,    "GL_ARB_texture_cube_map" },
+   { DEFAULT_OFF,    "GL_ARB_texture_cube_map" },  /* in progress */
    { ALWAYS_ENABLED, "GL_ARB_tranpose_matrix" },
    { ALWAYS_ENABLED, "GL_EXT_abgr" },
    { DEFAULT_ON,     "GL_EXT_blend_color" },
+   { DEFAULT_ON,     "GL_EXT_blend_func_separate" },
    { DEFAULT_ON,     "GL_EXT_blend_logic_op" },
    { DEFAULT_ON,     "GL_EXT_blend_minmax" },
    { DEFAULT_ON,     "GL_EXT_blend_subtract" },
    { DEFAULT_ON,     "GL_EXT_clip_volume_hint" },
+   { DEFAULT_OFF,    "GL_EXT_convolution" },  /* in progress */
    { DEFAULT_ON,     "GL_EXT_compiled_vertex_array" },
    { DEFAULT_ON,     "GL_EXT_histogram" },
    { DEFAULT_ON,     "GL_EXT_paletted_texture" },