updates for Mesa 4.0

10 files changed, 189 insertions, 22 deletions

diff --git a/docs/README.3DFX b/docs/README.3DFX
index 43c1587b4b..36b1178fed 100644
--- a/docs/README.3DFX
+++ b/docs/README.3DFX
@@ -3,6 +3,10 @@
 				(see below for FAQ)
 
 
+Warning: this document is rather out of date, but most of the information
+should still apply.
+
+
 
 What do you need ?
 ------------------
diff --git a/docs/README.WINDML b/docs/README.WINDML
index e42d48dd3f..448db71f8b 100644
--- a/docs/README.WINDML
+++ b/docs/README.WINDML
@@ -1,5 +1,5 @@
 
-                        WindML Driver for Mesa 3.5            
+                        WindML Driver for Mesa 4.0
 
 
 Requirements
diff --git a/docs/README.X11 b/docs/README.X11
index f49d0810ff..e22ae2d31e 100644
--- a/docs/README.X11
+++ b/docs/README.X11
@@ -1,5 +1,5 @@
 
-                       Mesa 3.5.1 Unix/X11 Information
+                       Mesa 4.0 Unix/X11 Information
 
 
 
@@ -25,7 +25,7 @@ There are two ways to compile Mesa on Unix/X11 systems:
 
 
 The top-level makefile will execute the makefiles in a number of sub-
-directories.  When finished, the Mesa libraries will be in the Mesa-3.5/lib/
+directories.  When finished, the Mesa libraries will be in the Mesa-4.0/lib/
 directory.  A few GLUT demos in the demos/ directory should be ready to run.
 
 If you also downloaded and unpacked the demos there should be executables
@@ -323,4 +323,4 @@ Summary of X-related environment variables:
 
 
 ----------------------------------------------------------------------
