bring in Mesa 5.0.1 and recent bug fixes, remove Id strings

author: brianp <brianp> 2003-04-03 21:25:08 +0000
committer: brianp <brianp> 2003-04-03 21:25:08 +0000
commit: ca475f853649e01df9410d4d0662323476fff024 (patch)
tree: 1c168c94a336895e30872885739ad601173d1e4c /xc/extras/Mesa
parent: b6669829303d04c1aa866e77a65d068e7584895b (diff)
290 files changed, 180 insertions, 384 deletions
diff --git a/xc/extras/Mesa/docs/VERSIONS b/xc/extras/Mesa/docs/VERSIONS
index b5626cc8d..8ab9c9a2f 100644
--- a/xc/extras/Mesa/docs/VERSIONS
+++ b/xc/extras/Mesa/docs/VERSIONS
@@ -1,5 +1,4 @@
 
-
 Mesa Version History
 ====================
 
@@ -1081,15 +1080,53 @@ Mesa Version History
 	- fixed color overflow problem in DOT3 texture env mode
 
 
-5.1  Month day, 2003
+5.0.1  March 30, 2003
+    New:
+	- DOS driver updates from Daniel Borca
+	- updated GL/gl_mangle.h file (Bill Hoffman)
+    Bug fixes:
+	- auto mipmap generation for cube maps was broken (bug 641363)
+	- writing/clearing software alpha channels was unreliable
+	- minor compilation fixes for OS/2 (Evgeny Kotsuba)
+	- fixed some bad assertions found with shadowtex demo
+	- fixed error checking bug in glCopyTexSubImage2D (bug 659020)
+	- glRotate(angle, -x, 0, 0) was incorrect (bug 659677)
+	- fixed potential segfault in texture object validation (bug 659012)
+	- fixed some bogus code in _mesa_test_os_sse_exception_support (Linus)
+	- fix fog stride bug in tnl code for h/w drivers (Michel Danzer)
+	- fixed glActiveTexture / glMatrixMode(GL_TEXTURE) bug (#669080)
+	- glGet(GL_CURRENT_SECONDARY_COLOR) should return 4 values, not 3
+	- fixed compilation problem on Solaris7/x86 (bug 536406)
+	- fixed prefetch bug in 3DNow! code (Felix Kuhling)
+	- fixed NeXT build problem (FABSF macro)
+	- glDrawPixels Z values when glPixelZoom!=1 were invalid (bug 687811)
+	- zoomed glDraw/CopyPixels with clipping sometimes failed (bug 689964)
+	- AA line and triangle Z values are now rounded, not truncated
+	- fixed color interpolation bug when GLchan==GLfloat (bug 694461)
+	- glArePrograms/TexturesResident() wasn't 100% correct (Jose Fonseca)
+	- fixed a minor GL_COLOR_MATERIAL bug
+	- NV vertex program EXP instruction was broken
+	- glColorMask misbehaved with X window / pixmap rendering
+	- fix autoconf/libtool GLU C++ linker problem on Linux (a total hack)
+	- attempt to fix GGI compilation problem when MesaDemos not present
+	- NV vertex program ARL-relative fetches didn't work
+    Changes:
+	- use glPolygonOffset in gloss demo to avoid z-fighting artifacts
+	- updated winpos and pointblast demos to use ARB extensions
+	- disable SPARC normal transformation code (bug 673938)
+	- GLU fixes for OS/2 (Evgeny Kotsuba)
+
+
+5.0.2  Month day, 2003
     New:
-	- GL_ATI_texture_env_combine3 extension (Ian Romanick)
-	- GL_SGI_texture_color_table extension (Eric Plante)
-	- new X86 feature detection code (Petr Sebor)
     Bug fixes:
-	- really enable OpenGL 1.4 features in DOS driver.
-	- glAreProgramsResidentNV was slightly incorrect
-	- fixed issues in glDrawPixels and glCopyPixels for very wide images
+	- fixed texgen problem causing texcoord's Q to be zero (stex3d)
+	- default GL_TEXTURE_COMPARE_MODE_ARB was wrong
+	- GL_CURRENT_MATRIX_NV query was wrong
+	- GL_CURRENT_MATRIX_STACK_DEPTH_NV query was off by one
+	- GL_LIST_MODE query wasn't correct
+	- GL_FOG_COORDINATE_SOURCE_EXT query wasn't supported
+	- GL_SECONDARY_COLOR_ARRAY_SIZE_EXT query returned wrong value
+	- blended, wide lines didn't always work correctly (bug 711595)
     Changes:
-	- dropped API trace feature (src/Trace/)
 
diff --git a/xc/extras/Mesa/include/GL/gl.h b/xc/extras/Mesa/include/GL/gl.h
index 881b60b91..93398c252 100644
--- a/xc/extras/Mesa/include/GL/gl.h
+++ b/xc/extras/Mesa/include/GL/gl.h
@@ -1,5 +1,3 @@
-/* $Id: gl.h,v 1.30 2003/03/25 18:41:30 alanh Exp $ */
-
 /*
  * Mesa 3-D graphics library
  * Version:  5.0.1
diff --git a/xc/extras/Mesa/include/GL/osmesa.h b/xc/extras/Mesa/include/GL/osmesa.h
index e70f2ef36..cf892b91c 100644
--- a/xc/extras/Mesa/include/GL/osmesa.h
+++ b/xc/extras/Mesa/include/GL/osmesa.h
@@ -1,5 +1,3 @@
-/* $Id: osmesa.h,v 1.13 2003/03/25 18:41:42 alanh Exp $ */
-
 /*
  * Mesa 3-D graphics library
  * Version:  4.1
diff --git a/xc/extras/Mesa/include/GL/xmesa.h b/xc/extras/Mesa/include/GL/xmesa.h
index 5ed7a9946..2b7f36754 100644
--- a/xc/extras/Mesa/include/GL/xmesa.h
+++ b/xc/extras/Mesa/include/GL/xmesa.h
@@ -1,5 +1,3 @@
-/* $Id: xmesa.h,v 1.15 2003/03/25 18:41:43 alanh Exp $ */
-
 /*
  * Mesa 3-D graphics library
  * Version:  4.1
diff --git a/xc/extras/Mesa/include/GL/xmesa_x.h b/xc/extras/Mesa/include/GL/xmesa_x.h
index c4773535f..4ea362fef 100644
--- a/xc/extras/Mesa/include/GL/xmesa_x.h
+++ b/xc/extras/Mesa/include/GL/xmesa_x.h
@@ -30,7 +30,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  * Authors:
  *   Kevin E. Martin <kevin@precisioninsight.com>
  *
- * $Header: /home/ajax/dri-backup/xc/xc/extras/Mesa/include/GL/Attic/xmesa_x.h,v 1.10 2003/03/25 18:41:43 alanh Exp $
+ * $Header: /home/ajax/dri-backup/xc/xc/extras/Mesa/include/GL/Attic/xmesa_x.h,v 1.11 2003/04/03 21:25:15 brianp Exp $
  */
 
 #ifndef _XMESA_X_H_
diff --git a/xc/extras/Mesa/include/GL/xmesa_xf86.h b/xc/extras/Mesa/include/GL/xmesa_xf86.h
index fd4b336d9..8a8884e68 100644
--- a/xc/extras/Mesa/include/GL/xmesa_xf86.h
+++ b/xc/extras/Mesa/include/GL/xmesa_xf86.h
@@ -30,7 +30,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  * Authors:
  *   Kevin E. Martin <kevin@precisioninsight.com>
  *
- * $Header: /home/ajax/dri-backup/xc/xc/extras/Mesa/include/GL/Attic/xmesa_xf86.h,v 1.11 2003/03/25 18:41:43 alanh Exp $
+ * $Header: /home/ajax/dri-backup/xc/xc/extras/Mesa/include/GL/Attic/xmesa_xf86.h,v 1.12 2003/04/03 21:25:15 brianp Exp $
  */
 
 #ifndef _XMESA_XF86_H_
diff --git a/xc/extras/Mesa/src/OSmesa/osmesa.c b/xc/extras/Mesa/src/OSmesa/osmesa.c
index 7a964501e..02303cd73 100644
--- a/xc/extras/Mesa/src/OSmesa/osmesa.c
+++ b/xc/extras/Mesa/src/OSmesa/osmesa.c
@@ -1,4 +1,3 @@
-/* $Id: osmesa.c,v 1.22 2003/03/25 18:43:55 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/X/fakeglx.c b/xc/extras/Mesa/src/X/fakeglx.c
index af2095063..78907bff5 100644
--- a/xc/extras/Mesa/src/X/fakeglx.c
+++ b/xc/extras/Mesa/src/X/fakeglx.c
@@ -1,10 +1,9 @@
-/* $Id: fakeglx.c,v 1.26 2003/03/25 18:44:02 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
- * Version:  5.0
+ * Version:  5.0.1
  *
- * Copyright (C) 1999-2002  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2003  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"),
@@ -66,7 +65,7 @@
 #define SERVER_MINOR_VERSION 4
 
 /* This is appended onto the glXGetClient/ServerString version strings. */
-#define MESA_GLX_VERSION "Mesa 5.0"
+#define MESA_GLX_VERSION "Mesa 5.0.1"
 
 /* Who implemented this GLX? */
 #define VENDOR "Brian Paul"
diff --git a/xc/extras/Mesa/src/X/glxapi.c b/xc/extras/Mesa/src/X/glxapi.c
index 93a211770..0ef19ff06 100644
--- a/xc/extras/Mesa/src/X/glxapi.c
+++ b/xc/extras/Mesa/src/X/glxapi.c
@@ -1,4 +1,3 @@
-/* $Id: glxapi.c,v 1.15 2003/03/25 18:44:06 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/X/glxapi.h b/xc/extras/Mesa/src/X/glxapi.h
index e27b53fc1..5c61334d1 100644
--- a/xc/extras/Mesa/src/X/glxapi.h
+++ b/xc/extras/Mesa/src/X/glxapi.h
@@ -1,4 +1,3 @@
-/* $Id: glxapi.h,v 1.16 2003/03/25 18:44:10 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/X/glxheader.h b/xc/extras/Mesa/src/X/glxheader.h
index 72fabef40..b58340038 100644
--- a/xc/extras/Mesa/src/X/glxheader.h
+++ b/xc/extras/Mesa/src/X/glxheader.h
@@ -1,4 +1,3 @@
-/* $Id: glxheader.h,v 1.11 2003/03/25 18:44:10 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/X/realglx.c b/xc/extras/Mesa/src/X/realglx.c
index 93c3b4581..a7783f508 100644
--- a/xc/extras/Mesa/src/X/realglx.c
+++ b/xc/extras/Mesa/src/X/realglx.c
@@ -1,4 +1,3 @@
-/* $Id: realglx.c,v 1.13 2003/03/25 18:44:10 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/X/realglx.h b/xc/extras/Mesa/src/X/realglx.h
index 9697a7539..150129db6 100644
--- a/xc/extras/Mesa/src/X/realglx.h
+++ b/xc/extras/Mesa/src/X/realglx.h
@@ -1,4 +1,3 @@
-/* $Id: realglx.h,v 1.12 2003/03/25 18:44:11 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/X/xfonts.c b/xc/extras/Mesa/src/X/xfonts.c
index b9a1547ad..8e256e097 100644
--- a/xc/extras/Mesa/src/X/xfonts.c
+++ b/xc/extras/Mesa/src/X/xfonts.c
@@ -1,4 +1,3 @@
-/* $Id: xfonts.c,v 1.15 2003/03/25 18:44:11 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/X/xfonts.h b/xc/extras/Mesa/src/X/xfonts.h
index 425f9563c..e36f42f81 100644
--- a/xc/extras/Mesa/src/X/xfonts.h
+++ b/xc/extras/Mesa/src/X/xfonts.h
@@ -1,4 +1,3 @@
-/* $Id: xfonts.h,v 1.6 2003/03/25 18:44:11 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/X/xm_api.c b/xc/extras/Mesa/src/X/xm_api.c
index 067210258..f7c4dd282 100644
--- a/xc/extras/Mesa/src/X/xm_api.c
+++ b/xc/extras/Mesa/src/X/xm_api.c
@@ -1,5 +1,3 @@
-/* $Id: xm_api.c,v 1.12 2003/03/25 18:44:11 alanh Exp $ */
-
 /*
  * Mesa 3-D graphics library
  * Version:  5.0.1
@@ -23,7 +21,6 @@
  * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-/* $XFree86: xc/extras/Mesa/src/X/xm_api.c,v 1.2 2002/02/26 23:37:31 tsi Exp $ */
 
 /*
  * This file contains the implementations of all the XMesa* functions.
@@ -2487,7 +2484,7 @@ const char *XMesaGetString( XMesaContext c, int name )
 {
    (void) c;
    if (name==XMESA_VERSION) {
-      return "5.0";
+      return "5.0.1";
    }
    else if (name==XMESA_EXTENSIONS) {
       return "";
diff --git a/xc/extras/Mesa/src/X/xm_dd.c b/xc/extras/Mesa/src/X/xm_dd.c
index 8a6e47659..bdf906aea 100644
--- a/xc/extras/Mesa/src/X/xm_dd.c
+++ b/xc/extras/Mesa/src/X/xm_dd.c
@@ -1,10 +1,9 @@
-/* $Id: xm_dd.c,v 1.13 2003/03/25 18:44:13 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
- * Version:  4.0.3
+ * Version:  5.0.1
  *
- * Copyright (C) 1999-2002  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2003  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"),
@@ -23,7 +22,7 @@
  * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-/* $XFree86: xc/extras/Mesa/src/X/xm_dd.c,v 1.2 2002/02/26 23:37:31 tsi Exp $ */
+
 
 #include "glxheader.h"
 #include "context.h"
@@ -244,6 +243,7 @@ color_mask(GLcontext *ctx,
          if (bmask)   m |= GET_BLUEMASK(xmesa->xm_visual);
       }
       XMesaSetPlaneMask( xmesa->display, xmesa->xm_draw_buffer->cleargc, m );
+      XMesaSetPlaneMask( xmesa->display, xmesa->xm_draw_buffer->gc, m );
    }
 }
 
diff --git a/xc/extras/Mesa/src/X/xm_line.c b/xc/extras/Mesa/src/X/xm_line.c
index 0c5627a2f..1c330c82e 100644
--- a/xc/extras/Mesa/src/X/xm_line.c
+++ b/xc/extras/Mesa/src/X/xm_line.c
@@ -1,4 +1,3 @@
-/* $Id: xm_line.c,v 1.9 2003/03/25 18:44:14 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/X/xm_span.c b/xc/extras/Mesa/src/X/xm_span.c
index 6da46f6b5..bb2ca7f1a 100644
--- a/xc/extras/Mesa/src/X/xm_span.c
+++ b/xc/extras/Mesa/src/X/xm_span.c
@@ -1,5 +1,3 @@
-/* $Id: xm_span.c,v 1.7 2003/03/25 18:44:14 alanh Exp $ */
-
 /*
  * Mesa 3-D graphics library
  * Version:  3.5
@@ -23,7 +21,6 @@
  * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-/* $XFree86: xc/extras/Mesa/src/X/xm_span.c,v 1.3 2002/02/27 21:07:54 tsi Exp $ */
 
 #include "glxheader.h"
 #include "colormac.h"
diff --git a/xc/extras/Mesa/src/X/xm_tri.c b/xc/extras/Mesa/src/X/xm_tri.c
index 13c896398..5e138f03d 100644
--- a/xc/extras/Mesa/src/X/xm_tri.c
+++ b/xc/extras/Mesa/src/X/xm_tri.c
@@ -1,4 +1,3 @@
-/* $Id: xm_tri.c,v 1.9 2003/03/25 18:44:15 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/X/xmesaP.h b/xc/extras/Mesa/src/X/xmesaP.h
index 46135238a..89aeae1dc 100644
--- a/xc/extras/Mesa/src/X/xmesaP.h
+++ b/xc/extras/Mesa/src/X/xmesaP.h
@@ -1,4 +1,3 @@
-/* $Id: xmesaP.h,v 1.21 2003/03/25 18:44:16 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/X86/3dnow.c b/xc/extras/Mesa/src/X86/3dnow.c
index 46476416e..d50c428b2 100644
--- a/xc/extras/Mesa/src/X86/3dnow.c
+++ b/xc/extras/Mesa/src/X86/3dnow.c
@@ -1,10 +1,9 @@
-/* $Id: 3dnow.c,v 1.15 2003/03/25 18:44:18 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
- * Version:  4.1
+ * Version:  5.0.1
  *
- * Copyright (C) 1999-2002  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2003  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"),
@@ -79,7 +78,10 @@ void _mesa_init_3dnow_transform_asm( void )
    ASSIGN_XFORM_GROUP( 3dnow, 3 );
    ASSIGN_XFORM_GROUP( 3dnow, 4 );
 
+   /* There's a bug somewhere in the 3dnow_normal.S file that causes
+    * bad shading.  Disable for now.
    ASSIGN_NORM_GROUP( 3dnow );
+   */
 
 #ifdef DEBUG
    _math_test_all_transform_functions( "3DNow!" );
