updates for 6.3.2 release, plus other assorted clean-ups
diff --git a/docs/RELNOTES-6.3.2 b/docs/RELNOTES-6.3.2
index f13f049..f2d47bf 100644
--- a/docs/RELNOTES-6.3.2
+++ b/docs/RELNOTES-6.3.2
@@ -1,10 +1,8 @@
- Mesa 6.3.2 release notes
+ Mesa 6.3.2 Release Notes
August 19, 2005
- PLEASE READ!!!!
-
Introduction
@@ -15,12 +13,13 @@
Even numbered versions (such as 6.2) designate stable releases.
-6.3.2 is primarily a bug fix release. See the VERSIONS file for detaisl.
+6.3.2 is primarily a bug-fix release. See the VERSIONS file for details.
Driver Status
----------------------- ---------------------
+---------------------- ----------------------
+DRI drivers varies with the driver
XMesa (Xlib) implements OpenGL 1.5
OSMesa (off-screen) implements OpenGL 1.5
Glide (3dfx Voodoo1/2) implements OpenGL 1.3
@@ -35,4 +34,4 @@
----------------------------------------------------------------------
-$Id: RELNOTES-6.3.2,v 3.1 2005/08/16 23:12:37 brianp Exp $
+$Id: RELNOTES-6.3.2,v 3.2 2005/08/19 16:57:50 brianp Exp $
diff --git a/docs/VERSIONS b/docs/VERSIONS
index d84222f..2b164ca 100644
--- a/docs/VERSIONS
+++ b/docs/VERSIONS
@@ -1371,3 +1371,4 @@
- the GL_PIXEL_MAP_I_TO_I table is now floating point, not integer
- wglGetProcAddress() didn't handle wgl-functions
- fixed glxext.h cross-compile issue (Colin Harrison)
+ - assorted DRI driver fixes
diff --git a/docs/contents.html b/docs/contents.html
index 6384227..c2ad6ff 100644
--- a/docs/contents.html
+++ b/docs/contents.html
@@ -38,7 +38,7 @@
<b>Download / Install</b>
<ul>
<li><a href="http://www.sourceforge.net/projects/mesa3d" target="_parent">Stable Release (6.2.1)</a>
-<li><a href="http://www.sourceforge.net/projects/mesa3d" target="_parent">Devel Release (6.3)</a>
+<li><a href="http://www.sourceforge.net/projects/mesa3d" target="_parent">Devel Release (6.3.2)</a>
<li><a href="download.html" target="MainFrame">Downloading/Unpacking</a>
<li><a href="install.html" target="MainFrame">Compilation/Installation</a>
<li><a href="glu.html" target="MainFrame">SGI's GLU</a>
@@ -82,6 +82,7 @@
<ul>
<li><a href="http://www.opengl.org" target="_parent">OpenGL website</a>
<li><a href="http://dri.sourceforge.net" target="_parent">DRI website</a>
+<li><a href="http://www.freedesktop.org" target="_parent">freedesktop.org</a>
<li><a href="games.html" target="MainFrame">Games and Entertainment</a>
<li><a href="libraries.html" target="MainFrame">Libraries and Toolkits</a>
<li><a href="modelers.html" target="MainFrame">Modeling and Rendering</a>
diff --git a/docs/glu.html b/docs/glu.html
index 108ea1c..8adaf42 100644
--- a/docs/glu.html
+++ b/docs/glu.html
@@ -24,7 +24,7 @@
</p>
<p>
-The new SI GLU library code is included in the Mesa package.
+The SI GLU library code is included in the Mesa distribution.
You don't have to download it separately.
</p>
diff --git a/docs/intro.html b/docs/intro.html
index b63d313..374d124 100644
--- a/docs/intro.html
+++ b/docs/intro.html
@@ -146,7 +146,8 @@
<p>
This is a summary of the major versions of Mesa. Note that Mesa's major
-version number tracks OpenGL's minor version number.
+version number tracks OpenGL's minor version number (+1).
+Work is underway to implement the OpenGL 2.0 specification.
</p>
@@ -162,10 +163,11 @@
</ul>
<p>
Also note that several OpenGL tokens were renamed in OpenGL 1.5
-for the sake of consistency. The old names will still be valid.
+for the sake of consistency.
+The old tokens are still available.
</p>
<pre>
-New Name Old Name
+New Token Old Token
------------------------------------------------------------
GL_FOG_COORD_SRC GL_FOG_COORDINATE_SOURCE
GL_FOG_COORD GL_FOG_COORDINATE
diff --git a/docs/license.html b/docs/license.html
index 3831425..b61fe44 100644
--- a/docs/license.html
+++ b/docs/license.html
@@ -13,17 +13,18 @@
and licenses apply to different components. For example, GLUT is copyrighted
by Mark Kilgard, some demo programs are copyrighted by SGI, some of the Mesa
device drivers are copyrighted by their authors. See below for a list of
-Mesa's components and the copyright/license for each.
+Mesa's main components and the license for each.
</p>
<p>
-The core Mesa library is licensed according to the terms of the XFree86
-copyright (an MIT-style license). This allows integration with the
-XFree86/DRI project. Unless otherwise stated, the Mesa source code and
-documentation is licensed as follows:
+The core Mesa library is licensed according to the terms of the MIT license.
+This allows integration with the XFree86, Xorg and DRI projects.
+</p>
+<p>
+The default Mesa license is as follows:
</p>
<pre>
-Copyright (C) 1999-2003 Brian Paul All Rights Reserved.
+Copyright (C) 1999-2005 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"),
@@ -47,70 +48,38 @@
<H1>Attention, Contributors</H1>
<p>
-When contributing to the Mesa project you must agree to relinquish your
-work to the holder of the copyright for the particular component you're
-contributing to. That is, you can't put your own copyright on the code,
-unless it's a modular piece that can be omitted from Mesa (like a new
-device driver). If for example, you contribute a bug fix to Mesa's
-texture mapping code, your code will become a part of the body of work
-which is copyrighted by Brian Paul and licensed by the above terms.
+When contributing to the Mesa project you must agree to the licensing terms
+of the component to which you're contributing.
+The following section lists the primary comonents of the Mesa distribution
+and their respective licenses.
</p>
+
+<H1>Mesa Component Licenses</H1>
+
<pre>
-Mesa Component Licenses:
-
-Component Files Primary Author License
+Component Location Primary Author License
----------------------------------------------------------------------------
-core Mesa code src/*.[ch] Brian Paul Mesa
- include/GL/gl.h
+Main Mesa code src/mesa/ Brian Paul Mesa (MIT)
-GLX driver src/X/* Brian Paul Mesa
- include/GL/glx.h
- include/GL/xmesa.h
+Device drivers src/mesa/drivers/* See drivers See drivers
-OS/Mesa driver src/OSmesa/* Brian Paul Mesa
- include/GL/osmesa.h
+Ext headers include/GL/glext.h SGI SGI Free B
+ include/GL/glxext.h
-3Dfx driver src/FX/* David Bucciarelli Mesa
- include/GL/fxmesa.h
+GLUT src/glut/ Mark Kilgard Mark's copyright
-BeOS R4 driver src/BeOS/* Brian Paul Mesa
+Mesa GLU library src/glu/mesa/ Brian Paul GNU-LGPL
-MGL driver src/MGL/* SciTech, Inc SciTech copyright
- include/GL/mglmesa.h
+SGI GLU library src/glu/sgi/ SGI SGI Free B
-Windows driver src/Windows/* Li Wei copyright by Li Wei
- include/GL/wmesa.h
+demo programs progs/demos/ various see source files
-SVGA driver src/SVGA/* Brian Paul GNU-LGPL
- include/GL/svgamesa.h
+X demos progs/xdemos/ Brian Paul see source files
-DOS driver src/DOS/* Charlie Wallace GNU-LGPL
- include/GL/dosmesa.h
+SGI demos progs/samples/ SGI SGI copyright
-GGI driver src/GGI/* Uwe Maurer GNU-LGPL
- include/GL/ggimesa.h
-
-S3 driver src/S3/* S3, Inc. S3 copyright
-
-GLUT src-glut/* Mark Kilgard Mark's copyright
- include/GL/*glut*.h
-
-GLU library src-glu/* Brian Paul GNU-LGPL
-
-SI GLU library si-glu/* SGI SGI Free B
- include/GL/glu.h
-
-Ext registry include/GL/glext.h SGI SGI Free B
- include/GL/glxext.h
-
-demo programs demos/* various see source files
-
-X demos xdemos/* Brian Paul see source files
-
-SGI demos samples/* SGI SGI copyright
-
-RedBook demos book/* SGI SGI copyright
+RedBook demos progs/redbook/ SGI SGI copyright
</pre>
</body>
diff --git a/docs/news.html b/docs/news.html
index b76fd80..31e85f5 100644
--- a/docs/news.html
+++ b/docs/news.html
@@ -11,6 +11,36 @@
<H1>News</H1>
+<h2>August 19, 2005</h2>
+<p>
+Mesa 6.3.2 has been released.
+Note: there was no public release of version 6.3.1.
+</p>
+<pre>
+ New:
+ - The distribution now includes the DRI drivers and GLX code
+ Changes:
+ - Made the DRI "new" driver interface standard, remove old code
+ Bug fixes:
+ - GL_ARB_vertex/fragment_shader were mistakenly listed in the
+ extensions string
+ - negative relative addressing in vertex programs was broken
+ - update/fix SPARC assembly code for vertex transformation
+ - fixed memory leak when freeing GLX drawables/renderbuffers
+ - fixed display list memory leak
+ - the GL_PIXEL_MAP_I_TO_I table is now floating point, not integer
+ - wglGetProcAddress() didn't handle wgl-functions
+ - fixed glxext.h cross-compile issue (Colin Harrison)
+ - assorted DRI driver fixes
+</pre>
+<p>
+The MD5 checksums are:
+</p>
+<pre>
+(tbd)
+</pre>
+
+
<h2>July 20, 2005</h2>
<p>
Mesa 6.3 has been released.
@@ -1016,6 +1046,6 @@
<hr>
-$Id: news.html,v 3.22 2005/07/20 18:20:45 brianp Exp $
+$Id: news.html,v 3.23 2005/08/19 16:57:50 brianp Exp $
</body>
</html>
diff --git a/docs/systems.html b/docs/systems.html
index 01d994e..3a6594f 100644
--- a/docs/systems.html
+++ b/docs/systems.html
@@ -14,98 +14,43 @@
X development environment to use Mesa.
</p>
-<p>Others have contributed drivers
-for the Amiga, Apple Macintosh, BeOS, NeXT, OS/2, MS-DOS, VMS, Windows
+<p>
+The DRI hardware drivers for the X.org server and XFree86 provide
+hardware accelerated rendering for chips from ATI, Intel, Matrox, 3dfx
+and others on Linux and FreeBSD.
+</p>
+
+<p>
+Drivers for other assorted platforms include:
+the Amiga, Apple Macintosh, BeOS, NeXT, OS/2, MS-DOS, VMS, Windows
9x/NT, and Direct3D.
</p>
<p>
-The following files describe the details for various platforms.
-Be warned, some of these files (and drivers) may be very out of date.
+Details about particular drivers follows.
+Be warned that some drivers may be out of date and no longer function.
</p>
<UL>
-<LI><A HREF="README.X11">README.X11</A> - X Window System / Unix / Linux
-<LI><A HREF="README.WIN32">README.WIN32</A> - Microsoft Windows
-<LI><A HREF="README.VMS">README.VMS</A> - DEC VMS
-<LI><A HREF="README.GGI">README.GGI</A> - GGI
-<LI><A HREF="README.3DFX">README.3DFX</A> - 3Dfx/Glide driver
-<LI><A HREF="README.AMIWIN">README.AMIWIN</A> - Amiga Amiwin
-<LI><A HREF="README.BEOS">README.BEOS</A> - BeOS
-<LI><A HREF="README.D3D">README.D3D</A> - Direct3D driver
-<LI><A HREF="README.DJ">README.DJ</A> - DJGPP
-<LI><A HREF="README.LYNXOS">README.LYNXOS</A> - LynxOS
-<LI><A HREF="README.MINGW32">README.MINGW32</A> - Mingw32
-<LI><A HREF="README.NeXT">README.NeXT</A> - NeXT
-<LI><A HREF="README.OpenStep">README.OpenStep</A> - OpenStep
-<LI><A HREF="README.OS2">README.OS2</A> - OS/2
-<LI><A HREF="README.WINDML">README.WINDML</A> - WindML
+<LI>Xlib driver for the X Window System <A HREF="README.X11">(README.X11)</A>
+<li><a href="http://dri.sourceforge.net/" target="_parent">
+DRI hardware drivers</a> for the X window system
+<LI>Microsoft Windows <A HREF="README.WIN32">(README.WIN32)</A>
+<LI>DEC VMS <A HREF="README.VMS">(README.VMS)</A>
+<LI>3dfx/Glide <A HREF="README.3DFX">(README.3DFX)</A>
+<LI>GGI <A HREF="README.GGI">(README.GGI)</A>
+<LI>Amiga Amiwin <A HREF="README.AMIWIN">(README.AMIWIN)</A>
+<LI>BeOS <A HREF="README.BEOS">(README.BEOS)</A>
+<LI>Direct3D driver <A HREF="README.D3D">(README.D3D)</A>
+<LI>DJGPP <A HREF="README.DJ">(README.DJ)</A>
+<LI>LynxOS <A HREF="README.LYNXOS">(README.LYNXOS)</A>
+<LI>Mingw32 <A HREF="README.MINGW32">(README.MINGW32)</A>
+<LI>NeXT <A HREF="README.NeXT">(README.NeXT)</A>
+<LI>OpenStep <A HREF="README.OpenStep">(README.OpenStep)</A>
+<LI>OS/2 <A HREF="README.OS2">(README.OS2)</A>
+<LI>WindML <A HREF="README.WINDML">(README.WINDML)</A>
+<LI><a href="http://utah-glx.sourceforge.net/" target="_parent">Utah GLX drivers</a>
</UL>
-
-<p>
-The standard Mesa distribution only supports software-based rendering, with
-the exception of the 3Dfx Glide driver.
-Information about other hardware support follows.
-</p>
-
-<ul>
-<li>DRI-based hardware support for 3dfx, Intel, Matrox, ATI with XFree86
-<blockquote>
- <p>The <a href="http://dri.sourceforge.net/" target="_parent">DRI architecture</a>,
- originally developed by Precision Insight, Inc. uses Mesa and
- provides hardware acceleration for a number of popular chipsets.<br>
- <br>
- The DRI is part of XFree86 4.0 and later.
- <br><br>
- If you download and install XFree86 4.x you do not need to
- install Mesa separately. All the important parts of Mesa
- will be installed with the rest of XFree86.
-</blockquote>
-
-
-<li>3dfx Voodoo1, Voodoo2, Voodoo Rush, Voodoo Banshee, Voodoo3
-<blockquote>
-<p>All cards based on these chipsets should work with Linux and
-Windows 95 via 3dfx's Glide library.
-The Mesa/Glide driver is included with the Mesa distribution.
-You'll need to install the Glide header files and runtime library.
-</p>
-<p>
-David Bucciarelli wrote the original 3dfx driver for Mesa.<br>
-Daryll Strauss ported Glide to Linux.
-</p>
-</blockquote>
-
-
-<li>Matrox G200/G400, nVidia RIVA, ATI Rage Pro, Intel i810 on Linux
-<blockquote>
-<p>The <a href="http://utah-glx.sourceforge.net/" target="_parent">
-Utah GLX project</a>
-(no longer active) developed drivers for these chipsets and others.
-</blockquote>
-
-<li>Amiga Warp3D
-<blockquote>
-<p>Amiga systems can support 3D hardware with the Warp3D API.
-See <a href="http://www.haage-partner.com/3dworld" target="_parent">here</a>.
-</blockquote>
-
-<li>Also see
-<blockquote>
-<p><a href="http://www.linux3d.org/" target="_parent">www.linux3d.org</a> for
-other 3D hardware info for Linux.
-</blockquote>
-
-</ul>
-
-<p>
-<b><em>Note:</em></b>
-If you have NVIDIA hardware in your computer,
-you should download and install NVIDIA's OpenGL library. You may
-however, want to download Mesa in order to use its GLU and GLUT
-libraries, or assorted demo programs.</p>
-
-
</body>
</html>
\ No newline at end of file