-$Id: README.X11,v 3.7 2001/08/28 22:54:47 brianp Exp $
+$Id: README.X11,v 3.8 2001/09/23 16:10:02 brianp Exp $
diff --git a/docs/RELNOTES-4.0 b/docs/RELNOTES-4.0
new file mode 100644
index 0000000000..c8904d50e0
--- /dev/null
+++ b/docs/RELNOTES-4.0
@@ -0,0 +1,161 @@
+
+                           Mesa 4.0 release notes
+
+                             September ??, 2001
+
+                              PLEASE READ!!!!
+
+
+
+Introduction
+------------
+
+Mesa uses an even/odd version number scheme like the Linux kernel.
+Odd numbered versions (such as 3.3) designate new developmental releases.
+Even numbered versions (such as 3.4) designate stable releases.
+
+Mesa version 4.0 signifies two things:
+
+  1. A stabilization of the 3.5 development release
+  2. Implementation of the OpenGL 1.3 specification
+
+
+Note that the Mesa major version number is incremented with the OpenGL
+minor version number:
+
+   Mesa 1.x  ==  OpenGL 1.0
+   Mesa 2.x  ==  OpenGL 1.1
+   Mesa 3.x  ==  OpenGL 1.2
+   Mesa 4.x  ==  OpenGL 1.3
+
+
+
+New Features
+------------
+
+Mesa 3.5 already had all the new features of OpenGL 1.3, implemented as
+extensions.  These extensions were simply promoted to standard features:
+
+   GL_ARB_multisample
+   GL_ARB_multitexture
+   GL_ARB_texture_border_clamp
+   GL_ARB_texture_compression
+   GL_ARB_texture_cube_map
+   GL_ARB_texture_env_add
+   GL_ARB_texture_env_combine
+   GL_ARB_texture_env_dot3
+   GL_ARB_transpose_matrix
+
+In Mesa 4.0 the functions defined by these extensions are now available
+without the "ARB" suffix.  For example, glLoadTransposeMatrixf() is now
+a standard API function.  The new functions in OpenGL 1.3 and Mesa 4.0 are:
+
+   glActiveTexture
+   glClientActiveTexture
+   glCompressedTexImage1D
+   glCompressedTexImage2D
+   glCompressedTexImage3D
+   glCompressedTexSubImage1D
+   glCompressedTexSubImage2D
+   glCompressedTexSubImage3D
+   glGetCompressedTexImage
+   glLoadTransposeMatrixd
+   glLoadTransposeMatrixf
+   glMultiTexCoord1d
+   glMultiTexCoord1dv
+   glMultiTexCoord1f
+   glMultiTexCoord1fv
+   glMultiTexCoord1i
+   glMultiTexCoord1iv
+   glMultiTexCoord1s
+   glMultiTexCoord1sv
+   glMultiTexCoord2d
+   glMultiTexCoord2dv
+   glMultiTexCoord2f
+   glMultiTexCoord2fv
+   glMultiTexCoord2i
+   glMultiTexCoord2iv
+   glMultiTexCoord2s
+   glMultiTexCoord2sv
+   glMultiTexCoord3d
+   glMultiTexCoord3dv
+   glMultiTexCoord3f
+   glMultiTexCoord3fv
+   glMultiTexCoord3i
+   glMultiTexCoord3iv
+   glMultiTexCoord3s
+   glMultiTexCoord3sv
+   glMultiTexCoord4d
+   glMultiTexCoord4dv
+   glMultiTexCoord4f
+   glMultiTexCoord4fv
+   glMultiTexCoord4i
+   glMultiTexCoord4iv
+   glMultiTexCoord4s
+   glMultiTexCoord4sv
+   glMultTransposeMatrixd
+   glMultTransposeMatrixf
+   glSampleCoverage
+   glSamplePass
+
+
+GLX 1.4 is the companion to OpenGL 1.3.  The only new features in GLX 1.4
+are support for multisampling and the GLX_ARB_get_proc_address extension.
+glXGetProcAddress() is the only new function in GLX 1.4.
+
+
+
+Multisample and Texture Compression
+-----------------------------------
+
+The OpenGL 1.3 specification allows the multisample and texture compression
+features to essentially be no-ops.  For example, if you query for multisample
+support you'll find none, but the API functions work.
+
+Similarly, texture compression is not implemented by any of the software
+drivers but you can specify a generic compressed texture format (like
+GL_COMPRESSED_RGBA) to glTexImage2D and it'll be accepted.
+
+
+
+Device Drivers
+--------------
+
+Mesa advertises itself as either OpenGL 1.2 or OpenGL 1.3 depending on the
+device driver.  If the driver enables all the ARB extensions which are part
+of OpenGL 1.3 then glGetString(GL_VERSION) will return "1.3".  Otherwise,
+it'll return "1.2".
+
+A number of Mesa's software drivers haven't been actively maintained for
+some time.  We rely on volunteers to maintain many of the drivers.
+Here's the current status of all included drivers:
+
+
+Driver			Status
+----------------------	---------------------
+XMesa (Xlib)		implements OpenGL 1.3
+OSMesa (off-screen)	implements OpenGL 1.3
+FX (3dfx Voodoo1/2)	implements OpenGL 1.3
+SVGA			implements OpenGL 1.3
+Wind River UGL		implements OpenGL 1.3
+GGI			needs updating
+Windows/Win32		needs updating
+DOS/DJGPP		needs updating
+BeOS			needs updating
+Allegro			needs updating
+D3D			needs updating
+DOS			needs updating
+
+The XFree86/DRI drivers	have not yet been updated to use Mesa 4.0 as of
+September 2001, but that should happen eventually.
+
+
+
+Other Changes
+-------------
+
+See the VERSIONS file for more details about bug fixes, etc. in Mesa 4.0.
+
+
+----------------------------------------------------------------------
+$Id: RELNOTES-4.0,v 3.1 2001/09/23 16:10:02 brianp Exp $
diff --git a/docs/VERSIONS b/docs/VERSIONS
index 8e1d85eef7..201f2aada6 100644
--- a/docs/VERSIONS
+++ b/docs/VERSIONS
@@ -1,4 +1,4 @@
-$Id: VERSIONS,v 1.71 2001/08/31 04:30:14 brianp Exp $
+$Id: VERSIONS,v 1.72 2001/09/23 16:10:02 brianp Exp $
 
 
 Mesa Version History
@@ -869,14 +869,15 @@ Mesa Version History
 	- new libOSMesa.so library, contains the OSMesa driver interface
 
 
-3.5.1  Month ??, 2001
+4.0  September ??, 2001
     New:
+	- Mesa 4.0 implements the OpenGL 1.3 specification
 	- GL_IBM_rasterpos_clip extension
 	- GL_EXT_texture_edge_clamp extension (aka GL_SGIS_texture_edge_clamp)
 	- WindML UGL driver (Stephane Raimbault)
-	- initial support for OpenGL 1.3
 	- added OSMESA_MAX_WIDTH/HEIGHT queries
 	- attempted compiliation fixes for Solaris 5, 7 and 8
+	- Wind River UGL driver (Stephane Raimbault)
     Bug fixes:
 	- added some missing GLX 1.3 tokens to include/GL/glx.h
 	- GL_COLOR_MATRIX changes weren't recognized by teximage functions
diff --git a/src/mesa/Makefile.X11 b/src/mesa/Makefile.X11
index b5cc095a53..6d13089aa1 100644
--- a/src/mesa/Makefile.X11
+++ b/src/mesa/Makefile.X11
@@ -1,7 +1,7 @@
-# $Id: Makefile.X11,v 1.57 2001/09/14 02:43:03 brianp Exp $
+# $Id: Makefile.X11,v 1.58 2001/09/23 16:11:26 brianp Exp $
 
 # Mesa 3-D graphics library