diff --git a/xc/extras/Mesa/src/X86/3dnow.h b/xc/extras/Mesa/src/X86/3dnow.h
index 698988d80..df9f2638d 100644
--- a/xc/extras/Mesa/src/X86/3dnow.h
+++ b/xc/extras/Mesa/src/X86/3dnow.h
@@ -1,4 +1,3 @@
-/* $Id: 3dnow.h,v 1.12 2003/03/25 18:44:19 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/X86/3dnow_normal.S b/xc/extras/Mesa/src/X86/3dnow_normal.S
index a191ae601..eec9be3ee 100644
--- a/xc/extras/Mesa/src/X86/3dnow_normal.S
+++ b/xc/extras/Mesa/src/X86/3dnow_normal.S
@@ -1,4 +1,3 @@
-/* $Id: 3dnow_normal.S,v 1.9 2003/03/25 18:44:19 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/X86/3dnow_xform1.S b/xc/extras/Mesa/src/X86/3dnow_xform1.S
index 6a4cc4d59..1713dd076 100644
--- a/xc/extras/Mesa/src/X86/3dnow_xform1.S
+++ b/xc/extras/Mesa/src/X86/3dnow_xform1.S
@@ -1,4 +1,3 @@
-/* $Id: 3dnow_xform1.S,v 1.6 2003/03/25 18:44:20 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/X86/3dnow_xform2.S b/xc/extras/Mesa/src/X86/3dnow_xform2.S
index 4fa327d41..4627935dc 100644
--- a/xc/extras/Mesa/src/X86/3dnow_xform2.S
+++ b/xc/extras/Mesa/src/X86/3dnow_xform2.S
@@ -1,4 +1,3 @@
-/* $Id: 3dnow_xform2.S,v 1.6 2003/03/25 18:44:20 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/X86/3dnow_xform3.S b/xc/extras/Mesa/src/X86/3dnow_xform3.S
index 64f7d16aa..ac6153c36 100644
--- a/xc/extras/Mesa/src/X86/3dnow_xform3.S
+++ b/xc/extras/Mesa/src/X86/3dnow_xform3.S
@@ -1,4 +1,3 @@
-/* $Id: 3dnow_xform3.S,v 1.6 2003/03/25 18:44:21 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/X86/3dnow_xform4.S b/xc/extras/Mesa/src/X86/3dnow_xform4.S
index e1ba347b0..32d481f8e 100644
--- a/xc/extras/Mesa/src/X86/3dnow_xform4.S
+++ b/xc/extras/Mesa/src/X86/3dnow_xform4.S
@@ -1,4 +1,3 @@
-/* $Id: 3dnow_xform4.S,v 1.6 2003/03/25 18:44:21 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/X86/assyntax.h b/xc/extras/Mesa/src/X86/assyntax.h
index 5ada669f1..0230d8d0d 100644
--- a/xc/extras/Mesa/src/X86/assyntax.h
+++ b/xc/extras/Mesa/src/X86/assyntax.h
@@ -1,4 +1,3 @@
-/* $Id: assyntax.h,v 1.17 2003/03/25 18:44:22 alanh Exp $ */
 
 #ifndef __ASSYNTAX_H__
 #define __ASSYNTAX_H__
diff --git a/xc/extras/Mesa/src/X86/clip_args.h b/xc/extras/Mesa/src/X86/clip_args.h
index 6ce6fabcd..796611fbf 100644
--- a/xc/extras/Mesa/src/X86/clip_args.h
+++ b/xc/extras/Mesa/src/X86/clip_args.h
@@ -1,4 +1,3 @@
-/* $Id: clip_args.h,v 1.8 2003/03/25 18:44:22 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/X86/common_x86.c b/xc/extras/Mesa/src/X86/common_x86.c
index 0a35c1b47..d4e4894aa 100644
--- a/xc/extras/Mesa/src/X86/common_x86.c
+++ b/xc/extras/Mesa/src/X86/common_x86.c
@@ -1,4 +1,3 @@
-/* $Id: common_x86.c,v 1.19 2003/03/25 18:44:23 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/X86/common_x86_asm.S b/xc/extras/Mesa/src/X86/common_x86_asm.S
index 8db795dbb..d068564f2 100644
--- a/xc/extras/Mesa/src/X86/common_x86_asm.S
+++ b/xc/extras/Mesa/src/X86/common_x86_asm.S
@@ -1,4 +1,3 @@
-/* $Id: common_x86_asm.S,v 1.22 2003/03/25 18:44:23 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/X86/common_x86_asm.h b/xc/extras/Mesa/src/X86/common_x86_asm.h
index 74dc7efbe..46d1a4b07 100644
--- a/xc/extras/Mesa/src/X86/common_x86_asm.h
+++ b/xc/extras/Mesa/src/X86/common_x86_asm.h
@@ -1,4 +1,3 @@
-/* $Id: common_x86_asm.h,v 1.9 2003/03/25 18:44:23 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/X86/common_x86_features.h b/xc/extras/Mesa/src/X86/common_x86_features.h
index e864b8cb4..fb7fb38c5 100644
--- a/xc/extras/Mesa/src/X86/common_x86_features.h
+++ b/xc/extras/Mesa/src/X86/common_x86_features.h
@@ -1,4 +1,3 @@
-/* $Id: common_x86_features.h,v 1.9 2003/03/25 18:44:23 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/X86/common_x86_macros.h b/xc/extras/Mesa/src/X86/common_x86_macros.h
index f13e81756..462f32b3f 100644
--- a/xc/extras/Mesa/src/X86/common_x86_macros.h
+++ b/xc/extras/Mesa/src/X86/common_x86_macros.h
@@ -1,4 +1,3 @@
-/* $Id: common_x86_macros.h,v 1.7 2003/03/25 18:44:23 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/X86/gen_matypes.c b/xc/extras/Mesa/src/X86/gen_matypes.c
index 58e6e81d6..8682f33c8 100644
--- a/xc/extras/Mesa/src/X86/gen_matypes.c
+++ b/xc/extras/Mesa/src/X86/gen_matypes.c
@@ -1,4 +1,3 @@
-/* $Id: gen_matypes.c,v 1.7 2003/03/25 18:44:24 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/X86/mmx.h b/xc/extras/Mesa/src/X86/mmx.h
index e814302fc..068d96237 100644
--- a/xc/extras/Mesa/src/X86/mmx.h
+++ b/xc/extras/Mesa/src/X86/mmx.h
@@ -1,4 +1,3 @@
-/* $Id: mmx.h,v 1.11 2003/03/25 18:44:24 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/X86/norm_args.h b/xc/extras/Mesa/src/X86/norm_args.h
index 453ed9928..596061c17 100644
--- a/xc/extras/Mesa/src/X86/norm_args.h
+++ b/xc/extras/Mesa/src/X86/norm_args.h
@@ -1,4 +1,3 @@
-/* $Id: norm_args.h,v 1.7 2003/03/25 18:44:24 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/X86/sse.c b/xc/extras/Mesa/src/X86/sse.c
index ed8f99004..ea3496924 100644
--- a/xc/extras/Mesa/src/X86/sse.c
+++ b/xc/extras/Mesa/src/X86/sse.c
@@ -1,4 +1,3 @@
-/* $Id: sse.c,v 1.7 2003/03/25 18:44:25 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/X86/sse.h b/xc/extras/Mesa/src/X86/sse.h
index 337a53a08..521f91e41 100644
--- a/xc/extras/Mesa/src/X86/sse.h
+++ b/xc/extras/Mesa/src/X86/sse.h
@@ -1,4 +1,3 @@
-/* $Id: sse.h,v 1.7 2003/03/25 18:44:25 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/X86/sse_normal.S b/xc/extras/Mesa/src/X86/sse_normal.S
index 22a09b7b7..c9088c4cc 100644
--- a/xc/extras/Mesa/src/X86/sse_normal.S
+++ b/xc/extras/Mesa/src/X86/sse_normal.S
@@ -1,4 +1,3 @@
-/* $Id: sse_normal.S,v 1.7 2003/03/25 18:44:25 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/X86/sse_xform1.S b/xc/extras/Mesa/src/X86/sse_xform1.S
index 8def5fcf7..41dd39d50 100644
--- a/xc/extras/Mesa/src/X86/sse_xform1.S
+++ b/xc/extras/Mesa/src/X86/sse_xform1.S
@@ -1,4 +1,3 @@
-/* $Id: sse_xform1.S,v 1.6 2003/03/25 18:44:25 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/X86/sse_xform2.S b/xc/extras/Mesa/src/X86/sse_xform2.S
index 0959b3a61..025af4c50 100644
--- a/xc/extras/Mesa/src/X86/sse_xform2.S
+++ b/xc/extras/Mesa/src/X86/sse_xform2.S
@@ -1,4 +1,3 @@
-/* $Id: sse_xform2.S,v 1.6 2003/03/25 18:44:26 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/X86/sse_xform3.S b/xc/extras/Mesa/src/X86/sse_xform3.S
index fd3092e48..8518b9c5f 100644
--- a/xc/extras/Mesa/src/X86/sse_xform3.S
+++ b/xc/extras/Mesa/src/X86/sse_xform3.S
@@ -1,4 +1,3 @@
-/* $Id: sse_xform3.S,v 1.6 2003/03/25 18:44:27 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/X86/sse_xform4.S b/xc/extras/Mesa/src/X86/sse_xform4.S
index c27522677..5335939a1 100644
--- a/xc/extras/Mesa/src/X86/sse_xform4.S
+++ b/xc/extras/Mesa/src/X86/sse_xform4.S
@@ -1,4 +1,3 @@
-/* $Id: sse_xform4.S,v 1.6 2003/03/25 18:44:27 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/X86/x86.c b/xc/extras/Mesa/src/X86/x86.c
index 4824edf42..3835bbbd7 100644
--- a/xc/extras/Mesa/src/X86/x86.c
+++ b/xc/extras/Mesa/src/X86/x86.c
@@ -1,4 +1,3 @@
-/* $Id: x86.c,v 1.15 2003/03/25 18:44:27 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/X86/x86.h b/xc/extras/Mesa/src/X86/x86.h
index 4b155ede2..97651ec6e 100644
--- a/xc/extras/Mesa/src/X86/x86.h
+++ b/xc/extras/Mesa/src/X86/x86.h
@@ -1,4 +1,3 @@
-/* $Id: x86.h,v 1.11 2003/03/25 18:44:28 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/X86/x86_cliptest.S b/xc/extras/Mesa/src/X86/x86_cliptest.S
index 50b04dae1..8d6a5fe2c 100644
--- a/xc/extras/Mesa/src/X86/x86_cliptest.S
+++ b/xc/extras/Mesa/src/X86/x86_cliptest.S
@@ -1,4 +1,3 @@
-/* $Id: x86_cliptest.S,v 1.9 2003/03/25 18:44:28 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/X86/x86_xform2.S b/xc/extras/Mesa/src/X86/x86_xform2.S
index f2bdfaec7..108e27e1b 100644
--- a/xc/extras/Mesa/src/X86/x86_xform2.S
+++ b/xc/extras/Mesa/src/X86/x86_xform2.S
@@ -1,4 +1,3 @@
-/* $Id: x86_xform2.S,v 1.6 2003/03/25 18:44:30 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/X86/x86_xform3.S b/xc/extras/Mesa/src/X86/x86_xform3.S
index 5692ef920..9a239137f 100644
--- a/xc/extras/Mesa/src/X86/x86_xform3.S
+++ b/xc/extras/Mesa/src/X86/x86_xform3.S
@@ -1,4 +1,3 @@
-/* $Id: x86_xform3.S,v 1.6 2003/03/25 18:44:31 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/X86/x86_xform4.S b/xc/extras/Mesa/src/X86/x86_xform4.S
index 6f2018e32..76cbaa347 100644
--- a/xc/extras/Mesa/src/X86/x86_xform4.S
+++ b/xc/extras/Mesa/src/X86/x86_xform4.S
@@ -1,4 +1,3 @@
-/* $Id: x86_xform4.S,v 1.6 2003/03/25 18:44:32 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/X86/xform_args.h b/xc/extras/Mesa/src/X86/xform_args.h
index 893feecb2..b773f5198 100644
--- a/xc/extras/Mesa/src/X86/xform_args.h
+++ b/xc/extras/Mesa/src/X86/xform_args.h
@@ -1,4 +1,3 @@
-/* $Id: xform_args.h,v 1.8 2003/03/25 18:44:32 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/accum.c b/xc/extras/Mesa/src/accum.c
index 07b235e74..1185adbfd 100644
--- a/xc/extras/Mesa/src/accum.c
+++ b/xc/extras/Mesa/src/accum.c
@@ -1,4 +1,3 @@
-/* $Id: accum.c,v 1.20 2003/03/25 18:41:46 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/accum.h b/xc/extras/Mesa/src/accum.h
index 2702f6eba..8682525dc 100644
--- a/xc/extras/Mesa/src/accum.h
+++ b/xc/extras/Mesa/src/accum.h
@@ -1,4 +1,3 @@
-/* $Id: accum.h,v 1.11 2003/03/25 18:41:48 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/api_arrayelt.c b/xc/extras/Mesa/src/api_arrayelt.c
index 23f6bf9a6..deaf65a9d 100644
--- a/xc/extras/Mesa/src/api_arrayelt.c
+++ b/xc/extras/Mesa/src/api_arrayelt.c
@@ -1,4 +1,3 @@
-/* $Id: api_arrayelt.c,v 1.10 2003/03/25 18:41:49 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/api_arrayelt.h b/xc/extras/Mesa/src/api_arrayelt.h
index 328287236..706a72308 100644
--- a/xc/extras/Mesa/src/api_arrayelt.h
+++ b/xc/extras/Mesa/src/api_arrayelt.h
@@ -1,4 +1,3 @@
-/* $Id: api_arrayelt.h,v 1.6 2003/03/25 18:41:49 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/api_eval.c b/xc/extras/Mesa/src/api_eval.c
index 3bc2422b0..3887ba808 100644
--- a/xc/extras/Mesa/src/api_eval.c
+++ b/xc/extras/Mesa/src/api_eval.c
@@ -1,4 +1,3 @@
-/* $Id: api_eval.c,v 1.7 2003/03/25 18:41:49 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/api_eval.h b/xc/extras/Mesa/src/api_eval.h
index 8d0e8984c..d6cb38c9f 100644
--- a/xc/extras/Mesa/src/api_eval.h
+++ b/xc/extras/Mesa/src/api_eval.h
@@ -1,4 +1,3 @@
-/* $Id: api_eval.h,v 1.6 2003/03/25 18:41:50 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/api_loopback.c b/xc/extras/Mesa/src/api_loopback.c
index adc959ced..9805c59aa 100644
--- a/xc/extras/Mesa/src/api_loopback.c
+++ b/xc/extras/Mesa/src/api_loopback.c
@@ -1,4 +1,3 @@
-/* $Id: api_loopback.c,v 1.7 2003/03/25 18:41:51 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/api_loopback.h b/xc/extras/Mesa/src/api_loopback.h
index b952df2b3..a4858e44f 100644
--- a/xc/extras/Mesa/src/api_loopback.h
+++ b/xc/extras/Mesa/src/api_loopback.h
@@ -1,4 +1,3 @@
-/* $Id: api_loopback.h,v 1.6 2003/03/25 18:41:56 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/api_noop.c b/xc/extras/Mesa/src/api_noop.c
index 822d27ccb..e3fdd6141 100644
--- a/xc/extras/Mesa/src/api_noop.c
+++ b/xc/extras/Mesa/src/api_noop.c
@@ -1,4 +1,3 @@
-/* $Id: api_noop.c,v 1.8 2003/03/25 18:42:00 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/api_noop.h b/xc/extras/Mesa/src/api_noop.h
index 1c078fb18..da133ace7 100644
--- a/xc/extras/Mesa/src/api_noop.h
+++ b/xc/extras/Mesa/src/api_noop.h
@@ -1,4 +1,3 @@
-/* $Id: api_noop.h,v 1.8 2003/03/25 18:42:01 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/api_validate.c b/xc/extras/Mesa/src/api_validate.c
index 09053e7ae..37ac4a142 100644
--- a/xc/extras/Mesa/src/api_validate.c
+++ b/xc/extras/Mesa/src/api_validate.c
@@ -1,4 +1,3 @@
-/* $Id: api_validate.c,v 1.8 2003/03/25 18:42:04 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/api_validate.h b/xc/extras/Mesa/src/api_validate.h
index a49f6dde9..10f0c34e6 100644
--- a/xc/extras/Mesa/src/api_validate.h
+++ b/xc/extras/Mesa/src/api_validate.h
@@ -1,4 +1,3 @@
-/* $Id: api_validate.h,v 1.6 2003/03/25 18:42:05 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/array_cache/ac_context.c b/xc/extras/Mesa/src/array_cache/ac_context.c
index 7708bf6f6..6c807158c 100644
--- a/xc/extras/Mesa/src/array_cache/ac_context.c
+++ b/xc/extras/Mesa/src/array_cache/ac_context.c
@@ -1,4 +1,3 @@
-/* $Id: ac_context.c,v 1.7 2003/03/25 18:44:33 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/array_cache/ac_context.h b/xc/extras/Mesa/src/array_cache/ac_context.h
index 0e77ca9b5..19a41e093 100644
--- a/xc/extras/Mesa/src/array_cache/ac_context.h
+++ b/xc/extras/Mesa/src/array_cache/ac_context.h
@@ -1,4 +1,3 @@
-/* $Id: ac_context.h,v 1.7 2003/03/25 18:44:34 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/array_cache/ac_import.c b/xc/extras/Mesa/src/array_cache/ac_import.c
index 480afbc40..d68de5b03 100644
--- a/xc/extras/Mesa/src/array_cache/ac_import.c
+++ b/xc/extras/Mesa/src/array_cache/ac_import.c
@@ -1,4 +1,3 @@
-/* $Id: ac_import.c,v 1.7 2003/03/25 18:44:34 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/array_cache/acache.h b/xc/extras/Mesa/src/array_cache/acache.h
index 7466e367c..2bb64f365 100644
--- a/xc/extras/Mesa/src/array_cache/acache.h
+++ b/xc/extras/Mesa/src/array_cache/acache.h
@@ -1,4 +1,3 @@
-/* $Id: acache.h,v 1.7 2003/03/25 18:44:34 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/attrib.c b/xc/extras/Mesa/src/attrib.c
index 901e2f02a..dec0ca5f5 100644
--- a/xc/extras/Mesa/src/attrib.c
+++ b/xc/extras/Mesa/src/attrib.c
@@ -1,4 +1,3 @@
-/* $Id: attrib.c,v 1.25 2003/03/25 18:42:06 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/attrib.h b/xc/extras/Mesa/src/attrib.h
index 2aea5580f..decc71a78 100644
--- a/xc/extras/Mesa/src/attrib.h
+++ b/xc/extras/Mesa/src/attrib.h
@@ -1,4 +1,3 @@
-/* $Id: attrib.h,v 1.11 2003/03/25 18:42:13 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/blend.c b/xc/extras/Mesa/src/blend.c
index e151d92bf..e031851f9 100644
--- a/xc/extras/Mesa/src/blend.c
+++ b/xc/extras/Mesa/src/blend.c
@@ -1,4 +1,3 @@
-/* $Id: blend.c,v 1.18 2003/03/25 18:42:13 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/blend.h b/xc/extras/Mesa/src/blend.h
index 3abbb1697..d0a24afd0 100644
--- a/xc/extras/Mesa/src/blend.h
+++ b/xc/extras/Mesa/src/blend.h
@@ -1,4 +1,3 @@
-/* $Id: blend.h,v 1.12 2003/03/25 18:42:15 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/buffers.c b/xc/extras/Mesa/src/buffers.c
index 31da57243..a6713c880 100644
--- a/xc/extras/Mesa/src/buffers.c
+++ b/xc/extras/Mesa/src/buffers.c
@@ -1,4 +1,3 @@
-/* $Id: buffers.c,v 1.17 2003/03/25 18:42:16 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/buffers.h b/xc/extras/Mesa/src/buffers.h
index 1507ea09f..dfa213130 100644
--- a/xc/extras/Mesa/src/buffers.h
+++ b/xc/extras/Mesa/src/buffers.h
@@ -1,4 +1,3 @@
-/* $Id: buffers.h,v 1.8 2003/03/25 18:42:17 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/clip.c b/xc/extras/Mesa/src/clip.c
index bfe253a6c..07553683d 100644
--- a/xc/extras/Mesa/src/clip.c
+++ b/xc/extras/Mesa/src/clip.c
@@ -1,4 +1,3 @@
-/* $Id: clip.c,v 1.15 2003/03/25 18:42:18 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/clip.h b/xc/extras/Mesa/src/clip.h
index 04ec96720..fffcf13e9 100644
--- a/xc/extras/Mesa/src/clip.h
+++ b/xc/extras/Mesa/src/clip.h
@@ -1,4 +1,3 @@
-/* $Id: clip.h,v 1.11 2003/03/25 18:42:20 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/colormac.h b/xc/extras/Mesa/src/colormac.h
index 01f446080..eb2043d3f 100644
--- a/xc/extras/Mesa/src/colormac.h
+++ b/xc/extras/Mesa/src/colormac.h
@@ -1,4 +1,3 @@
-/* $Id: colormac.h,v 1.7 2003/03/25 18:42:21 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/colortab.c b/xc/extras/Mesa/src/colortab.c
index 2e3ec60bf..0a0392cef 100644
--- a/xc/extras/Mesa/src/colortab.c
+++ b/xc/extras/Mesa/src/colortab.c
@@ -1,4 +1,3 @@
-/* $Id: colortab.c,v 1.23 2003/03/25 18:42:22 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/colortab.h b/xc/extras/Mesa/src/colortab.h
index 966fd5ab8..e3bc76e5c 100644
--- a/xc/extras/Mesa/src/colortab.h
+++ b/xc/extras/Mesa/src/colortab.h
@@ -1,4 +1,3 @@
-/* $Id: colortab.h,v 1.13 2003/03/25 18:42:24 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/config.h b/xc/extras/Mesa/src/config.h
index 7b7a300b4..7b82bd7d8 100644
--- a/xc/extras/Mesa/src/config.h
+++ b/xc/extras/Mesa/src/config.h
@@ -1,4 +1,3 @@
-/* $Id: config.h,v 1.21 2003/03/25 18:42:28 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/context.c b/xc/extras/Mesa/src/context.c
index 2334e9593..c6baf57ec 100644
--- a/xc/extras/Mesa/src/context.c
+++ b/xc/extras/Mesa/src/context.c
@@ -1,4 +1,3 @@
-/* $Id: context.c,v 1.33 2003/03/25 18:42:29 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -985,19 +984,20 @@ init_attrib_groups( GLcontext *ctx )
    ctx->Color.DitherFlag = GL_TRUE;
 
    /* Current group */
