Merge head into branchvtx-0-2-24112003vtx-0-2-branch

6 files changed, 97 insertions, 16 deletions

diff --git a/docs/README.3DFX b/docs/README.3DFX
index 817faaa39a..ffa5468e37 100644
--- a/docs/README.3DFX
+++ b/docs/README.3DFX
@@ -3,6 +3,65 @@
 
 
 
+Mesa-5.1 release notes:
+-----------------------
+
+1) Glide2 support has been ceased; in order to keep Voodoo Graphics
+   and Voodoo Rush compatibility, please visit the Glide SourceForge
+   and help us to fix Glide3 for those cards.
+2) The current release is a WIP; among other things, the Linux build works
+   only to some extent. Any help will be appreciated.
+3) Glide3 can be found at http://sourceforge.net/projects/glide/
+
+
+
+Known supported HW/OS:
+----------------------
+
+Voodoo^2, Voodoo Banshee, Voodoo3, Voodoo4, Voodoo5
+DOS (DJGPP), Windows9x/2k (MinGW/MSVC), Linux
+
+
+
+How to compile:
+---------------
+
+DJGPP/MinGW/MSVC:
+   Place the Glide3 SDK in the top Mesa directory:
+	$(MESA)/glide3/include/*.h
+	$(MESA)/glide3/lib/
+   Required headers:
+	3dfx.h, g3ext.h, glide.h, glidesys.h, glideutl.h, sst1vid.h
+   Required libraries:
+	OS specific
+   Type:
+	make -f Makefile.DJ HAVE_MMX=1 HAVE_3DNOW=1 FX=1
+	or
+	make -f Makefile.mgw HAVE_MMX=1 HAVE_3DNOW=1 FX=1
+	or
+	nmake -f Makefile.wfx
+   Look into the corresponding makefiles for further information.
+
+Linux:
+   Place the Glide3 SDK in /usr/local/glide
+   Type:
+	make linux-glide
+
+
+
+Contact:
+--------
+
+Daniel Borca <dborca@users.sourceforge.net>
+Hiroshi Morii <koolsmoky@users.sourceforge.net>
+
+
+
+The info below this line is outdated. You have been warned...
+*************************************************************
+
+
+
 Info for Mesa 4.1
 -----------------
 
diff --git a/docs/README.DJ b/docs/README.DJ
index da174f4acb..722218cfda 100644
--- a/docs/README.DJ
+++ b/docs/README.DJ
@@ -209,11 +209,12 @@ v1.3 (mar-2003)
 	* revamped GLUT
 	* switched to DXE3
 
-v1.4 (oct-2003)
+v1.4 (nov-2003)
 	+ enabled GLUT fonts with DXE
 	+ truly added multi-window support in GLUT (for Adrian Woodward)
 	* accomodated makefiles with the new sourcetree
 	* fixed some ALPHA issues
+	* minor changes to PC_HW/timer interface
 	x hacked and slashed the 3dfx driver (w/ help from Hiroshi Morii)
 
 
diff --git a/docs/README.WIN32 b/docs/README.WIN32
index fe9a67f6cd..8802d8748d 100644
--- a/docs/README.WIN32
+++ b/docs/README.WIN32
@@ -75,6 +75,12 @@ Details and Notes
 - No assembly code is compiled or assembled.  Again, this may need
   some work to turn it back on or use it again.
 
+- To build "mangled" Mesa, add the preprocessor define USE_MGL_NAMESPACE
+  to the project settings.  You will also need to edit src/mesa.def to change
+  all the gl* symbols to mgl*.  Because this is easy to do with a global
+  replace operation in a text editor, no additional mangled version of mesa.def
+  is maintained or shipped.
+
 If you have a Windows-related build problem or question, it is
 probably better to direct it to me (kschultz@users.sourceforge.net),
 rather than directly to the other Mesa developers.  I will help you
diff --git a/docs/VERSIONS b/docs/VERSIONS
index 14652bf684..5de3d2bdbb 100644
--- a/docs/VERSIONS
+++ b/docs/VERSIONS
@@ -1164,10 +1164,17 @@ Mesa Version History
 	- less memory used for display lists and vertex buffers
 	- demo of per-pixel lighting with a fragment program (demos/fplight.c)
 	- new version (18) of glext.h header
+	- new spriteblast.c demo of GL_ARB_point_sprite
     Bug fixes:
 	- really enable OpenGL 1.4 features in DOS driver.
 	- fixed issues in glDrawPixels and glCopyPixels for very wide images
 	- glPixelMapf/ui/usv()'s size parameter is GLsizei, not GLint
+	- fixed some texgen bugs reported by Daniel Borca
+	- fixed wglMakeCurrent(NULL, NULL) bug (#835861)
+	- fixed glTexSubImage3D z-offset bug (Cedric Gautier)
+	- fixed RGBA blend enable bug (Ville Syrjala)
+	- glAccum is supposed to be a no-op in selection/feedback mode
+	- fixed texgen bug #597589 (John Popplewell)
     Changes:
 	- dropped API trace feature (src/Trace/)
 	- documentation overhaul.  merged with website content.  more html.
diff --git a/docs/cvs_anonymous.html b/docs/cvs_anonymous.html
index 19cac14384..e1f8952084 100644
--- a/docs/cvs_anonymous.html
+++ b/docs/cvs_anonymous.html
@@ -17,7 +17,7 @@ available. Here are the basic instructions for Unix systems:
 	login</code>
 	</li><li>Just hit return at the <code>CVS password:</code> prompt.
 	</li><li>Then checkout mesa: <code>cvs -z3 -d:pserver:anonymous@cvs.mesa3d.sourceforge.net:/cvsroot/mesa3d
-	co Mesa</code>
+	co Mesa-newtree</code>
 </li></ol>
 
 <p>To update your Mesa CVS source to the latest CVS source:
@@ -34,4 +34,4 @@ available. Here are the basic instructions for Unix systems:
 </p>
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/docs/news.html b/docs/news.html
index 04eba57b16..fadac39a36 100644
--- a/docs/news.html
+++ b/docs/news.html
@@ -7,6 +7,26 @@
 <H1>News</H1>
 
 
+<H2>November 12, 2003</H2>
+
+<p>
+New Mesa 5.0.2 tarballs have been uploaded to SourceForge which fix a
+number of automake/libtool problems.
+</p>
+<p>
+The new MD5 checksums are:
+</p>
+<pre>
+a9dcf3ff9ad1b7d6ce73a0df7cff8b5b  MesaLib-5.0.2.tar.gz
+7b4bf9261657c2fca03796d4955e6f50  MesaLib-5.0.2.tar.bz2
+79c141bddcbad557647535d02194f346  MesaLib-5.0.2.zip
+952d9dc823dd818981d1a648d7b2668a  MesaDemos-5.0.2.tar.gz
+b81fafff90995025d2f25ea02b786642  MesaDemos-5.0.2.tar.bz2
+a21be975589e8a2d1871b6bb7874fffa  MesaDemos-5.0.2.zip
+</pre>
+
+
+
 <h2>September 5, 2003</h2>
 
 <p>
@@ -39,18 +59,6 @@ Mesa 5.0.2 has been released.  This is a stable, bug-fix release.
     Changes:
 	- build GLUT with -fexceptions so C++ apps propogate exceptions
 </pre>
-<p>
-MD5 checksums follow:
-</p>
-<pre>
-2deb4176e7a06a0477ae31cadd55444b  MesaLib-5.0.2.tar.gz
-dc147598ebdff4312260a7f79b3c5c9c  MesaLib-5.0.2.tar.bz2
-1eb0fa7079131efef574e3bda328b8c8  MesaLib-5.0.2.zip
-e0dc86e9417620e794968641403604d4  MesaDemos-5.0.2.tar.gz
-a71afaeddd0b567423f88085576850d3  MesaDemos-5.0.2.tar.bz2
-32fbf1925cf45f548468ddda96087828  MesaDemos-5.0.2.zip
-</pre>
-
 
 
 
@@ -673,6 +681,6 @@ source code</a>.</p>
 
 
 <hr>
-$Id: news.html,v 3.7 2003/09/05 13:39:39 brianp Exp $
+$Id: news.html,v 3.7.2.1 2003/11/24 12:01:42 keithw Exp $
 </body>
 </html>
\ No newline at end of file