-# Version:  3.5.1
+# Version:  4.0
 # Copyright (C) 1995-2001  Brian Paul
 
 # Makefile for core library
diff --git a/src/mesa/drivers/svga/svgamesa.c b/src/mesa/drivers/svga/svgamesa.c
index a808241998..db97d20194 100644
--- a/src/mesa/drivers/svga/svgamesa.c
+++ b/src/mesa/drivers/svga/svgamesa.c
@@ -1,4 +1,4 @@
-/* $Id: svgamesa.c,v 1.15 2001/03/19 02:25:36 keithw Exp $ */
+/* $Id: svgamesa.c,v 1.16 2001/09/23 16:11:27 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -430,6 +430,7 @@ SVGAMesaContext SVGAMesaCreateContext( GLboolean doubleBuffer )
                                        (void *) ctx, GL_TRUE );
 
    _mesa_enable_sw_extensions(ctx->gl_ctx);
+   _mesa_enable_1_3_extensions(ctx->gl_ctx);
 
    ctx->gl_buffer = _mesa_create_framebuffer( ctx->gl_vis,
                                               ctx->gl_vis->depthBits > 0,
diff --git a/src/mesa/drivers/x11/fakeglx.c b/src/mesa/drivers/x11/fakeglx.c
index 7309fb8ad8..80666aae4d 100644
--- a/src/mesa/drivers/x11/fakeglx.c
+++ b/src/mesa/drivers/x11/fakeglx.c
@@ -1,10 +1,10 @@
-/* $Id: fakeglx.c,v 1.57 2001/09/14 02:43:04 brianp Exp $ */
+/* $Id: fakeglx.c,v 1.58 2001/09/23 16:11:27 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
- * Version:  3.5
+ * Version:  4.0
  *
- * Copyright (C) 1999-2000  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -57,7 +57,7 @@
 
 /* This indicates the client-side GLX API and GLX encoder version. */
 #define CLIENT_MAJOR_VERSION 1
-#define CLIENT_MINOR_VERSION 2  /* don't have 1.3's pbuffers, etc yet */
+#define CLIENT_MINOR_VERSION 4  /* but don't have 1.3's pbuffers, etc yet */
 
 /* This indicates the server-side GLX decoder version.
  * GLX 1.4 indicates OpenGL 1.3 support
@@ -66,7 +66,7 @@
 #define SERVER_MINOR_VERSION 4
 
 /* This is appended onto the glXGetClient/ServerString version strings. */
-#define MESA_GLX_VERSION "Mesa 3.5.1"
+#define MESA_GLX_VERSION "Mesa 4.0"
 
 /* Who implemented this GLX? */
 #define VENDOR "Brian Paul"
@@ -1698,7 +1698,7 @@ Fake_glXGetClientString( Display *dpy, int name )
 
 /* XXX Move this when done.
  * Create an XMesaBuffer as a Pbuffer.
- * New in Mesa 3.5.1 but untested.
+ * New in Mesa 4.0 but untested.
  */
 extern XMesaBuffer XMesaCreatePBuffer( XMesaVisual v, XMesaColormap cmap,
                                     unsigned int width, unsigned int height );
diff --git a/src/mesa/main/Makefile.X11 b/src/mesa/main/Makefile.X11
index b5cc095a53..6d13089aa1 100644
--- a/src/mesa/main/Makefile.X11
+++ b/src/mesa/main/Makefile.X11
@@ -1,7 +1,7 @@
-# $Id: Makefile.X11,v 1.57 2001/09/14 02:43:03 brianp Exp $
+# $Id: Makefile.X11,v 1.58 2001/09/23 16:11:26 brianp Exp $
 
 # Mesa 3-D graphics library
-# Version:  3.5.1
+# Version:  4.0
 # Copyright (C) 1995-2001  Brian Paul
 
 # Makefile for core library
diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c
index f466107fdc..efc95ecd85 100644
--- a/src/mesa/main/get.c
+++ b/src/mesa/main/get.c
@@ -1,8 +1,8 @@
-/* $Id: get.c,v 1.68 2001/09/18 16:16:21 kschultz Exp $ */
+/* $Id: get.c,v 1.69 2001/09/23 16:11:26 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
- * Version:  3.5
+ * Version:  4.0
  *
  * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
  *
@@ -5310,8 +5310,8 @@ _mesa_GetString( GLenum name )
    GET_CURRENT_CONTEXT(ctx);
    static const char *vendor = "Brian Paul";
    static const char *renderer = "Mesa";
-   static const char *version_1_2 = "1.2 Mesa 3.5.1";
-   static const char *version_1_3 = "1.3 Mesa 3.5.1";
+   static const char *version_1_2 = "1.2 Mesa 4.0";
+   static const char *version_1_3 = "1.3 Mesa 4.0";
 
    ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, 0);