-   ASSIGN_4V( ctx->Current.Attrib[VERT_ATTRIB_WEIGHT], 0.0, 0.0, 0.0, 0.0 );
-   ASSIGN_4V( ctx->Current.Attrib[VERT_ATTRIB_NORMAL], 0.0, 0.0, 1.0, 0.0 );
+   for (i = 0; i < VERT_ATTRIB_MAX; i++) {
+      ASSIGN_4V( ctx->Current.Attrib[i], 0.0, 0.0, 0.0, 1.0 );
+   }
+   /* special cases: */
+   ASSIGN_4V( ctx->Current.Attrib[VERT_ATTRIB_WEIGHT], 1.0, 0.0, 0.0, 1.0 );
+   ASSIGN_4V( ctx->Current.Attrib[VERT_ATTRIB_NORMAL], 0.0, 0.0, 1.0, 1.0 );
    ASSIGN_4V( ctx->Current.Attrib[VERT_ATTRIB_COLOR0], 1.0, 1.0, 1.0, 1.0 );
-   ASSIGN_4V( ctx->Current.Attrib[VERT_ATTRIB_COLOR1], 0.0, 0.0, 0.0, 0.0 );
-   ASSIGN_4V( ctx->Current.Attrib[VERT_ATTRIB_FOG], 0.0, 0.0, 0.0, 0.0 );
-   for (i = 0; i < MAX_TEXTURE_UNITS; i++)
-      ASSIGN_4V( ctx->Current.Attrib[VERT_ATTRIB_TEX0 + i], 0.0, 0.0, 0.0, 1.0 );
    ctx->Current.Index = 1;
    ctx->Current.EdgeFlag = GL_TRUE;
    
    ASSIGN_4V( ctx->Current.RasterPos, 0.0, 0.0, 0.0, 1.0 );
    ctx->Current.RasterDistance = 0.0;
    ASSIGN_4V( ctx->Current.RasterColor, 1.0, 1.0, 1.0, 1.0 );
+   ASSIGN_4V( ctx->Current.RasterSecondaryColor, 0.0, 0.0, 0.0, 0.0 );
    ctx->Current.RasterIndex = 1;
    for (i=0; i<MAX_TEXTURE_UNITS; i++)
       ASSIGN_4V( ctx->Current.RasterTexCoords[i], 0.0, 0.0, 0.0, 1.0 );
@@ -1368,7 +1368,7 @@ init_attrib_groups( GLcontext *ctx )
    ctx->Array.Color.Ptr = NULL;
    ctx->Array.Color.Enabled = GL_FALSE;
    ctx->Array.Color.Flags = CA_CLIENT_DATA;
-   ctx->Array.SecondaryColor.Size = 4;
+   ctx->Array.SecondaryColor.Size = 3;
    ctx->Array.SecondaryColor.Type = GL_FLOAT;
    ctx->Array.SecondaryColor.Stride = 0;
    ctx->Array.SecondaryColor.StrideB = 0;
diff --git a/xc/extras/Mesa/src/context.h b/xc/extras/Mesa/src/context.h
index 14fccf324..a123b317b 100644
--- a/xc/extras/Mesa/src/context.h
+++ b/xc/extras/Mesa/src/context.h
@@ -1,4 +1,3 @@
-/* $Id: context.h,v 1.16 2003/03/25 18:42:34 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/convolve.c b/xc/extras/Mesa/src/convolve.c
index 2add9d260..341d60eac 100644
--- a/xc/extras/Mesa/src/convolve.c
+++ b/xc/extras/Mesa/src/convolve.c
@@ -1,4 +1,3 @@
-/* $Id: convolve.c,v 1.9 2003/03/25 18:42:36 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/convolve.h b/xc/extras/Mesa/src/convolve.h
index 81c6802d1..f97c9f35b 100644
--- a/xc/extras/Mesa/src/convolve.h
+++ b/xc/extras/Mesa/src/convolve.h
@@ -1,4 +1,3 @@
-/* $Id: convolve.h,v 1.6 2003/03/25 18:42:38 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/dd.h b/xc/extras/Mesa/src/dd.h
index 51f06da1b..1df55ba20 100644
--- a/xc/extras/Mesa/src/dd.h
+++ b/xc/extras/Mesa/src/dd.h
@@ -1,4 +1,3 @@
-/* $Id: dd.h,v 1.23 2003/03/25 18:42:41 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/debug.c b/xc/extras/Mesa/src/debug.c
index d4b9beba2..7cd30f30b 100644
--- a/xc/extras/Mesa/src/debug.c
+++ b/xc/extras/Mesa/src/debug.c
@@ -1,4 +1,3 @@
-/* $Id: debug.c,v 1.7 2003/03/25 18:42:44 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/debug.h b/xc/extras/Mesa/src/debug.h
index c2e8f2bd9..6b45c0336 100644
--- a/xc/extras/Mesa/src/debug.h
+++ b/xc/extras/Mesa/src/debug.h
@@ -1,4 +1,3 @@
-/* $Id: debug.h,v 1.6 2003/03/25 18:42:45 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/depth.c b/xc/extras/Mesa/src/depth.c
index 10384cf88..1d8c52910 100644
--- a/xc/extras/Mesa/src/depth.c
+++ b/xc/extras/Mesa/src/depth.c
@@ -1,4 +1,3 @@
-/* $Id: depth.c,v 1.16 2003/03/25 18:42:46 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/depth.h b/xc/extras/Mesa/src/depth.h
index 325e9bc3d..e798df138 100644
--- a/xc/extras/Mesa/src/depth.h
+++ b/xc/extras/Mesa/src/depth.h
@@ -1,4 +1,3 @@
-/* $Id: depth.h,v 1.13 2003/03/25 18:42:48 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/dispatch.c b/xc/extras/Mesa/src/dispatch.c
index 16df35ac5..87dc64f02 100644
--- a/xc/extras/Mesa/src/dispatch.c
+++ b/xc/extras/Mesa/src/dispatch.c
@@ -1,4 +1,3 @@
-/* $Id: dispatch.c,v 1.11 2003/03/25 18:42:49 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/dlist.c b/xc/extras/Mesa/src/dlist.c
index a0ee81988..1e67f2b0e 100644
--- a/xc/extras/Mesa/src/dlist.c
+++ b/xc/extras/Mesa/src/dlist.c
@@ -1,4 +1,3 @@
-/* $Id: dlist.c,v 1.24 2003/03/25 18:42:50 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/dlist.h b/xc/extras/Mesa/src/dlist.h
index cc240e4fc..9880aa079 100644
--- a/xc/extras/Mesa/src/dlist.h
+++ b/xc/extras/Mesa/src/dlist.h
@@ -1,4 +1,3 @@
-/* $Id: dlist.h,v 1.14 2003/03/25 18:42:55 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/drawpix.c b/xc/extras/Mesa/src/drawpix.c
index 6ff45b32a..3601a3ed8 100644
--- a/xc/extras/Mesa/src/drawpix.c
+++ b/xc/extras/Mesa/src/drawpix.c
@@ -1,4 +1,3 @@
-/* $Id: drawpix.c,v 1.19 2003/03/25 18:42:56 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/drawpix.h b/xc/extras/Mesa/src/drawpix.h
index e0b2633af..478767af4 100644
--- a/xc/extras/Mesa/src/drawpix.h
+++ b/xc/extras/Mesa/src/drawpix.h
@@ -1,4 +1,3 @@
-/* $Id: drawpix.h,v 1.11 2003/03/25 18:42:58 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/enable.c b/xc/extras/Mesa/src/enable.c
index 2319a9ba6..a303a72d6 100644
--- a/xc/extras/Mesa/src/enable.c
+++ b/xc/extras/Mesa/src/enable.c
@@ -1,4 +1,3 @@
-/* $Id: enable.c,v 1.23 2003/03/25 18:42:59 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/enable.h b/xc/extras/Mesa/src/enable.h
index d991f0053..bf71f1773 100644
--- a/xc/extras/Mesa/src/enable.h
+++ b/xc/extras/Mesa/src/enable.h
@@ -1,4 +1,3 @@
-/* $Id: enable.h,v 1.11 2003/03/25 18:43:01 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/enums.c b/xc/extras/Mesa/src/enums.c
index 694a5d437..999c40a48 100644
--- a/xc/extras/Mesa/src/enums.c
+++ b/xc/extras/Mesa/src/enums.c
@@ -1,4 +1,3 @@
-/* $Id: enums.c,v 1.20 2003/03/25 18:43:03 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/enums.h b/xc/extras/Mesa/src/enums.h
index c0cdd1563..ff5923329 100644
--- a/xc/extras/Mesa/src/enums.h
+++ b/xc/extras/Mesa/src/enums.h
@@ -1,4 +1,3 @@
-/* $Id: enums.h,v 1.11 2003/03/25 18:43:05 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/eval.c b/xc/extras/Mesa/src/eval.c
index 2ba44e561..b9c09a569 100644
--- a/xc/extras/Mesa/src/eval.c
+++ b/xc/extras/Mesa/src/eval.c
@@ -1,4 +1,3 @@
-/* $Id: eval.c,v 1.15 2003/03/25 18:43:05 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/eval.h b/xc/extras/Mesa/src/eval.h
index 6916882a2..2e4f5227e 100644
--- a/xc/extras/Mesa/src/eval.h
+++ b/xc/extras/Mesa/src/eval.h
@@ -1,4 +1,3 @@
-/* $Id: eval.h,v 1.11 2003/03/25 18:43:08 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/extensions.c b/xc/extras/Mesa/src/extensions.c
index caeab6b65..9b6662246 100644
--- a/xc/extras/Mesa/src/extensions.c
+++ b/xc/extras/Mesa/src/extensions.c
@@ -1,4 +1,3 @@
-/* $Id: extensions.c,v 1.28 2003/03/25 18:43:09 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/extensions.h b/xc/extras/Mesa/src/extensions.h
index a9893fc25..fee9d0d57 100644
--- a/xc/extras/Mesa/src/extensions.h
+++ b/xc/extras/Mesa/src/extensions.h
@@ -1,4 +1,3 @@
-/* $Id: extensions.h,v 1.13 2003/03/25 18:43:11 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/feedback.c b/xc/extras/Mesa/src/feedback.c
index 27018bfe7..bcb4d4b4a 100644
--- a/xc/extras/Mesa/src/feedback.c
+++ b/xc/extras/Mesa/src/feedback.c
@@ -1,4 +1,3 @@
-/* $Id: feedback.c,v 1.15 2003/03/25 18:43:12 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/feedback.h b/xc/extras/Mesa/src/feedback.h
index 49df41202..e91546248 100644
--- a/xc/extras/Mesa/src/feedback.h
+++ b/xc/extras/Mesa/src/feedback.h
@@ -1,4 +1,3 @@
-/* $Id: feedback.h,v 1.11 2003/03/25 18:43:13 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/fog.c b/xc/extras/Mesa/src/fog.c
index 221bb39c7..8a65ffaed 100644
--- a/xc/extras/Mesa/src/fog.c
+++ b/xc/extras/Mesa/src/fog.c
@@ -1,4 +1,3 @@
-/* $Id: fog.c,v 1.20 2003/03/25 18:43:13 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/fog.h b/xc/extras/Mesa/src/fog.h
index 3a9378ea3..cd7f59cc6 100644
--- a/xc/extras/Mesa/src/fog.h
+++ b/xc/extras/Mesa/src/fog.h
@@ -1,4 +1,3 @@
-/* $Id: fog.h,v 1.13 2003/03/25 18:43:14 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/get.c b/xc/extras/Mesa/src/get.c
index c3dd9af5a..508d06921 100644
--- a/xc/extras/Mesa/src/get.c
+++ b/xc/extras/Mesa/src/get.c
@@ -1,8 +1,6 @@
-/* $Id: get.c,v 1.30 2003/03/25 18:43:14 alanh Exp $ */
-
 /*
  * Mesa 3-D graphics library
- * Version:  5.0.1
+ * Version:  5.0.2
  *
  * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
  *
@@ -476,8 +474,12 @@ _mesa_GetBooleanv( GLenum pname, GLboolean *params )
 	 *params = INT_TO_BOOL( ctx->CurrentListNum );
 	 break;
       case GL_LIST_MODE:
-	 *params = ENUM_TO_BOOL( ctx->ExecuteFlag
-				  ? GL_COMPILE_AND_EXECUTE : GL_COMPILE );
+         if (!ctx->CompileFlag)
+            *params = 0;
+         else if (ctx->ExecuteFlag)
+            *params = ENUM_TO_BOOL(GL_COMPILE_AND_EXECUTE);
+         else
+            *params = ENUM_TO_BOOL(GL_COMPILE);
 	 break;
       case GL_INDEX_LOGIC_OP:
 	 *params = ctx->Color.IndexLogicOpEnabled;
@@ -1256,7 +1258,7 @@ _mesa_GetBooleanv( GLenum pname, GLboolean *params )
 	 break;
       case GL_SECONDARY_COLOR_ARRAY_SIZE_EXT:
          CHECK_EXTENSION_B(EXT_secondary_color, pname);
-	 *params = INT_TO_BOOL(ctx->Array.SecondaryColor.Stride);
+	 *params = INT_TO_BOOL(ctx->Array.SecondaryColor.Size);
 	 break;
 
       /* GL_EXT_fog_coord */
@@ -1277,6 +1279,10 @@ _mesa_GetBooleanv( GLenum pname, GLboolean *params )
          CHECK_EXTENSION_B(EXT_fog_coord, pname);
 	 *params = INT_TO_BOOL(ctx->Array.FogCoord.Stride);
 	 break;
+      case GL_FOG_COORDINATE_SOURCE_EXT:
+         CHECK_EXTENSION_B(EXT_fog_coord, pname);
+	 *params = ENUM_TO_BOOL(ctx->Fog.FogCoordinateSource);
+	 break;
 
       /* GL_EXT_texture_lod_bias */
       case GL_MAX_TEXTURE_LOD_BIAS_EXT:
@@ -1368,11 +1374,12 @@ _mesa_GetBooleanv( GLenum pname, GLboolean *params )
          break;
       case GL_CURRENT_MATRIX_STACK_DEPTH_NV:
          CHECK_EXTENSION_B(NV_vertex_program, pname);
-         *params = (ctx->CurrentStack->Depth > 0) ? GL_TRUE : GL_FALSE;
+         *params = GL_TRUE;
          break;
       case GL_CURRENT_MATRIX_NV:
          CHECK_EXTENSION_B(NV_vertex_program, pname);
-         *params = (ctx->Transform.MatrixMode != 0) ? GL_TRUE : GL_FALSE;
+         for (i = 0; i < 16; i++)
+            params[i] = FLOAT_TO_BOOL(ctx->CurrentStack->Top->m[i]);
          break;
       case GL_VERTEX_PROGRAM_BINDING_NV:
          CHECK_EXTENSION_B(NV_vertex_program, pname);
@@ -1845,8 +1852,12 @@ _mesa_GetDoublev( GLenum pname, GLdouble *params )
 	 *params = (GLdouble) ctx->CurrentListNum;
 	 break;
       case GL_LIST_MODE:
-	 *params = ctx->ExecuteFlag ? ENUM_TO_DOUBLE(GL_COMPILE_AND_EXECUTE)
-	   			  : ENUM_TO_DOUBLE(GL_COMPILE);
+         if (!ctx->CompileFlag)
+            *params = 0.0;
+         else if (ctx->ExecuteFlag)
+            *params = ENUM_TO_DOUBLE(GL_COMPILE_AND_EXECUTE);
+         else
+            *params = ENUM_TO_DOUBLE(GL_COMPILE);
 	 break;
       case GL_INDEX_LOGIC_OP:
 	 *params = (GLdouble) ctx->Color.IndexLogicOpEnabled;
@@ -2622,7 +2633,7 @@ _mesa_GetDoublev( GLenum pname, GLdouble *params )
 	 break;
       case GL_SECONDARY_COLOR_ARRAY_SIZE_EXT:
          CHECK_EXTENSION_D(EXT_secondary_color, pname);
-	 *params = (GLdouble) ctx->Array.SecondaryColor.Stride;
+	 *params = (GLdouble) ctx->Array.SecondaryColor.Size;
 	 break;
 
       /* GL_EXT_fog_coord */
@@ -2643,6 +2654,10 @@ _mesa_GetDoublev( GLenum pname, GLdouble *params )
          CHECK_EXTENSION_D(EXT_fog_coord, pname);
 	 *params = (GLdouble) ctx->Array.FogCoord.Stride;
 	 break;
+      case GL_FOG_COORDINATE_SOURCE_EXT:
+         CHECK_EXTENSION_D(EXT_fog_coord, pname);
+	 *params = (GLdouble) ctx->Fog.FogCoordinateSource;
+	 break;
 
       /* GL_EXT_texture_lod_bias */
       case GL_MAX_TEXTURE_LOD_BIAS_EXT:
@@ -2734,11 +2749,12 @@ _mesa_GetDoublev( GLenum pname, GLdouble *params )
          break;
       case GL_CURRENT_MATRIX_STACK_DEPTH_NV:
          CHECK_EXTENSION_D(NV_vertex_program, pname);
-         *params = (GLdouble) ctx->CurrentStack->Depth;
+         *params = (GLdouble) ctx->CurrentStack->Depth + 1;
          break;
       case GL_CURRENT_MATRIX_NV:
          CHECK_EXTENSION_D(NV_vertex_program, pname);
-         *params = (GLdouble) ctx->Transform.MatrixMode;
+         for (i = 0; i < 16; i++)
+            params[i] = (GLdouble) ctx->CurrentStack->Top->m[i];
          break;
       case GL_VERTEX_PROGRAM_BINDING_NV:
          CHECK_EXTENSION_D(NV_vertex_program, pname);
@@ -3211,8 +3227,12 @@ _mesa_GetFloatv( GLenum pname, GLfloat *params )
 	 *params = (GLfloat) ctx->CurrentListNum;
 	 break;
       case GL_LIST_MODE:
-	 *params = ctx->ExecuteFlag ? ENUM_TO_FLOAT(GL_COMPILE_AND_EXECUTE)
-	   			  : ENUM_TO_FLOAT(GL_COMPILE);
+         if (!ctx->CompileFlag)
+            *params = 0.0F;
+         else if (ctx->ExecuteFlag)
+            *params = ENUM_TO_FLOAT(GL_COMPILE_AND_EXECUTE);
+         else
+            *params = ENUM_TO_FLOAT(GL_COMPILE);
 	 break;
       case GL_INDEX_LOGIC_OP:
 	 *params = (GLfloat) ctx->Color.IndexLogicOpEnabled;
@@ -3964,7 +3984,7 @@ _mesa_GetFloatv( GLenum pname, GLfloat *params )
 	 break;
       case GL_SECONDARY_COLOR_ARRAY_SIZE_EXT:
          CHECK_EXTENSION_F(EXT_secondary_color, pname);
-	 *params = (GLfloat) ctx->Array.SecondaryColor.Stride;
+	 *params = (GLfloat) ctx->Array.SecondaryColor.Size;
 	 break;
 
       /* GL_EXT_fog_coord */
@@ -3985,6 +4005,10 @@ _mesa_GetFloatv( GLenum pname, GLfloat *params )
          CHECK_EXTENSION_F(EXT_fog_coord, pname);
 	 *params = (GLfloat) ctx->Array.FogCoord.Stride;
 	 break;
+      case GL_FOG_COORDINATE_SOURCE_EXT:
+         CHECK_EXTENSION_F(EXT_fog_coord, pname);
+	 *params = (GLfloat) ctx->Fog.FogCoordinateSource;
+	 break;
 
       /* GL_EXT_texture_lod_bias */
       case GL_MAX_TEXTURE_LOD_BIAS_EXT:
@@ -4076,11 +4100,12 @@ _mesa_GetFloatv( GLenum pname, GLfloat *params )
          break;
       case GL_CURRENT_MATRIX_STACK_DEPTH_NV:
          CHECK_EXTENSION_F(NV_vertex_program, pname);
-         *params = (GLfloat) ctx->CurrentStack->Depth;
+         *params = (GLfloat) ctx->CurrentStack->Depth + 1;
          break;
       case GL_CURRENT_MATRIX_NV:
          CHECK_EXTENSION_F(NV_vertex_program, pname);
-         *params = (GLfloat) ctx->Transform.MatrixMode;
+         for (i = 0; i < 16; i++)
+            params[i] = ctx->CurrentStack->Top->m[i];
          break;
       case GL_VERTEX_PROGRAM_BINDING_NV:
          CHECK_EXTENSION_F(NV_vertex_program, pname);
@@ -4554,8 +4579,12 @@ _mesa_GetIntegerv( GLenum pname, GLint *params )
 	 *params = (GLint) ctx->CurrentListNum;
 	 break;
       case GL_LIST_MODE:
-	 *params = ctx->ExecuteFlag ? (GLint) GL_COMPILE_AND_EXECUTE
-	   			  : (GLint) GL_COMPILE;
+         if (!ctx->CompileFlag)
+            *params = 0;
+         else if (ctx->ExecuteFlag)
+            *params = (GLint) GL_COMPILE_AND_EXECUTE;
+         else
+            *params = (GLint) GL_COMPILE;
 	 break;
       case GL_INDEX_LOGIC_OP:
 	 *params = (GLint) ctx->Color.IndexLogicOpEnabled;
@@ -5345,7 +5374,7 @@ _mesa_GetIntegerv( GLenum pname, GLint *params )
 	 break;
       case GL_SECONDARY_COLOR_ARRAY_SIZE_EXT:
          CHECK_EXTENSION_I(EXT_secondary_color, pname);
-	 *params = (GLint) ctx->Array.SecondaryColor.Stride;
+	 *params = (GLint) ctx->Array.SecondaryColor.Size;
 	 break;
 
       /* GL_EXT_fog_coord */
@@ -5366,6 +5395,10 @@ _mesa_GetIntegerv( GLenum pname, GLint *params )
          CHECK_EXTENSION_I(EXT_fog_coord, pname);
          *params = (GLint) ctx->Array.FogCoord.Stride;
 	 break;
+      case GL_FOG_COORDINATE_SOURCE_EXT:
+         CHECK_EXTENSION_I(EXT_fog_coord, pname);
+	 *params = (GLint) ctx->Fog.FogCoordinateSource;
+	 break;
 
       /* GL_EXT_texture_lod_bias */
       case GL_MAX_TEXTURE_LOD_BIAS_EXT:
@@ -5457,11 +5490,12 @@ _mesa_GetIntegerv( GLenum pname, GLint *params )
          break;
       case GL_CURRENT_MATRIX_STACK_DEPTH_NV:
          CHECK_EXTENSION_I(NV_vertex_program, pname);
-         *params = ctx->CurrentStack->Depth;
+         *params = ctx->CurrentStack->Depth + 1;
          break;
       case GL_CURRENT_MATRIX_NV:
          CHECK_EXTENSION_I(NV_vertex_program, pname);
-         *params = (GLint) ctx->Transform.MatrixMode;
+         for (i = 0; i < 16; i++)
+            params[i] = (GLint) ctx->CurrentStack->Top->m[i];
          break;
       case GL_VERTEX_PROGRAM_BINDING_NV:
          CHECK_EXTENSION_I(NV_vertex_program, pname);
diff --git a/xc/extras/Mesa/src/get.h b/xc/extras/Mesa/src/get.h
index c9e00ff1a..eaddb746f 100644
--- a/xc/extras/Mesa/src/get.h
+++ b/xc/extras/Mesa/src/get.h
@@ -1,4 +1,3 @@
-/* $Id: get.h,v 1.11 2003/03/25 18:43:16 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/glapi.c b/xc/extras/Mesa/src/glapi.c
index 3213c1e01..3cb4ccca3 100644
--- a/xc/extras/Mesa/src/glapi.c
+++ b/xc/extras/Mesa/src/glapi.c
@@ -1,4 +1,3 @@
-/* $Id: glapi.c,v 1.17 2003/03/25 18:43:17 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/glapi.h b/xc/extras/Mesa/src/glapi.h
index feabe75c4..41d7aaf02 100644
--- a/xc/extras/Mesa/src/glapi.h
+++ b/xc/extras/Mesa/src/glapi.h
@@ -1,4 +1,3 @@
-/* $Id: glapi.h,v 1.10 2003/03/25 18:43:18 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/glheader.h b/xc/extras/Mesa/src/glheader.h
index 346683f78..ea3ecee4a 100644
--- a/xc/extras/Mesa/src/glheader.h
+++ b/xc/extras/Mesa/src/glheader.h
@@ -1,4 +1,3 @@
-/* $Id: glheader.h,v 1.27 2003/03/25 18:43:19 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/glthread.c b/xc/extras/Mesa/src/glthread.c
index 8849eec72..5fa831397 100644
--- a/xc/extras/Mesa/src/glthread.c
+++ b/xc/extras/Mesa/src/glthread.c
@@ -1,4 +1,3 @@
-/* $Id: glthread.c,v 1.10 2003/03/25 18:43:19 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/glthread.h b/xc/extras/Mesa/src/glthread.h
index 1fdcf08ab..00710c105 100644
--- a/xc/extras/Mesa/src/glthread.h
+++ b/xc/extras/Mesa/src/glthread.h
@@ -1,4 +1,3 @@
-/* $Id: glthread.h,v 1.14 2003/03/25 18:43:19 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/hash.c b/xc/extras/Mesa/src/hash.c
index d0e1ee5c9..32e37a268 100644
--- a/xc/extras/Mesa/src/hash.c
+++ b/xc/extras/Mesa/src/hash.c
@@ -1,4 +1,3 @@
-/* $Id: hash.c,v 1.16 2003/03/25 18:43:19 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/hash.h b/xc/extras/Mesa/src/hash.h
index ee0e169b9..07bdef46c 100644
--- a/xc/extras/Mesa/src/hash.h
+++ b/xc/extras/Mesa/src/hash.h
@@ -1,4 +1,3 @@
-/* $Id: hash.h,v 1.13 2003/03/25 18:43:20 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/hint.c b/xc/extras/Mesa/src/hint.c
index 86903134f..90ccc8bf6 100644
--- a/xc/extras/Mesa/src/hint.c
+++ b/xc/extras/Mesa/src/hint.c
@@ -1,4 +1,3 @@
-/* $Id: hint.c,v 1.12 2003/03/25 18:43:20 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/hint.h b/xc/extras/Mesa/src/hint.h
index af43e9e43..f33be7b54 100644
--- a/xc/extras/Mesa/src/hint.h
+++ b/xc/extras/Mesa/src/hint.h
@@ -1,4 +1,3 @@
-/* $Id: hint.h,v 1.9 2003/03/25 18:43:20 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/histogram.c b/xc/extras/Mesa/src/histogram.c
index 6d2bac1ff..805438f2f 100644
--- a/xc/extras/Mesa/src/histogram.c
+++ b/xc/extras/Mesa/src/histogram.c
@@ -1,4 +1,3 @@
-/* $Id: histogram.c,v 1.7 2003/03/25 18:43:20 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/histogram.h b/xc/extras/Mesa/src/histogram.h
index 833f4c66e..61fdeb319 100644
--- a/xc/extras/Mesa/src/histogram.h
+++ b/xc/extras/Mesa/src/histogram.h
@@ -1,4 +1,3 @@
-/* $Id: histogram.h,v 1.7 2003/03/25 18:43:21 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/image.c b/xc/extras/Mesa/src/image.c
index 6e175d7a1..4c042315d 100644
--- a/xc/extras/Mesa/src/image.c
+++ b/xc/extras/Mesa/src/image.c
@@ -1,4 +1,3 @@
-/* $Id: image.c,v 1.27 2003/03/25 18:43:21 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/image.h b/xc/extras/Mesa/src/image.h
index edae5ad6b..39260f0b4 100644
--- a/xc/extras/Mesa/src/image.h
+++ b/xc/extras/Mesa/src/image.h
@@ -1,4 +1,3 @@
-/* $Id: image.h,v 1.16 2003/03/25 18:43:23 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/imports.c b/xc/extras/Mesa/src/imports.c
index f60dad9af..83e9ce0d7 100644
--- a/xc/extras/Mesa/src/imports.c
+++ b/xc/extras/Mesa/src/imports.c
@@ -1,4 +1,3 @@
-/* $Id: imports.c,v 1.10 2003/03/25 18:43:23 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/imports.h b/xc/extras/Mesa/src/imports.h
index 7af6e8efb..33c329c9c 100644
--- a/xc/extras/Mesa/src/imports.h
+++ b/xc/extras/Mesa/src/imports.h
@@ -1,4 +1,3 @@
-/* $Id: imports.h,v 1.9 2003/03/25 18:43:24 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/light.c b/xc/extras/Mesa/src/light.c
index d09d14506..0e7f2295a 100644
--- a/xc/extras/Mesa/src/light.c
+++ b/xc/extras/Mesa/src/light.c
@@ -1,4 +1,3 @@
-/* $Id: light.c,v 1.17 2003/03/25 18:43:24 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/light.h b/xc/extras/Mesa/src/light.h
index ac8b8e5c3..557e48802 100644
--- a/xc/extras/Mesa/src/light.h
+++ b/xc/extras/Mesa/src/light.h
@@ -1,4 +1,3 @@
-/* $Id: light.h,v 1.15 2003/03/25 18:43:25 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/lines.c b/xc/extras/Mesa/src/lines.c
index 2071c921d..7ffa50272 100644
--- a/xc/extras/Mesa/src/lines.c
+++ b/xc/extras/Mesa/src/lines.c
@@ -1,4 +1,3 @@
-/* $Id: lines.c,v 1.19 2003/03/25 18:43:25 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/lines.h b/xc/extras/Mesa/src/lines.h
index 2a95a6de7..ac4b33f4d 100644
--- a/xc/extras/Mesa/src/lines.h
+++ b/xc/extras/Mesa/src/lines.h
@@ -1,4 +1,3 @@
-/* $Id: lines.h,v 1.11 2003/03/25 18:43:26 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/macros.h b/xc/extras/Mesa/src/macros.h
index 12b138422..dbe097961 100644
--- a/xc/extras/Mesa/src/macros.h
+++ b/xc/extras/Mesa/src/macros.h
@@ -1,4 +1,3 @@
-/* $Id: macros.h,v 1.20 2003/03/25 18:43:26 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/matrix.c b/xc/extras/Mesa/src/matrix.c
index dd4ccd554..b9c069cc2 100644
--- a/xc/extras/Mesa/src/matrix.c
+++ b/xc/extras/Mesa/src/matrix.c
@@ -1,4 +1,3 @@
-/* $Id: matrix.c,v 1.22 2003/03/25 18:43:26 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/matrix.h b/xc/extras/Mesa/src/matrix.h
index 84b24885a..13dc31eac 100644
--- a/xc/extras/Mesa/src/matrix.h
+++ b/xc/extras/Mesa/src/matrix.h
@@ -1,4 +1,3 @@
-/* $Id: matrix.h,v 1.14 2003/03/25 18:43:27 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/mmath.c b/xc/extras/Mesa/src/mmath.c
index f49c851cb..212628a4c 100644
--- a/xc/extras/Mesa/src/mmath.c
+++ b/xc/extras/Mesa/src/mmath.c
@@ -1,4 +1,3 @@
-/* $Id: mmath.c,v 1.16 2003/03/25 18:43:27 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/mmath.h b/xc/extras/Mesa/src/mmath.h
index 018f6d567..1c3d17d59 100644
--- a/xc/extras/Mesa/src/mmath.h
+++ b/xc/extras/Mesa/src/mmath.h
@@ -1,8 +1,6 @@
-/* $Id: mmath.h,v 1.33 2003/03/25 18:43:27 alanh Exp $ */
-
 /*
  * Mesa 3-D graphics library
- * Version:  5.0.1
+ * Version:  5.0.2
  *
  * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
  *
@@ -189,22 +187,19 @@ do {						\
 /*
  * Single precision ceiling, floor, and absolute value functions
  */
-#if defined(__sparc__) || defined(__NeXT__) /* XXX this probably isn't the ideal test */
-#define CEILF(x)   ceil(x)
-#define FLOORF(x)  floor(x)
-#define FABSF(x)   fabs(x)
-#elif defined(__WIN32__) || defined(__IBMC__) || defined(__IBMCPP__)
-#define CEILF(x)   ((GLfloat)ceil(x))
-#define FLOORF(x)  ((GLfloat)floor(x))
-#define FABSF(x)   ((GLfloat)fabs(x))
-#elif defined(XFree86LOADER) && defined(IN_MODULE)
+#if defined(XFree86LOADER) && defined(IN_MODULE)
 #define CEILF(x)   ((GLfloat) xf86ceil(x))
 #define FLOORF(x)  ((GLfloat) xf86floor(x))
 #define FABSF(x)   ((GLfloat) xf86fabs(x))
-#else
+#elif defined(__gnu_linux__)
+/* C99 functions */
 #define CEILF(x)   ceilf(x)
 #define FLOORF(x)  floorf(x)
 #define FABSF(x)   fabsf(x)
+#else
+#define CEILF(x)   ((GLfloat) ceil(x))
+#define FLOORF(x)  ((GLfloat) floor(x))
+#define FABSF(x)   ((GLfloat) fabs(x))
 #endif
 
 
diff --git a/xc/extras/Mesa/src/mtypes.h b/xc/extras/Mesa/src/mtypes.h
index 46c83300e..bd81cc73f 100644
--- a/xc/extras/Mesa/src/mtypes.h
+++ b/xc/extras/Mesa/src/mtypes.h
@@ -1,4 +1,3 @@
-/* $Id: mtypes.h,v 1.13 2003/03/25 18:43:28 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/pixel.c b/xc/extras/Mesa/src/pixel.c
index 4bd29724a..439e74003 100644
--- a/xc/extras/Mesa/src/pixel.c
+++ b/xc/extras/Mesa/src/pixel.c
@@ -1,4 +1,3 @@
-/* $Id: pixel.c,v 1.19 2003/03/25 18:43:32 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/pixel.h b/xc/extras/Mesa/src/pixel.h
index c8e9c1657..48138e083 100644
--- a/xc/extras/Mesa/src/pixel.h
+++ b/xc/extras/Mesa/src/pixel.h
@@ -1,4 +1,3 @@
-/* $Id: pixel.h,v 1.12 2003/03/25 18:43:32 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/points.c b/xc/extras/Mesa/src/points.c
index 408c1f1a6..3d59b3300 100644
--- a/xc/extras/Mesa/src/points.c
+++ b/xc/extras/Mesa/src/points.c
@@ -1,4 +1,3 @@
-/* $Id: points.c,v 1.19 2003/03/25 18:43:32 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/points.h b/xc/extras/Mesa/src/points.h
index 5b322976c..da57fba7a 100644
--- a/xc/extras/Mesa/src/points.h
+++ b/xc/extras/Mesa/src/points.h
@@ -1,4 +1,3 @@
-/* $Id: points.h,v 1.12 2003/03/25 18:43:33 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/polygon.c b/xc/extras/Mesa/src/polygon.c
index 0835ea9d8..dd4f44ec3 100644
--- a/xc/extras/Mesa/src/polygon.c
+++ b/xc/extras/Mesa/src/polygon.c
@@ -1,4 +1,3 @@
-/* $Id: polygon.c,v 1.13 2003/03/25 18:43:33 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/polygon.h b/xc/extras/Mesa/src/polygon.h
index 508dc9218..81b67ff54 100644
--- a/xc/extras/Mesa/src/polygon.h
+++ b/xc/extras/Mesa/src/polygon.h
@@ -1,4 +1,3 @@
-/* $Id: polygon.h,v 1.11 2003/03/25 18:43:34 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/rastpos.c b/xc/extras/Mesa/src/rastpos.c
index 8cb2aa5c6..606e80d92 100644
--- a/xc/extras/Mesa/src/rastpos.c
+++ b/xc/extras/Mesa/src/rastpos.c
@@ -1,4 +1,3 @@
-/* $Id: rastpos.c,v 1.13 2003/03/25 18:43:34 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/rastpos.h b/xc/extras/Mesa/src/rastpos.h
index b342f810c..3d18cb91c 100644
--- a/xc/extras/Mesa/src/rastpos.h
+++ b/xc/extras/Mesa/src/rastpos.h
@@ -1,4 +1,3 @@
-/* $Id: rastpos.h,v 1.12 2003/03/25 18:43:34 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/simple_list.h b/xc/extras/Mesa/src/simple_list.h
index b6a122149..2d9d4c845 100644
--- a/xc/extras/Mesa/src/simple_list.h
+++ b/xc/extras/Mesa/src/simple_list.h
@@ -1,4 +1,3 @@
-/* $Id: simple_list.h,v 1.11 2003/03/25 18:43:35 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/state.c b/xc/extras/Mesa/src/state.c
index 2610c0a90..dc3409ed5 100644
--- a/xc/extras/Mesa/src/state.c
+++ b/xc/extras/Mesa/src/state.c
@@ -1,4 +1,3 @@
-/* $Id: state.c,v 1.23 2003/03/25 18:43:36 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/state.h b/xc/extras/Mesa/src/state.h
index 221a44723..8d3ccc16d 100644
--- a/xc/extras/Mesa/src/state.h
+++ b/xc/extras/Mesa/src/state.h
@@ -1,4 +1,3 @@
-/* $Id: state.h,v 1.9 2003/03/25 18:43:38 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/stencil.c b/xc/extras/Mesa/src/stencil.c
index 47080d8bc..b38a620e5 100644
--- a/xc/extras/Mesa/src/stencil.c
+++ b/xc/extras/Mesa/src/stencil.c
@@ -1,4 +1,3 @@
-/* $Id: stencil.c,v 1.19 2003/03/25 18:43:38 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/stencil.h b/xc/extras/Mesa/src/stencil.h
index 4a6b27f3b..bb20884b8 100644
--- a/xc/extras/Mesa/src/stencil.h
+++ b/xc/extras/Mesa/src/stencil.h
@@ -1,4 +1,3 @@
-/* $Id: stencil.h,v 1.13 2003/03/25 18:43:39 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/swrast/s_aaline.c b/xc/extras/Mesa/src/swrast/s_aaline.c
index fc733bb16..b2f5f8681 100644
--- a/xc/extras/Mesa/src/swrast/s_aaline.c
+++ b/xc/extras/Mesa/src/swrast/s_aaline.c
@@ -1,4 +1,3 @@
-/* $Id: s_aaline.c,v 1.7 2003/03/25 18:44:44 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/swrast/s_aaline.h b/xc/extras/Mesa/src/swrast/s_aaline.h
index d57daebc0..41e7e5fd4 100644
--- a/xc/extras/Mesa/src/swrast/s_aaline.h
+++ b/xc/extras/Mesa/src/swrast/s_aaline.h
@@ -1,4 +1,3 @@
-/* $Id: s_aaline.h,v 1.6 2003/03/25 18:44:45 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/swrast/s_aalinetemp.h b/xc/extras/Mesa/src/swrast/s_aalinetemp.h
index 9aba70f60..2adf91867 100644
--- a/xc/extras/Mesa/src/swrast/s_aalinetemp.h
+++ b/xc/extras/Mesa/src/swrast/s_aalinetemp.h
@@ -1,4 +1,3 @@
-/* $Id: s_aalinetemp.h,v 1.7 2003/03/25 18:44:46 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/swrast/s_aatriangle.c b/xc/extras/Mesa/src/swrast/s_aatriangle.c
index 6a202180e..5d25e6ffe 100644
--- a/xc/extras/Mesa/src/swrast/s_aatriangle.c
+++ b/xc/extras/Mesa/src/swrast/s_aatriangle.c
@@ -1,4 +1,3 @@
-/* $Id: s_aatriangle.c,v 1.7 2003/03/25 18:44:50 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/swrast/s_aatriangle.h b/xc/extras/Mesa/src/swrast/s_aatriangle.h
index e7541b482..747fee429 100644
--- a/xc/extras/Mesa/src/swrast/s_aatriangle.h
+++ b/xc/extras/Mesa/src/swrast/s_aatriangle.h
@@ -1,4 +1,3 @@
-/* $Id: s_aatriangle.h,v 1.6 2003/03/25 18:44:51 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/swrast/s_aatritemp.h b/xc/extras/Mesa/src/swrast/s_aatritemp.h
index bb34fcdf7..e76a2ac33 100644
--- a/xc/extras/Mesa/src/swrast/s_aatritemp.h
+++ b/xc/extras/Mesa/src/swrast/s_aatritemp.h
@@ -1,4 +1,3 @@
-/* $Id: s_aatritemp.h,v 1.7 2003/03/25 18:44:51 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/swrast/s_accum.c b/xc/extras/Mesa/src/swrast/s_accum.c
index a25259866..16eca43d5 100644
--- a/xc/extras/Mesa/src/swrast/s_accum.c
+++ b/xc/extras/Mesa/src/swrast/s_accum.c
@@ -1,4 +1,3 @@
-/* $Id: s_accum.c,v 1.8 2003/03/25 18:44:52 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/swrast/s_accum.h b/xc/extras/Mesa/src/swrast/s_accum.h
index 7bd3a855c..faa3ccd41 100644
--- a/xc/extras/Mesa/src/swrast/s_accum.h
+++ b/xc/extras/Mesa/src/swrast/s_accum.h
@@ -1,4 +1,3 @@
-/* $Id: s_accum.h,v 1.6 2003/03/25 18:44:52 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/swrast/s_alpha.c b/xc/extras/Mesa/src/swrast/s_alpha.c
index ccdfa5c68..22ccff6dc 100644
--- a/xc/extras/Mesa/src/swrast/s_alpha.c
+++ b/xc/extras/Mesa/src/swrast/s_alpha.c
@@ -1,4 +1,3 @@
-/* $Id: s_alpha.c,v 1.7 2003/03/25 18:44:52 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/swrast/s_alpha.h b/xc/extras/Mesa/src/swrast/s_alpha.h
index b638af41f..86a7d0654 100644
--- a/xc/extras/Mesa/src/swrast/s_alpha.h
+++ b/xc/extras/Mesa/src/swrast/s_alpha.h
@@ -1,4 +1,3 @@
-/* $Id: s_alpha.h,v 1.7 2003/03/25 18:44:53 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/swrast/s_alphabuf.c b/xc/extras/Mesa/src/swrast/s_alphabuf.c
index 3b604225f..e677fb7d6 100644
--- a/xc/extras/Mesa/src/swrast/s_alphabuf.c
+++ b/xc/extras/Mesa/src/swrast/s_alphabuf.c
@@ -1,4 +1,3 @@
-/* $Id: s_alphabuf.c,v 1.9 2003/03/25 18:44:53 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/swrast/s_alphabuf.h b/xc/extras/Mesa/src/swrast/s_alphabuf.h
index a616f3a5d..531188f55 100644
--- a/xc/extras/Mesa/src/swrast/s_alphabuf.h
+++ b/xc/extras/Mesa/src/swrast/s_alphabuf.h
@@ -1,4 +1,3 @@
-/* $Id: s_alphabuf.h,v 1.6 2003/03/25 18:44:53 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/swrast/s_bitmap.c b/xc/extras/Mesa/src/swrast/s_bitmap.c
index afcbfc4c4..bc6c103a9 100644
--- a/xc/extras/Mesa/src/swrast/s_bitmap.c
+++ b/xc/extras/Mesa/src/swrast/s_bitmap.c
@@ -1,4 +1,3 @@
-/* $Id: s_bitmap.c,v 1.8 2003/03/25 18:44:54 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/swrast/s_blend.c b/xc/extras/Mesa/src/swrast/s_blend.c
index c2c236c65..acd454811 100644
--- a/xc/extras/Mesa/src/swrast/s_blend.c
+++ b/xc/extras/Mesa/src/swrast/s_blend.c
@@ -1,4 +1,3 @@
-/* $Id: s_blend.c,v 1.9 2003/03/25 18:44:54 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/swrast/s_blend.h b/xc/extras/Mesa/src/swrast/s_blend.h
index 4c6fb4b97..c9357748d 100644
--- a/xc/extras/Mesa/src/swrast/s_blend.h
+++ b/xc/extras/Mesa/src/swrast/s_blend.h
@@ -1,4 +1,3 @@
-/* $Id: s_blend.h,v 1.7 2003/03/25 18:44:55 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/swrast/s_buffers.c b/xc/extras/Mesa/src/swrast/s_buffers.c
index 511d33ac9..18d11891c 100644
--- a/xc/extras/Mesa/src/swrast/s_buffers.c
+++ b/xc/extras/Mesa/src/swrast/s_buffers.c
@@ -1,4 +1,3 @@
-/* $Id: s_buffers.c,v 1.7 2003/03/25 18:44:55 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/swrast/s_context.c b/xc/extras/Mesa/src/swrast/s_context.c
index 240ec6ad7..16acc154a 100644
--- a/xc/extras/Mesa/src/swrast/s_context.c
+++ b/xc/extras/Mesa/src/swrast/s_context.c
@@ -1,4 +1,3 @@
-/* $Id: s_context.c,v 1.11 2003/03/25 18:44:57 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/swrast/s_context.h b/xc/extras/Mesa/src/swrast/s_context.h
index 9ee6829df..75b72f3a2 100644
--- a/xc/extras/Mesa/src/swrast/s_context.h
+++ b/xc/extras/Mesa/src/swrast/s_context.h
@@ -1,4 +1,3 @@
-/* $Id: s_context.h,v 1.7 2003/03/25 18:44:58 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/swrast/s_copypix.c b/xc/extras/Mesa/src/swrast/s_copypix.c
index be1b62eaa..eab359090 100644
--- a/xc/extras/Mesa/src/swrast/s_copypix.c
+++ b/xc/extras/Mesa/src/swrast/s_copypix.c
@@ -1,4 +1,3 @@
-/* $Id: s_copypix.c,v 1.8 2003/03/25 18:44:59 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/swrast/s_depth.c b/xc/extras/Mesa/src/swrast/s_depth.c
index 2860a798d..d3279d634 100644
--- a/xc/extras/Mesa/src/swrast/s_depth.c
+++ b/xc/extras/Mesa/src/swrast/s_depth.c
@@ -1,4 +1,3 @@
-/* $Id: s_depth.c,v 1.9 2003/03/25 18:45:02 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/swrast/s_depth.h b/xc/extras/Mesa/src/swrast/s_depth.h
index c41bf0839..f1bd65e3a 100644
--- a/xc/extras/Mesa/src/swrast/s_depth.h
+++ b/xc/extras/Mesa/src/swrast/s_depth.h
@@ -1,4 +1,3 @@
-/* $Id: s_depth.h,v 1.7 2003/03/25 18:45:04 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/swrast/s_drawpix.c b/xc/extras/Mesa/src/swrast/s_drawpix.c
index 84146306d..3bcee0fc6 100644
--- a/xc/extras/Mesa/src/swrast/s_drawpix.c
+++ b/xc/extras/Mesa/src/swrast/s_drawpix.c
@@ -1,4 +1,3 @@
-/* $Id: s_drawpix.c,v 1.9 2003/03/25 18:45:06 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/swrast/s_drawpix.h b/xc/extras/Mesa/src/swrast/s_drawpix.h
index c5d0a179b..265d3c60a 100644
--- a/xc/extras/Mesa/src/swrast/s_drawpix.h
+++ b/xc/extras/Mesa/src/swrast/s_drawpix.h
@@ -1,4 +1,3 @@
-/* $Id: s_drawpix.h,v 1.6 2003/03/25 18:45:07 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/swrast/s_feedback.c b/xc/extras/Mesa/src/swrast/s_feedback.c
index 046b72b22..0927cd9a9 100644
--- a/xc/extras/Mesa/src/swrast/s_feedback.c
+++ b/xc/extras/Mesa/src/swrast/s_feedback.c
@@ -1,4 +1,3 @@
-/* $Id: s_feedback.c,v 1.6 2003/03/25 18:45:09 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/swrast/s_feedback.h b/xc/extras/Mesa/src/swrast/s_feedback.h
index f44ccff84..3a3b0557a 100644
--- a/xc/extras/Mesa/src/swrast/s_feedback.h
+++ b/xc/extras/Mesa/src/swrast/s_feedback.h
@@ -1,4 +1,3 @@
-/* $Id: s_feedback.h,v 1.6 2003/03/25 18:45:10 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/swrast/s_fog.c b/xc/extras/Mesa/src/swrast/s_fog.c
index cf18032f1..2e2390c08 100644
--- a/xc/extras/Mesa/src/swrast/s_fog.c
+++ b/xc/extras/Mesa/src/swrast/s_fog.c
@@ -1,4 +1,3 @@
-/* $Id: s_fog.c,v 1.8 2003/03/25 18:45:11 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/swrast/s_fog.h b/xc/extras/Mesa/src/swrast/s_fog.h
index 5f99189c9..6e23647d1 100644
--- a/xc/extras/Mesa/src/swrast/s_fog.h
+++ b/xc/extras/Mesa/src/swrast/s_fog.h
@@ -1,4 +1,3 @@
-/* $Id: s_fog.h,v 1.7 2003/03/25 18:45:12 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/swrast/s_histogram.c b/xc/extras/Mesa/src/swrast/s_histogram.c
index 8f456b023..761bd11e8 100644
--- a/xc/extras/Mesa/src/swrast/s_histogram.c
+++ b/xc/extras/Mesa/src/swrast/s_histogram.c
@@ -1,4 +1,3 @@
-/* $Id: s_histogram.c,v 1.5 2003/03/25 18:45:12 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/swrast/s_histogram.h b/xc/extras/Mesa/src/swrast/s_histogram.h
index 1c560ae29..5f7115c1f 100644
--- a/xc/extras/Mesa/src/swrast/s_histogram.h
+++ b/xc/extras/Mesa/src/swrast/s_histogram.h
@@ -1,4 +1,3 @@
-/* $Id: s_histogram.h,v 1.5 2003/03/25 18:45:13 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/swrast/s_imaging.c b/xc/extras/Mesa/src/swrast/s_imaging.c
index 5c08f1bbf..4b5438f88 100644
--- a/xc/extras/Mesa/src/swrast/s_imaging.c
+++ b/xc/extras/Mesa/src/swrast/s_imaging.c
@@ -1,4 +1,3 @@
-/* $Id: s_imaging.c,v 1.8 2003/03/25 18:45:13 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/swrast/s_lines.c b/xc/extras/Mesa/src/swrast/s_lines.c
index dad517af6..6900261bd 100644
--- a/xc/extras/Mesa/src/swrast/s_lines.c
+++ b/xc/extras/Mesa/src/swrast/s_lines.c
@@ -1,10 +1,8 @@
-/* $Id: s_lines.c,v 1.7 2003/03/25 18:45:14 alanh Exp $ */
-
 /*
  * Mesa 3-D graphics library
- * Version:  5.0
+ * Version:  5.0.2
  *
- * Copyright (C) 1999-2002  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2003  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"),
@@ -65,7 +63,12 @@ compute_stipple_mask( GLcontext *ctx, GLuint len, GLubyte mask[] )
 static void
 draw_wide_line( GLcontext *ctx, struct sw_span *span, GLboolean xMajor )
 {
+   GLchan colors[MAX_WIDTH][4];
    GLint width, start;
+   GLboolean mutable = (ctx->Color.BlendEnabled ||
+                        ctx->Texture._EnabledUnits ||
+                        ctx->Fog.Enabled ||
+                        *((GLuint *) ctx->Color.ColorMask) != 0xffffffff);
 
    ASSERT(span->end < MAX_WIDTH);
 
@@ -76,6 +79,13 @@ draw_wide_line( GLcontext *ctx, struct sw_span *span, GLboolean xMajor )
    else
       start = width / 2 - 1;
 
+   if (mutable) {
+      /* Backup colors because they'll get modified during span write.
+       * This is a bit of hack.  The problem is properly fixed in Mesa 5.1.
+       */
+      _mesa_memcpy(colors, span->array->rgba, span->end * 4 * sizeof(GLchan));
+   }
+
    if (xMajor) {
       GLint *y = span->array->y;
       GLuint i;
@@ -95,6 +105,12 @@ draw_wide_line( GLcontext *ctx, struct sw_span *span, GLboolean xMajor )
             _mesa_write_rgba_span(ctx, span);
          else
             _mesa_write_index_span(ctx, span);
+
+         if (w + 1 < width && mutable) {
+            /* restore original colors */
+            _mesa_memcpy(span->array->rgba, colors,
+                         span->end * 4 * sizeof(GLchan));
+         }
       }
    }
    else {
@@ -116,6 +132,11 @@ draw_wide_line( GLcontext *ctx, struct sw_span *span, GLboolean xMajor )
             _mesa_write_rgba_span(ctx, span);
          else
             _mesa_write_index_span(ctx, span);
+         if (w + 1 < width && mutable) {
+            /* restore original colors */
+            _mesa_memcpy(span->array->rgba, colors,
+                         span->end * 4 * sizeof(GLchan));
+         }
       }
    }
 }
diff --git a/xc/extras/Mesa/src/swrast/s_lines.h b/xc/extras/Mesa/src/swrast/s_lines.h
index f232dc292..5372b99b9 100644
--- a/xc/extras/Mesa/src/swrast/s_lines.h
+++ b/xc/extras/Mesa/src/swrast/s_lines.h
@@ -1,4 +1,3 @@
-/* $Id: s_lines.h,v 1.6 2003/03/25 18:45:15 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/swrast/s_linetemp.h b/xc/extras/Mesa/src/swrast/s_linetemp.h
index 7a25a68ad..9c7541315 100644
--- a/xc/extras/Mesa/src/swrast/s_linetemp.h
+++ b/xc/extras/Mesa/src/swrast/s_linetemp.h
@@ -1,4 +1,3 @@
-/* $Id: s_linetemp.h,v 1.8 2003/03/25 18:45:17 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/swrast/s_logic.c b/xc/extras/Mesa/src/swrast/s_logic.c
index 49f1a889b..4f5b3b387 100644
--- a/xc/extras/Mesa/src/swrast/s_logic.c
+++ b/xc/extras/Mesa/src/swrast/s_logic.c
@@ -1,4 +1,3 @@
-/* $Id: s_logic.c,v 1.7 2003/03/25 18:45:19 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/swrast/s_logic.h b/xc/extras/Mesa/src/swrast/s_logic.h
index 7e40fe8ce..820451d9b 100644
--- a/xc/extras/Mesa/src/swrast/s_logic.h
+++ b/xc/extras/Mesa/src/swrast/s_logic.h
@@ -1,4 +1,3 @@
-/* $Id: s_logic.h,v 1.7 2003/03/25 18:45:21 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/swrast/s_masking.c b/xc/extras/Mesa/src/swrast/s_masking.c
index 5f70757fd..74e1fb5bc 100644
--- a/xc/extras/Mesa/src/swrast/s_masking.c
+++ b/xc/extras/Mesa/src/swrast/s_masking.c
@@ -1,4 +1,3 @@
-/* $Id: s_masking.c,v 1.7 2003/03/25 18:45:22 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/swrast/s_masking.h b/xc/extras/Mesa/src/swrast/s_masking.h
index 13bace4ed..8b5c86366 100644
--- a/xc/extras/Mesa/src/swrast/s_masking.h
+++ b/xc/extras/Mesa/src/swrast/s_masking.h
@@ -1,4 +1,3 @@
-/* $Id: s_masking.h,v 1.7 2003/03/25 18:45:23 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/swrast/s_pixeltex.c b/xc/extras/Mesa/src/swrast/s_pixeltex.c
index ba70bc645..776a38c91 100644
--- a/xc/extras/Mesa/src/swrast/s_pixeltex.c
+++ b/xc/extras/Mesa/src/swrast/s_pixeltex.c
@@ -1,4 +1,3 @@
-/* $Id: s_pixeltex.c,v 1.7 2003/03/25 18:45:24 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/swrast/s_pixeltex.h b/xc/extras/Mesa/src/swrast/s_pixeltex.h
index d24711b9a..6ef7a44df 100644
--- a/xc/extras/Mesa/src/swrast/s_pixeltex.h
+++ b/xc/extras/Mesa/src/swrast/s_pixeltex.h
@@ -1,4 +1,3 @@
-/* $Id: s_pixeltex.h,v 1.7 2003/03/25 18:45:25 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/swrast/s_points.c b/xc/extras/Mesa/src/swrast/s_points.c
index 2896f970f..5ef41d9fb 100644
--- a/xc/extras/Mesa/src/swrast/s_points.c
+++ b/xc/extras/Mesa/src/swrast/s_points.c
@@ -1,4 +1,3 @@
-/* $Id: s_points.c,v 1.8 2003/03/25 18:45:25 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/swrast/s_points.h b/xc/extras/Mesa/src/swrast/s_points.h
index d796f8b51..40b442e95 100644
--- a/xc/extras/Mesa/src/swrast/s_points.h
+++ b/xc/extras/Mesa/src/swrast/s_points.h
@@ -1,4 +1,3 @@
-/* $Id: s_points.h,v 1.7 2003/03/25 18:45:27 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/swrast/s_pointtemp.h b/xc/extras/Mesa/src/swrast/s_pointtemp.h
index 0d625f6c6..8f07fa25a 100644
--- a/xc/extras/Mesa/src/swrast/s_pointtemp.h
+++ b/xc/extras/Mesa/src/swrast/s_pointtemp.h
@@ -1,4 +1,3 @@
-/* $Id: s_pointtemp.h,v 1.8 2003/03/25 18:45:28 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/swrast/s_readpix.c b/xc/extras/Mesa/src/swrast/s_readpix.c
index a0a114573..672109982 100644
--- a/xc/extras/Mesa/src/swrast/s_readpix.c
+++ b/xc/extras/Mesa/src/swrast/s_readpix.c
@@ -1,4 +1,3 @@
-/* $Id: s_readpix.c,v 1.9 2003/03/25 18:45:29 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/swrast/s_span.c b/xc/extras/Mesa/src/swrast/s_span.c
index 76f6fabe9..a43051964 100644
--- a/xc/extras/Mesa/src/swrast/s_span.c
+++ b/xc/extras/Mesa/src/swrast/s_span.c
@@ -1,4 +1,3 @@
-/* $Id: s_span.c,v 1.9 2003/03/25 18:45:31 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/swrast/s_span.h b/xc/extras/Mesa/src/swrast/s_span.h
index 69066a2af..d37961e98 100644
--- a/xc/extras/Mesa/src/swrast/s_span.h
+++ b/xc/extras/Mesa/src/swrast/s_span.h
@@ -1,4 +1,3 @@
-/* $Id: s_span.h,v 1.7 2003/03/25 18:45:33 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/swrast/s_stencil.c b/xc/extras/Mesa/src/swrast/s_stencil.c
index 8d712dea0..b535830fe 100644
--- a/xc/extras/Mesa/src/swrast/s_stencil.c
+++ b/xc/extras/Mesa/src/swrast/s_stencil.c
@@ -1,4 +1,3 @@
-/* $Id: s_stencil.c,v 1.9 2003/03/25 18:45:34 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/swrast/s_stencil.h b/xc/extras/Mesa/src/swrast/s_stencil.h
index a56bdd82f..30b390e1b 100644
--- a/xc/extras/Mesa/src/swrast/s_stencil.h
+++ b/xc/extras/Mesa/src/swrast/s_stencil.h
@@ -1,4 +1,3 @@
-/* $Id: s_stencil.h,v 1.7 2003/03/25 18:45:35 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/swrast/s_texstore.c b/xc/extras/Mesa/src/swrast/s_texstore.c
index 3227fb4f1..1865b22e3 100644
--- a/xc/extras/Mesa/src/swrast/s_texstore.c
+++ b/xc/extras/Mesa/src/swrast/s_texstore.c
@@ -1,4 +1,3 @@
-/* $Id: s_texstore.c,v 1.8 2003/03/25 18:45:36 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/swrast/s_texture.c b/xc/extras/Mesa/src/swrast/s_texture.c
index 11d544fbe..a26aabf2d 100644
--- a/xc/extras/Mesa/src/swrast/s_texture.c
+++ b/xc/extras/Mesa/src/swrast/s_texture.c
@@ -1,4 +1,3 @@
-/* $Id: s_texture.c,v 1.14 2003/03/25 18:45:36 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/swrast/s_texture.h b/xc/extras/Mesa/src/swrast/s_texture.h
index f55df5e9c..0157071f1 100644
--- a/xc/extras/Mesa/src/swrast/s_texture.h
+++ b/xc/extras/Mesa/src/swrast/s_texture.h
@@ -1,4 +1,3 @@
-/* $Id: s_texture.h,v 1.7 2003/03/25 18:45:38 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/swrast/s_triangle.c b/xc/extras/Mesa/src/swrast/s_triangle.c
index e203030d5..a4efb679f 100644
--- a/xc/extras/Mesa/src/swrast/s_triangle.c
+++ b/xc/extras/Mesa/src/swrast/s_triangle.c
@@ -1,4 +1,3 @@
-/* $Id: s_triangle.c,v 1.8 2003/03/25 18:45:39 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/swrast/s_triangle.h b/xc/extras/Mesa/src/swrast/s_triangle.h
index 4a04d8c71..4d5777480 100644
--- a/xc/extras/Mesa/src/swrast/s_triangle.h
+++ b/xc/extras/Mesa/src/swrast/s_triangle.h
@@ -1,4 +1,3 @@
-/* $Id: s_triangle.h,v 1.6 2003/03/25 18:45:40 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/swrast/s_trispan.h b/xc/extras/Mesa/src/swrast/s_trispan.h
index fac824bc4..15207e863 100644
--- a/xc/extras/Mesa/src/swrast/s_trispan.h
+++ b/xc/extras/Mesa/src/swrast/s_trispan.h
@@ -1,4 +1,3 @@
-/* $Id: s_trispan.h,v 1.7 2003/03/25 18:45:40 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/swrast/s_tritemp.h b/xc/extras/Mesa/src/swrast/s_tritemp.h
index 0e2c497df..58fa90c4f 100644
--- a/xc/extras/Mesa/src/swrast/s_tritemp.h
+++ b/xc/extras/Mesa/src/swrast/s_tritemp.h
@@ -1,5 +1,3 @@
-/* $Id: s_tritemp.h,v 1.8 2003/03/25 18:45:41 alanh Exp $ */
-
 /*
  * Mesa 3-D graphics library
  * Version:  3.5
@@ -23,7 +21,6 @@
  * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-/* $XFree86: xc/extras/Mesa/src/swrast/s_tritemp.h,v 1.2 2002/02/27 21:07:54 tsi Exp $ */
 
 /*
  * Triangle Rasterizer Template
diff --git a/xc/extras/Mesa/src/swrast/s_zoom.c b/xc/extras/Mesa/src/swrast/s_zoom.c
index 243a55c16..a8c1a939e 100644
--- a/xc/extras/Mesa/src/swrast/s_zoom.c
+++ b/xc/extras/Mesa/src/swrast/s_zoom.c
@@ -1,4 +1,3 @@
-/* $Id: s_zoom.c,v 1.8 2003/03/25 18:45:41 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/swrast/s_zoom.h b/xc/extras/Mesa/src/swrast/s_zoom.h
index c96f86a08..bdc7013e0 100644
--- a/xc/extras/Mesa/src/swrast/s_zoom.h
+++ b/xc/extras/Mesa/src/swrast/s_zoom.h
@@ -1,4 +1,3 @@
-/* $Id: s_zoom.h,v 1.7 2003/03/25 18:45:42 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/swrast/swrast.h b/xc/extras/Mesa/src/swrast/swrast.h
index fbff489c1..76e9ca24d 100644
--- a/xc/extras/Mesa/src/swrast/swrast.h
+++ b/xc/extras/Mesa/src/swrast/swrast.h
@@ -1,4 +1,3 @@
-/* $Id: swrast.h,v 1.8 2003/03/25 18:45:43 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/swrast_setup/ss_context.c b/xc/extras/Mesa/src/swrast_setup/ss_context.c
index 99dcfe0df..c000e4194 100644
--- a/xc/extras/Mesa/src/swrast_setup/ss_context.c
+++ b/xc/extras/Mesa/src/swrast_setup/ss_context.c
@@ -1,4 +1,3 @@
-/* $Id: ss_context.c,v 1.9 2003/03/25 18:45:45 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/swrast_setup/ss_context.h b/xc/extras/Mesa/src/swrast_setup/ss_context.h
index a097d4320..84813e98e 100644
--- a/xc/extras/Mesa/src/swrast_setup/ss_context.h
+++ b/xc/extras/Mesa/src/swrast_setup/ss_context.h
@@ -1,4 +1,3 @@
-/* $Id: ss_context.h,v 1.8 2003/03/25 18:45:45 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/swrast_setup/ss_triangle.c b/xc/extras/Mesa/src/swrast_setup/ss_triangle.c
index 00110fcbf..b041c32ef 100644
--- a/xc/extras/Mesa/src/swrast_setup/ss_triangle.c
+++ b/xc/extras/Mesa/src/swrast_setup/ss_triangle.c
@@ -1,4 +1,3 @@
-/* $Id: ss_triangle.c,v 1.7 2003/03/25 18:45:46 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/swrast_setup/ss_triangle.h b/xc/extras/Mesa/src/swrast_setup/ss_triangle.h
index 249655823..78833269e 100644
--- a/xc/extras/Mesa/src/swrast_setup/ss_triangle.h
+++ b/xc/extras/Mesa/src/swrast_setup/ss_triangle.h
@@ -1,4 +1,3 @@
-/* $Id: ss_triangle.h,v 1.7 2003/03/25 18:45:46 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/swrast_setup/ss_tritmp.h b/xc/extras/Mesa/src/swrast_setup/ss_tritmp.h
index caa347d2a..77219fc60 100644
--- a/xc/extras/Mesa/src/swrast_setup/ss_tritmp.h
+++ b/xc/extras/Mesa/src/swrast_setup/ss_tritmp.h
@@ -1,4 +1,3 @@
-/* $Id: ss_tritmp.h,v 1.7 2003/03/25 18:45:46 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/swrast_setup/ss_vb.c b/xc/extras/Mesa/src/swrast_setup/ss_vb.c
index fbde5bae6..7f6832b4c 100644
--- a/xc/extras/Mesa/src/swrast_setup/ss_vb.c
+++ b/xc/extras/Mesa/src/swrast_setup/ss_vb.c
@@ -1,4 +1,3 @@
-/* $Id: ss_vb.c,v 1.8 2003/03/25 18:45:47 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/swrast_setup/ss_vb.h b/xc/extras/Mesa/src/swrast_setup/ss_vb.h
index 2c420ec32..6ea0cb1a7 100644
--- a/xc/extras/Mesa/src/swrast_setup/ss_vb.h
+++ b/xc/extras/Mesa/src/swrast_setup/ss_vb.h
@@ -1,4 +1,3 @@
-/* $Id: ss_vb.h,v 1.7 2003/03/25 18:45:47 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/swrast_setup/ss_vbtmp.h b/xc/extras/Mesa/src/swrast_setup/ss_vbtmp.h
index 9ea262ff1..ba5f20fde 100644
--- a/xc/extras/Mesa/src/swrast_setup/ss_vbtmp.h
+++ b/xc/extras/Mesa/src/swrast_setup/ss_vbtmp.h
@@ -1,4 +1,3 @@
-/* $Id: ss_vbtmp.h,v 1.8 2003/03/25 18:45:48 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/swrast_setup/swrast_setup.h b/xc/extras/Mesa/src/swrast_setup/swrast_setup.h
index c9f22ae87..4825c772f 100644
--- a/xc/extras/Mesa/src/swrast_setup/swrast_setup.h
+++ b/xc/extras/Mesa/src/swrast_setup/swrast_setup.h
@@ -1,4 +1,3 @@
-/* $Id: swrast_setup.h,v 1.7 2003/03/25 18:45:48 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/texcompress.c b/xc/extras/Mesa/src/texcompress.c
index 375f63c39..6ecf8cad0 100644
--- a/xc/extras/Mesa/src/texcompress.c
+++ b/xc/extras/Mesa/src/texcompress.c
@@ -1,4 +1,3 @@
-/* $Id: texcompress.c,v 1.4 2003/03/25 18:43:39 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/texcompress.h b/xc/extras/Mesa/src/texcompress.h
index 4cb390023..d0856142e 100644
--- a/xc/extras/Mesa/src/texcompress.h
+++ b/xc/extras/Mesa/src/texcompress.h
@@ -1,4 +1,3 @@
-/* $Id: texcompress.h,v 1.4 2003/03/25 18:43:39 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/texformat.c b/xc/extras/Mesa/src/texformat.c
index bd39e62fb..88ab316d8 100644
--- a/xc/extras/Mesa/src/texformat.c
+++ b/xc/extras/Mesa/src/texformat.c
@@ -1,4 +1,3 @@
-/* $Id: texformat.c,v 1.9 2003/03/25 18:43:39 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/texformat.h b/xc/extras/Mesa/src/texformat.h
index 12aae173a..1ea33090f 100644
--- a/xc/extras/Mesa/src/texformat.h
+++ b/xc/extras/Mesa/src/texformat.h
@@ -1,4 +1,3 @@
-/* $Id: texformat.h,v 1.10 2003/03/25 18:43:40 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/texformat_tmp.h b/xc/extras/Mesa/src/texformat_tmp.h
index ea1dc3c91..6b1c001dc 100644
--- a/xc/extras/Mesa/src/texformat_tmp.h
+++ b/xc/extras/Mesa/src/texformat_tmp.h
@@ -1,4 +1,3 @@
-/* $Id: texformat_tmp.h,v 1.9 2003/03/25 18:43:41 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/teximage.c b/xc/extras/Mesa/src/teximage.c
index add0c6590..8e1d63d35 100644
--- a/xc/extras/Mesa/src/teximage.c
+++ b/xc/extras/Mesa/src/teximage.c
@@ -1,8 +1,6 @@
-/* $Id: teximage.c,v 1.39 2003/03/25 18:43:42 alanh Exp $ */
-
 /*
  * Mesa 3-D graphics library
- * Version:  5.0.1
+ * Version:  5.0.2
  *
  * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
  *
@@ -447,7 +445,8 @@ is_proxy_target(GLenum target)
    return (target == GL_PROXY_TEXTURE_1D ||
            target == GL_PROXY_TEXTURE_2D ||
            target == GL_PROXY_TEXTURE_3D ||
-           target == GL_PROXY_TEXTURE_CUBE_MAP_ARB);
+           target == GL_PROXY_TEXTURE_CUBE_MAP_ARB ||
+           target == GL_PROXY_TEXTURE_RECTANGLE_NV);
 }
 
 
diff --git a/xc/extras/Mesa/src/teximage.h b/xc/extras/Mesa/src/teximage.h
index 574c4e2a4..ac467d27c 100644
--- a/xc/extras/Mesa/src/teximage.h
+++ b/xc/extras/Mesa/src/teximage.h
@@ -1,4 +1,3 @@
-/* $Id: teximage.h,v 1.21 2003/03/25 18:43:42 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/texobj.c b/xc/extras/Mesa/src/texobj.c
index 015b078f2..22042579e 100644
--- a/xc/extras/Mesa/src/texobj.c
+++ b/xc/extras/Mesa/src/texobj.c
@@ -1,8 +1,6 @@
-/* $Id: texobj.c,v 1.31 2003/03/25 18:43:43 alanh Exp $ */
-
 /*
  * Mesa 3-D graphics library
- * Version:  5.0.1
+ * Version:  5.0.2
  *
  * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
  *
@@ -90,7 +88,7 @@ _mesa_alloc_texture_object( struct gl_shared_state *shared,
       obj->MaxAnisotropy = 1.0;
       obj->CompareFlag = GL_FALSE;                      /* SGIX_shadow */
       obj->CompareOperator = GL_TEXTURE_LEQUAL_R_SGIX;  /* SGIX_shadow */
-      obj->CompareMode = GL_LUMINANCE;    /* ARB_shadow */
+      obj->CompareMode = GL_NONE;         /* ARB_shadow */
       obj->CompareFunc = GL_LEQUAL;       /* ARB_shadow */
       obj->DepthMode = GL_LUMINANCE;      /* ARB_depth_texture */
       obj->ShadowAmbient = 0.0F;          /* ARB/SGIX_shadow_ambient */
diff --git a/xc/extras/Mesa/src/texobj.h b/xc/extras/Mesa/src/texobj.h
index bd6d94d01..d0a0e8381 100644
--- a/xc/extras/Mesa/src/texobj.h
+++ b/xc/extras/Mesa/src/texobj.h
@@ -1,4 +1,3 @@
-/* $Id: texobj.h,v 1.15 2003/03/25 18:43:43 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/texstate.c b/xc/extras/Mesa/src/texstate.c
index 8fa7abcf9..87024cc07 100644
--- a/xc/extras/Mesa/src/texstate.c
+++ b/xc/extras/Mesa/src/texstate.c
@@ -1,4 +1,3 @@
-/* $Id: texstate.c,v 1.36 2003/03/25 18:43:43 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/texstate.h b/xc/extras/Mesa/src/texstate.h
index 9b4ef79a3..a9de0c6e0 100644
--- a/xc/extras/Mesa/src/texstate.h
+++ b/xc/extras/Mesa/src/texstate.h
@@ -1,4 +1,3 @@
-/* $Id: texstate.h,v 1.15 2003/03/25 18:43:44 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/texstore.c b/xc/extras/Mesa/src/texstore.c
index 44e0e941d..1f20d2cfa 100644
--- a/xc/extras/Mesa/src/texstore.c
+++ b/xc/extras/Mesa/src/texstore.c
@@ -1,4 +1,3 @@
-/* $Id: texstore.c,v 1.12 2003/03/25 18:43:44 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -482,6 +481,7 @@ _mesa_transfer_teximage(GLcontext *ctx, GLuint dimensions,
           baseInternalFormat == GL_ALPHA ||
           baseInternalFormat == GL_RGB ||
           baseInternalFormat == GL_RGBA ||
+          baseInternalFormat == GL_COLOR_INDEX ||
           baseInternalFormat == GL_DEPTH_COMPONENT);
 
    if (transferOps & IMAGE_CONVOLUTION_BIT) {
diff --git a/xc/extras/Mesa/src/texstore.h b/xc/extras/Mesa/src/texstore.h
index c8d39647a..799769698 100644
--- a/xc/extras/Mesa/src/texstore.h
+++ b/xc/extras/Mesa/src/texstore.h
@@ -1,4 +1,3 @@
-/* $Id: texstore.h,v 1.8 2003/03/25 18:43:45 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/texutil.c b/xc/extras/Mesa/src/texutil.c
index f8e8b3ea7..5b515b776 100644
--- a/xc/extras/Mesa/src/texutil.c
+++ b/xc/extras/Mesa/src/texutil.c
@@ -1,4 +1,3 @@
-/* $Id: texutil.c,v 1.24 2003/03/25 18:43:45 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/texutil.h b/xc/extras/Mesa/src/texutil.h
index df3bf51f1..97e629cfb 100644
--- a/xc/extras/Mesa/src/texutil.h
+++ b/xc/extras/Mesa/src/texutil.h
@@ -1,4 +1,3 @@
-/* $Id: texutil.h,v 1.12 2003/03/25 18:43:46 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/texutil_tmp.h b/xc/extras/Mesa/src/texutil_tmp.h
index ac1716884..becbd24f1 100644
--- a/xc/extras/Mesa/src/texutil_tmp.h
+++ b/xc/extras/Mesa/src/texutil_tmp.h
@@ -1,4 +1,3 @@
-/* $Id: texutil_tmp.h,v 1.12 2003/03/25 18:43:46 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/tnl/t_array_api.c b/xc/extras/Mesa/src/tnl/t_array_api.c
index 5bd53239a..60744a2d7 100644
--- a/xc/extras/Mesa/src/tnl/t_array_api.c
+++ b/xc/extras/Mesa/src/tnl/t_array_api.c
@@ -1,4 +1,3 @@
-/* $Id: t_array_api.c,v 1.9 2003/03/25 18:45:49 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/tnl/t_array_api.h b/xc/extras/Mesa/src/tnl/t_array_api.h
index 6f551117b..c26112bef 100644
--- a/xc/extras/Mesa/src/tnl/t_array_api.h
+++ b/xc/extras/Mesa/src/tnl/t_array_api.h
@@ -1,4 +1,3 @@
-/* $Id: t_array_api.h,v 1.6 2003/03/25 18:45:51 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/tnl/t_array_import.c b/xc/extras/Mesa/src/tnl/t_array_import.c
index 53bb15709..6f62aa398 100644
--- a/xc/extras/Mesa/src/tnl/t_array_import.c
+++ b/xc/extras/Mesa/src/tnl/t_array_import.c
@@ -1,4 +1,3 @@
-/* $Id: t_array_import.c,v 1.7 2003/03/25 18:45:52 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/tnl/t_array_import.h b/xc/extras/Mesa/src/tnl/t_array_import.h
index cf8814e34..7bc248f71 100644
--- a/xc/extras/Mesa/src/tnl/t_array_import.h
+++ b/xc/extras/Mesa/src/tnl/t_array_import.h
@@ -1,4 +1,3 @@
-/* $Id: t_array_import.h,v 1.6 2003/03/25 18:45:52 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/tnl/t_context.c b/xc/extras/Mesa/src/tnl/t_context.c
index 39317d165..906953712 100644
--- a/xc/extras/Mesa/src/tnl/t_context.c
+++ b/xc/extras/Mesa/src/tnl/t_context.c
@@ -1,4 +1,3 @@
-/* $Id: t_context.c,v 1.9 2003/03/25 18:45:53 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/tnl/t_context.h b/xc/extras/Mesa/src/tnl/t_context.h
index fa5beabd5..396406ccb 100644
--- a/xc/extras/Mesa/src/tnl/t_context.h
+++ b/xc/extras/Mesa/src/tnl/t_context.h
@@ -1,4 +1,3 @@
-/* $Id: t_context.h,v 1.8 2003/03/25 18:45:54 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/tnl/t_eval_api.c b/xc/extras/Mesa/src/tnl/t_eval_api.c
index c396d8d48..cd38d92d3 100644
--- a/xc/extras/Mesa/src/tnl/t_eval_api.c
+++ b/xc/extras/Mesa/src/tnl/t_eval_api.c
@@ -1,4 +1,3 @@
-/* $Id: t_eval_api.c,v 1.8 2003/03/25 18:45:54 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/tnl/t_eval_api.h b/xc/extras/Mesa/src/tnl/t_eval_api.h
index 43c708b1f..0ac6c0b14 100644
--- a/xc/extras/Mesa/src/tnl/t_eval_api.h
+++ b/xc/extras/Mesa/src/tnl/t_eval_api.h
@@ -1,4 +1,3 @@
-/* $Id: t_eval_api.h,v 1.6 2003/03/25 18:45:55 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/tnl/t_imm_alloc.c b/xc/extras/Mesa/src/tnl/t_imm_alloc.c
index aa84f7a67..65d5a752d 100644
--- a/xc/extras/Mesa/src/tnl/t_imm_alloc.c
+++ b/xc/extras/Mesa/src/tnl/t_imm_alloc.c
@@ -1,4 +1,3 @@
-/* $Id: t_imm_alloc.c,v 1.8 2003/03/25 18:45:56 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/tnl/t_imm_alloc.h b/xc/extras/Mesa/src/tnl/t_imm_alloc.h
index b092821e5..502be3fe9 100644
--- a/xc/extras/Mesa/src/tnl/t_imm_alloc.h
+++ b/xc/extras/Mesa/src/tnl/t_imm_alloc.h
@@ -1,4 +1,3 @@
-/* $Id: t_imm_alloc.h,v 1.8 2003/03/25 18:45:56 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/tnl/t_imm_api.c b/xc/extras/Mesa/src/tnl/t_imm_api.c
index ecc62da5c..86458d626 100644
--- a/xc/extras/Mesa/src/tnl/t_imm_api.c
+++ b/xc/extras/Mesa/src/tnl/t_imm_api.c
@@ -1,4 +1,3 @@
-/* $Id: t_imm_api.c,v 1.12 2003/03/25 18:45:56 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/tnl/t_imm_api.h b/xc/extras/Mesa/src/tnl/t_imm_api.h
index 0a4b05f05..1cb89fd4d 100644
--- a/xc/extras/Mesa/src/tnl/t_imm_api.h
+++ b/xc/extras/Mesa/src/tnl/t_imm_api.h
@@ -1,4 +1,3 @@
-/* $Id: t_imm_api.h,v 1.8 2003/03/25 18:45:56 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/tnl/t_imm_debug.c b/xc/extras/Mesa/src/tnl/t_imm_debug.c
index 966e097d8..98b009c38 100644
--- a/xc/extras/Mesa/src/tnl/t_imm_debug.c
+++ b/xc/extras/Mesa/src/tnl/t_imm_debug.c
@@ -1,4 +1,3 @@
-/* $Id: t_imm_debug.c,v 1.8 2003/03/25 18:45:57 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/tnl/t_imm_debug.h b/xc/extras/Mesa/src/tnl/t_imm_debug.h
index 6c1f9495e..91eea9347 100644
--- a/xc/extras/Mesa/src/tnl/t_imm_debug.h
+++ b/xc/extras/Mesa/src/tnl/t_imm_debug.h
@@ -1,4 +1,3 @@
-/* $Id: t_imm_debug.h,v 1.7 2003/03/25 18:45:58 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/tnl/t_imm_dlist.c b/xc/extras/Mesa/src/tnl/t_imm_dlist.c
index 08d5e9ab6..e74c944a8 100644
--- a/xc/extras/Mesa/src/tnl/t_imm_dlist.c
+++ b/xc/extras/Mesa/src/tnl/t_imm_dlist.c
@@ -1,4 +1,3 @@
-/* $Id: t_imm_dlist.c,v 1.10 2003/03/25 18:45:59 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/tnl/t_imm_dlist.h b/xc/extras/Mesa/src/tnl/t_imm_dlist.h
index a431a0e53..e12d4c053 100644
--- a/xc/extras/Mesa/src/tnl/t_imm_dlist.h
+++ b/xc/extras/Mesa/src/tnl/t_imm_dlist.h
@@ -1,4 +1,3 @@
-/* $Id: t_imm_dlist.h,v 1.7 2003/03/25 18:45:59 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/tnl/t_imm_elt.c b/xc/extras/Mesa/src/tnl/t_imm_elt.c
index 07374ca5b..254b78d7f 100644
--- a/xc/extras/Mesa/src/tnl/t_imm_elt.c
+++ b/xc/extras/Mesa/src/tnl/t_imm_elt.c
@@ -1,4 +1,3 @@
-/* $Id: t_imm_elt.c,v 1.7 2003/03/25 18:46:00 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/tnl/t_imm_elt.h b/xc/extras/Mesa/src/tnl/t_imm_elt.h
index 3b051e452..811cb17c3 100644
--- a/xc/extras/Mesa/src/tnl/t_imm_elt.h
+++ b/xc/extras/Mesa/src/tnl/t_imm_elt.h
@@ -1,4 +1,3 @@
-/* $Id: t_imm_elt.h,v 1.7 2003/03/25 18:46:00 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/tnl/t_imm_eval.c b/xc/extras/Mesa/src/tnl/t_imm_eval.c
index 0ef1c0f23..d71845320 100644
--- a/xc/extras/Mesa/src/tnl/t_imm_eval.c
+++ b/xc/extras/Mesa/src/tnl/t_imm_eval.c
@@ -1,4 +1,3 @@
-/* $Id: t_imm_eval.c,v 1.8 2003/03/25 18:46:00 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/tnl/t_imm_eval.h b/xc/extras/Mesa/src/tnl/t_imm_eval.h
index e29d3a29e..58e8a38af 100644
--- a/xc/extras/Mesa/src/tnl/t_imm_eval.h
+++ b/xc/extras/Mesa/src/tnl/t_imm_eval.h
@@ -1,4 +1,3 @@
-/* $Id: t_imm_eval.h,v 1.6 2003/03/25 18:46:01 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/tnl/t_imm_exec.c b/xc/extras/Mesa/src/tnl/t_imm_exec.c
index f300c0816..bf5050856 100644
--- a/xc/extras/Mesa/src/tnl/t_imm_exec.c
+++ b/xc/extras/Mesa/src/tnl/t_imm_exec.c
@@ -1,4 +1,3 @@
-/* $Id: t_imm_exec.c,v 1.9 2003/03/25 18:46:01 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/tnl/t_imm_exec.h b/xc/extras/Mesa/src/tnl/t_imm_exec.h
index 1c24cedf0..6b3c65f4c 100644
--- a/xc/extras/Mesa/src/tnl/t_imm_exec.h
+++ b/xc/extras/Mesa/src/tnl/t_imm_exec.h
@@ -1,4 +1,3 @@
-/* $Id: t_imm_exec.h,v 1.7 2003/03/25 18:46:01 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/tnl/t_imm_fixup.c b/xc/extras/Mesa/src/tnl/t_imm_fixup.c
index 30ed43dda..ca5a2a554 100644
--- a/xc/extras/Mesa/src/tnl/t_imm_fixup.c
+++ b/xc/extras/Mesa/src/tnl/t_imm_fixup.c
@@ -1,4 +1,3 @@
-/* $Id: t_imm_fixup.c,v 1.8 2003/03/25 18:46:01 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/tnl/t_imm_fixup.h b/xc/extras/Mesa/src/tnl/t_imm_fixup.h
index 10817b47f..b0ec903ca 100644
--- a/xc/extras/Mesa/src/tnl/t_imm_fixup.h
+++ b/xc/extras/Mesa/src/tnl/t_imm_fixup.h
@@ -1,4 +1,3 @@
-/* $Id: t_imm_fixup.h,v 1.6 2003/03/25 18:46:02 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/tnl/t_pipeline.c b/xc/extras/Mesa/src/tnl/t_pipeline.c
index 2d0a06adc..144710e51 100644
--- a/xc/extras/Mesa/src/tnl/t_pipeline.c
+++ b/xc/extras/Mesa/src/tnl/t_pipeline.c
@@ -1,4 +1,3 @@
-/* $Id: t_pipeline.c,v 1.7 2003/03/25 18:46:02 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/tnl/t_pipeline.h b/xc/extras/Mesa/src/tnl/t_pipeline.h
index b4cfabddf..9ccdb7998 100644
--- a/xc/extras/Mesa/src/tnl/t_pipeline.h
+++ b/xc/extras/Mesa/src/tnl/t_pipeline.h
@@ -1,4 +1,3 @@
-/* $Id: t_pipeline.h,v 1.7 2003/03/25 18:46:02 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/tnl/t_vb_cliptmp.h b/xc/extras/Mesa/src/tnl/t_vb_cliptmp.h
index 5b5b51bbc..2484560d2 100644
--- a/xc/extras/Mesa/src/tnl/t_vb_cliptmp.h
+++ b/xc/extras/Mesa/src/tnl/t_vb_cliptmp.h
@@ -1,4 +1,3 @@
-/* $Id: t_vb_cliptmp.h,v 1.7 2003/03/25 18:46:02 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/tnl/t_vb_fog.c b/xc/extras/Mesa/src/tnl/t_vb_fog.c
index 06f414a3c..d59980417 100644
--- a/xc/extras/Mesa/src/tnl/t_vb_fog.c
+++ b/xc/extras/Mesa/src/tnl/t_vb_fog.c
@@ -1,4 +1,3 @@
-/* $Id: t_vb_fog.c,v 1.7 2003/03/25 18:46:02 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/tnl/t_vb_light.c b/xc/extras/Mesa/src/tnl/t_vb_light.c
index 93e9de458..a75dacf54 100644
--- a/xc/extras/Mesa/src/tnl/t_vb_light.c
+++ b/xc/extras/Mesa/src/tnl/t_vb_light.c
@@ -1,4 +1,3 @@
-/* $Id: t_vb_light.c,v 1.7 2003/03/25 18:46:04 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/tnl/t_vb_lighttmp.h b/xc/extras/Mesa/src/tnl/t_vb_lighttmp.h
index e4b1a7a5b..c0ef45cce 100644
--- a/xc/extras/Mesa/src/tnl/t_vb_lighttmp.h
+++ b/xc/extras/Mesa/src/tnl/t_vb_lighttmp.h
@@ -1,4 +1,3 @@
-/* $Id: t_vb_lighttmp.h,v 1.8 2003/03/25 18:46:05 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/tnl/t_vb_normals.c b/xc/extras/Mesa/src/tnl/t_vb_normals.c
index 77aa1e061..a99de7a21 100644
--- a/xc/extras/Mesa/src/tnl/t_vb_normals.c
+++ b/xc/extras/Mesa/src/tnl/t_vb_normals.c
@@ -1,4 +1,3 @@
-/* $Id: t_vb_normals.c,v 1.8 2003/03/25 18:46:05 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/tnl/t_vb_points.c b/xc/extras/Mesa/src/tnl/t_vb_points.c
index ef5752191..67e527ca8 100644
--- a/xc/extras/Mesa/src/tnl/t_vb_points.c
+++ b/xc/extras/Mesa/src/tnl/t_vb_points.c
@@ -1,4 +1,3 @@
-/* $Id: t_vb_points.c,v 1.7 2003/03/25 18:46:06 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/tnl/t_vb_program.c b/xc/extras/Mesa/src/tnl/t_vb_program.c
index 23bca059d..3cddb2be3 100644
--- a/xc/extras/Mesa/src/tnl/t_vb_program.c
+++ b/xc/extras/Mesa/src/tnl/t_vb_program.c
@@ -1,4 +1,3 @@
-/* $Id: t_vb_program.c,v 1.2 2003/03/25 18:46:06 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/tnl/t_vb_render.c b/xc/extras/Mesa/src/tnl/t_vb_render.c
index 956131fd6..3eb09b619 100644
--- a/xc/extras/Mesa/src/tnl/t_vb_render.c
+++ b/xc/extras/Mesa/src/tnl/t_vb_render.c
@@ -1,4 +1,3 @@
-/* $Id: t_vb_render.c,v 1.8 2003/03/25 18:46:06 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/tnl/t_vb_rendertmp.h b/xc/extras/Mesa/src/tnl/t_vb_rendertmp.h
index 64c85cb34..7bc0e37fa 100644
--- a/xc/extras/Mesa/src/tnl/t_vb_rendertmp.h
+++ b/xc/extras/Mesa/src/tnl/t_vb_rendertmp.h
@@ -1,4 +1,3 @@
-/* $Id: t_vb_rendertmp.h,v 1.7 2003/03/25 18:46:06 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/tnl/t_vb_texgen.c b/xc/extras/Mesa/src/tnl/t_vb_texgen.c
index 17d48b079..79601a836 100644
--- a/xc/extras/Mesa/src/tnl/t_vb_texgen.c
+++ b/xc/extras/Mesa/src/tnl/t_vb_texgen.c
@@ -1,10 +1,9 @@
-/* $Id: t_vb_texgen.c,v 1.7 2003/03/25 18:46:07 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
- * Version:  3.5
+ * Version:  5.0.2
  *
- * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2003  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"),
@@ -368,7 +367,7 @@ static void texgen( GLcontext *ctx,
    GLuint count = VB->Count;
    GLfloat (*f)[3] = store->tmp_f;
    GLfloat *m = store->tmp_m;
-	 GLuint holes = 0;
+   GLuint holes = 0;
 
 
    if (texUnit->_GenFlags & TEXGEN_NEED_M) {
@@ -400,6 +399,7 @@ static void texgen( GLcontext *ctx,
    }
 
    if (holes) {
+      if (holes & VEC_DIRTY_3) _mesa_vector4f_clean_elem(out, count, 3);
       if (holes & VEC_DIRTY_2) _mesa_vector4f_clean_elem(out, count, 2);
       if (holes & VEC_DIRTY_1) _mesa_vector4f_clean_elem(out, count, 1);
       if (holes & VEC_DIRTY_0) _mesa_vector4f_clean_elem(out, count, 0);
diff --git a/xc/extras/Mesa/src/tnl/t_vb_texmat.c b/xc/extras/Mesa/src/tnl/t_vb_texmat.c
index cc18276e9..c81e790de 100644
--- a/xc/extras/Mesa/src/tnl/t_vb_texmat.c
+++ b/xc/extras/Mesa/src/tnl/t_vb_texmat.c
@@ -1,4 +1,3 @@
-/* $Id: t_vb_texmat.c,v 1.7 2003/03/25 18:46:07 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/tnl/t_vb_vertex.c b/xc/extras/Mesa/src/tnl/t_vb_vertex.c
index 9d264a3ad..27e47feaf 100644
--- a/xc/extras/Mesa/src/tnl/t_vb_vertex.c
+++ b/xc/extras/Mesa/src/tnl/t_vb_vertex.c
@@ -1,4 +1,3 @@
-/* $Id: t_vb_vertex.c,v 1.8 2003/03/25 18:46:07 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/tnl/t_vtx_api.c b/xc/extras/Mesa/src/tnl/t_vtx_api.c
index 4076051c8..5fb08a9b5 100644
--- a/xc/extras/Mesa/src/tnl/t_vtx_api.c
+++ b/xc/extras/Mesa/src/tnl/t_vtx_api.c
@@ -1,4 +1,3 @@
-/* $XFree86$ */
 /**************************************************************************
 
 Copyright 2002 Tungsten Graphics Inc., Cedar Park, Texas.
diff --git a/xc/extras/Mesa/src/tnl/t_vtx_api.h b/xc/extras/Mesa/src/tnl/t_vtx_api.h
index 6bfdbe8fe..ace962c31 100644
--- a/xc/extras/Mesa/src/tnl/t_vtx_api.h
+++ b/xc/extras/Mesa/src/tnl/t_vtx_api.h
@@ -1,4 +1,3 @@
-/* $XFree86$ */
 /**************************************************************************
 
 Copyright 2002 Tungsten Graphics Inc., Cedar Park, Texas.
diff --git a/xc/extras/Mesa/src/tnl/t_vtx_exec.c b/xc/extras/Mesa/src/tnl/t_vtx_exec.c
index 7e9db7892..c0dda08e8 100644
--- a/xc/extras/Mesa/src/tnl/t_vtx_exec.c
+++ b/xc/extras/Mesa/src/tnl/t_vtx_exec.c
@@ -1,4 +1,3 @@
-/* $XFree86$ */
 /**************************************************************************
 
 Copyright 2002 Tungsten Graphics Inc., Cedar Park, Texas.
diff --git a/xc/extras/Mesa/src/tnl/t_vtx_sse.c b/xc/extras/Mesa/src/tnl/t_vtx_sse.c
index 8998c901b..6d6ba356e 100644
--- a/xc/extras/Mesa/src/tnl/t_vtx_sse.c
+++ b/xc/extras/Mesa/src/tnl/t_vtx_sse.c
@@ -1,4 +1,3 @@
-/* $XFree86$ */
 /**************************************************************************
 
 Copyright 2002 Tungsten Graphics Inc., Cedar Park, Texas.
diff --git a/xc/extras/Mesa/src/tnl/t_vtx_x86.c b/xc/extras/Mesa/src/tnl/t_vtx_x86.c
index 7a55db72d..0d9421d1d 100644
--- a/xc/extras/Mesa/src/tnl/t_vtx_x86.c
+++ b/xc/extras/Mesa/src/tnl/t_vtx_x86.c
@@ -1,4 +1,3 @@
-/* $XFree86$ */
 /**************************************************************************
 
 Copyright 2002 Tungsten Graphics Inc., Cedar Park, Texas.
diff --git a/xc/extras/Mesa/src/tnl/tnl.h b/xc/extras/Mesa/src/tnl/tnl.h
index a10cc60ce..349a8c7d6 100644
--- a/xc/extras/Mesa/src/tnl/tnl.h
+++ b/xc/extras/Mesa/src/tnl/tnl.h
@@ -1,4 +1,3 @@
-/* $Id: tnl.h,v 1.7 2003/03/25 18:46:07 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/tnl_dd/t_dd.c b/xc/extras/Mesa/src/tnl_dd/t_dd.c
index a0a056b60..731da5c32 100644
--- a/xc/extras/Mesa/src/tnl_dd/t_dd.c
+++ b/xc/extras/Mesa/src/tnl_dd/t_dd.c
@@ -1,4 +1,3 @@
-/* $Id: t_dd.c,v 1.7 2003/03/25 18:46:08 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/tnl_dd/t_dd_dmatmp.h b/xc/extras/Mesa/src/tnl_dd/t_dd_dmatmp.h
index 4d92b917d..d9f709389 100644
--- a/xc/extras/Mesa/src/tnl_dd/t_dd_dmatmp.h
+++ b/xc/extras/Mesa/src/tnl_dd/t_dd_dmatmp.h
@@ -1,4 +1,3 @@
-/* $Id: t_dd_dmatmp.h,v 1.8 2003/03/25 18:46:09 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/tnl_dd/t_dd_rendertmp.h b/xc/extras/Mesa/src/tnl_dd/t_dd_rendertmp.h
index e4f040442..fc00e7693 100644
--- a/xc/extras/Mesa/src/tnl_dd/t_dd_rendertmp.h
+++ b/xc/extras/Mesa/src/tnl_dd/t_dd_rendertmp.h
@@ -1,4 +1,3 @@
-/* $Id: t_dd_rendertmp.h,v 1.7 2003/03/25 18:46:09 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/tnl_dd/t_dd_tritmp.h b/xc/extras/Mesa/src/tnl_dd/t_dd_tritmp.h
index f5ef1cdd8..cc47798d5 100644
--- a/xc/extras/Mesa/src/tnl_dd/t_dd_tritmp.h
+++ b/xc/extras/Mesa/src/tnl_dd/t_dd_tritmp.h
@@ -1,4 +1,3 @@
-/* $Id: t_dd_tritmp.h,v 1.7 2003/03/25 18:46:09 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/tnl_dd/t_dd_unfilled.h b/xc/extras/Mesa/src/tnl_dd/t_dd_unfilled.h
index ea59c11b2..46415ea5f 100644
--- a/xc/extras/Mesa/src/tnl_dd/t_dd_unfilled.h
+++ b/xc/extras/Mesa/src/tnl_dd/t_dd_unfilled.h
@@ -1,4 +1,3 @@
-/* $Id: t_dd_unfilled.h,v 1.7 2003/03/25 18:46:09 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/tnl_dd/t_dd_vbtmp.h b/xc/extras/Mesa/src/tnl_dd/t_dd_vbtmp.h
index 112ae0405..5aad0b562 100644
--- a/xc/extras/Mesa/src/tnl_dd/t_dd_vbtmp.h
+++ b/xc/extras/Mesa/src/tnl_dd/t_dd_vbtmp.h
@@ -1,4 +1,3 @@
-/* $Id: t_dd_vbtmp.h,v 1.13 2003/03/25 18:46:10 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/tnl_dd/t_dd_vertex.h b/xc/extras/Mesa/src/tnl_dd/t_dd_vertex.h
index 53b4560f8..d45dd09fb 100644
--- a/xc/extras/Mesa/src/tnl_dd/t_dd_vertex.h
+++ b/xc/extras/Mesa/src/tnl_dd/t_dd_vertex.h
@@ -1,4 +1,3 @@
-/* $Id: t_dd_vertex.h,v 1.11 2003/03/25 18:46:10 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/varray.c b/xc/extras/Mesa/src/varray.c
index a7732a88a..03052898a 100644
--- a/xc/extras/Mesa/src/varray.c
+++ b/xc/extras/Mesa/src/varray.c
@@ -1,4 +1,3 @@
-/* $Id: varray.c,v 1.23 2003/03/25 18:43:46 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/varray.h b/xc/extras/Mesa/src/varray.h
index 694a3cbc5..98a7733b5 100644
--- a/xc/extras/Mesa/src/varray.h
+++ b/xc/extras/Mesa/src/varray.h
@@ -1,4 +1,3 @@
-/* $Id: varray.h,v 1.16 2003/03/25 18:43:47 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/vpexec.c b/xc/extras/Mesa/src/vpexec.c
index 81d9f60c1..8e6af9c34 100644
--- a/xc/extras/Mesa/src/vpexec.c
+++ b/xc/extras/Mesa/src/vpexec.c
@@ -1,4 +1,3 @@
-/* $Id: vpexec.c,v 1.1 2003/03/26 12:23:23 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -277,11 +276,11 @@ fetch_vector4( const struct vp_src_register *source,
    const GLfloat *src;
 
    if (source->RelAddr) {
-      GLint reg = source->Register + machine->AddressReg;
-      if (reg < VP_PROG_REG_START || reg > VP_PROG_REG_END)
+      const GLint reg = source->Register + machine->AddressReg;
+      if (reg < 0 || reg > VP_NUM_PROG_REGS)
          src = zero;
       else
-         src = machine->Registers[reg];
+         src = machine->Registers[VP_PROG_REG_START + reg];
    }
    else {
       src = machine->Registers[source->Register];
@@ -314,11 +313,11 @@ fetch_vector1( const struct vp_src_register *source,
    const GLfloat *src;
 
    if (source->RelAddr) {
-      GLint reg = source->Register + machine->AddressReg;
-      if (reg < VP_PROG_REG_START || reg > VP_PROG_REG_END)
+      const GLint reg = source->Register + machine->AddressReg;
+      if (reg < 0 || reg > VP_NUM_PROG_REGS)
          src = zero;
       else
-         src = machine->Registers[reg];
+         src = machine->Registers[VP_PROG_REG_START + reg];
    }
    else {
       src = machine->Registers[source->Register];
@@ -438,15 +437,11 @@ _mesa_exec_program(GLcontext *ctx, const struct vp_program *program)
                floor_t0 = (float) floor(t[0]);
                if (floor_t0 > FLT_MAX_EXP) {
                   SET_POS_INFINITY(q[0]);
-                  q[1] = 0.0F;
                   SET_POS_INFINITY(q[2]);
-                  q[3] = 1.0F;
                }
                else if (floor_t0 < FLT_MIN_EXP) {
                   q[0] = 0.0F;
-                  q[1] = 0.0F;
                   q[2] = 0.0F;
-                  q[3] = 0.0F;
                }
                else {
 #ifdef USE_IEEE
@@ -457,10 +452,10 @@ _mesa_exec_program(GLcontext *ctx, const struct vp_program *program)
 #else
                   q[0] = (GLfloat) pow(2.0, floor_t0);
 #endif
-                  q[1] = t[0] - floor_t0;
                   q[2] = (GLfloat) (q[0] * LOG2(q[1]));
-                  q[3] = 1.0F;
                }
+               q[1] = t[0] - floor_t0;
+               q[3] = 1.0F;
                store_vector4( &inst->DstReg, machine, q );
             }
             break;
diff --git a/xc/extras/Mesa/src/vpexec.h b/xc/extras/Mesa/src/vpexec.h
index b79f7f41d..5fed9d365 100644
--- a/xc/extras/Mesa/src/vpexec.h
+++ b/xc/extras/Mesa/src/vpexec.h
@@ -1,4 +1,3 @@
-/* $Id: vpexec.h,v 1.1 2003/03/26 12:23:23 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/vpparse.c b/xc/extras/Mesa/src/vpparse.c
index 6864ba524..4526d79b0 100644
--- a/xc/extras/Mesa/src/vpparse.c
+++ b/xc/extras/Mesa/src/vpparse.c
@@ -1,10 +1,9 @@
-/* $Id: vpparse.c,v 1.1 2003/03/26 12:23:23 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
- * Version:  4.1
+ * Version:  5.0.1
  *
- * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2003  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"),
@@ -1423,7 +1422,7 @@ _mesa_parse_program(GLcontext *ctx, GLenum dstTarget,
       }
       program->Instructions = newInst;
 
-#ifdef DEBUG_foo
+#if 0
       _mesa_printf("--- glLoadProgramNV result ---\n");
       _mesa_print_program(program);
       _mesa_printf("------------------------------\n");
diff --git a/xc/extras/Mesa/src/vpparse.h b/xc/extras/Mesa/src/vpparse.h
index 6bc31c935..2f90f2162 100644
--- a/xc/extras/Mesa/src/vpparse.h
+++ b/xc/extras/Mesa/src/vpparse.h
@@ -1,4 +1,3 @@
-/* $Id: vpparse.h,v 1.1 2003/03/26 12:23:23 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/vpstate.c b/xc/extras/Mesa/src/vpstate.c
index 63d1c0aa2..2918aad93 100644
--- a/xc/extras/Mesa/src/vpstate.c
+++ b/xc/extras/Mesa/src/vpstate.c
@@ -1,4 +1,3 @@
-/* $Id: vpstate.c,v 1.1 2003/03/26 12:23:23 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/vpstate.h b/xc/extras/Mesa/src/vpstate.h
index c3be6f5e0..eb5d7655d 100644
--- a/xc/extras/Mesa/src/vpstate.h
+++ b/xc/extras/Mesa/src/vpstate.h
@@ -1,4 +1,3 @@
-/* $Id: vpstate.h,v 1.1 2003/03/26 12:23:23 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/vtxfmt.c b/xc/extras/Mesa/src/vtxfmt.c
index f09163820..d7b18e4c1 100644
--- a/xc/extras/Mesa/src/vtxfmt.c
+++ b/xc/extras/Mesa/src/vtxfmt.c
@@ -1,4 +1,3 @@
-/* $Id: vtxfmt.c,v 1.8 2003/03/25 18:43:47 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/vtxfmt.h b/xc/extras/Mesa/src/vtxfmt.h
index ac34b08ea..6f6006bd2 100644
--- a/xc/extras/Mesa/src/vtxfmt.h
+++ b/xc/extras/Mesa/src/vtxfmt.h
@@ -1,4 +1,3 @@
-/* $Id: vtxfmt.h,v 1.7 2003/03/25 18:43:47 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/vtxfmt_tmp.h b/xc/extras/Mesa/src/vtxfmt_tmp.h
index 6ae1a4265..0900d6e3f 100644
--- a/xc/extras/Mesa/src/vtxfmt_tmp.h
+++ b/xc/extras/Mesa/src/vtxfmt_tmp.h
@@ -1,4 +1,3 @@
-/* $Id: vtxfmt_tmp.h,v 1.7 2003/03/25 18:43:47 alanh Exp $ */
 
 /*
  * Mesa 3-D graphics library
author	brianp <brianp>	2003-04-03 21:25:08 +0000
committer	brianp <brianp>	2003-04-03 21:25:08 +0000
commit	ca475f853649e01df9410d4d0662323476fff024 (patch)
tree	1c168c94a336895e30872885739ad601173d1e4c /xc/extras/Mesa
parent	b6669829303d04c1aa866e77a65d068e7584895b (diff)