Committing in .

 Modified Files:
 	Mesa/macos/gli_api/gliapi1.h Mesa/macos/gli_api/gliapi2.h
 	Mesa/macos/gli_api/gliapiext.h Mesa/macos/src-gli/fxgli.c
 	Mesa/macos/src-gli/fxgli.h Mesa/macos/src-gli/fxgli2.c
 	Mesa/macos/src-gli/fxgli_tridebug.c Mesa/src/accum.c
 	Mesa/src/accum.h Mesa/src/all.h Mesa/src/alpha.c
 	Mesa/src/alpha.h Mesa/src/attrib.c Mesa/src/attrib.h
 	Mesa/src/bitmap.c Mesa/src/bitmap.h Mesa/src/blend.c
 	Mesa/src/blend.h Mesa/src/buffers.c Mesa/src/buffers.h
 	Mesa/src/clip.c Mesa/src/clip.h Mesa/src/colortab.h
 	Mesa/src/config.c Mesa/src/context.c Mesa/src/context.h
 	Mesa/src/convolve.c Mesa/src/convolve.h Mesa/src/copypix.c
 	Mesa/src/copypix.h Mesa/src/debug.c Mesa/src/depth.c
 	Mesa/src/depth.h Mesa/src/dlist.c Mesa/src/dlist.h
 	Mesa/src/drawpix.c Mesa/src/drawpix.h Mesa/src/enable.c
 	Mesa/src/enable.h Mesa/src/eval.c Mesa/src/eval.h
 	Mesa/src/extensions.c Mesa/src/extensions.h
 	Mesa/src/feedback.c Mesa/src/feedback.h Mesa/src/fog.c
 	Mesa/src/fog.h Mesa/src/get.c Mesa/src/get.h Mesa/src/glapi.c
 	Mesa/src/glthread.h Mesa/src/highpc.c Mesa/src/hint.h
 	Mesa/src/histogram.h Mesa/src/image.c Mesa/src/image.h
 	Mesa/src/imports.c Mesa/src/light.c Mesa/src/light.h
 	Mesa/src/lines.c Mesa/src/lines.h Mesa/src/logic.c
 	Mesa/src/logic.h Mesa/src/masking.c Mesa/src/masking.h
 	Mesa/src/matrix.c Mesa/src/matrix.h Mesa/src/pixel.c
 	Mesa/src/pixel.h Mesa/src/points.c Mesa/src/points.h
 	Mesa/src/polygon.c Mesa/src/polygon.h Mesa/src/rastpos.c
 	Mesa/src/readpix.c Mesa/src/scissor.c Mesa/src/scissor.h
 	Mesa/src/state.c Mesa/src/state.h Mesa/src/stencil.c
 	Mesa/src/stencil.h Mesa/src/teximage.c Mesa/src/teximage.h
 	Mesa/src/texobj.c Mesa/src/texobj.h Mesa/src/texstate.c
 	Mesa/src/texstate.h Mesa/src/texture.c Mesa/src/texture.h
 	Mesa/src/texutil.c Mesa/src/texutil.h Mesa/src/varray.c
 	Mesa/src/varray.h Mesa/src/X/fakeglx.c Mesa/src/X/xm_api.c
 	Mesa/src/X/xm_dd.c Mesa/src/X/xm_line.c Mesa/src/X/xm_span.c
 	Mesa/src/X/xm_tri.c Mesa/src/swrast/s_aaline.c
 	Mesa/src/swrast/s_aaline.h Mesa/src/swrast/s_aatriangle.h
 	Mesa/src/swrast/s_accum.h Mesa/src/swrast/s_alpha.h
 	Mesa/src/swrast/s_alphabuf.h Mesa/src/swrast/s_blend.h
 	Mesa/src/swrast/s_context.c Mesa/src/swrast/s_context.h
 	Mesa/src/swrast/s_depth.h Mesa/src/swrast/s_drawpix.h
 	Mesa/src/swrast/s_feedback.h Mesa/src/swrast/s_fog.h
 	Mesa/src/swrast/s_histogram.h Mesa/src/swrast/s_lines.h
 	Mesa/src/swrast/s_logic.h Mesa/src/swrast/s_masking.h
 	Mesa/src/swrast/s_pb.h Mesa/src/swrast/s_pixeltex.h
 	Mesa/src/swrast/s_points.h Mesa/src/swrast/s_quads.c
 	Mesa/src/swrast/s_quads.h Mesa/src/swrast/s_scissor.h
 	Mesa/src/swrast/s_span.h Mesa/src/swrast/s_stencil.h
 	Mesa/src/swrast/s_texture.h Mesa/src/swrast/s_triangle.h
 	Mesa/src/swrast/s_zoom.h Mesa/src/swrast/swrast.h
 	Mesa/src/swrast_setup/ss_context.h
 	Mesa/src/swrast_setup/ss_triangle.c
 	Mesa/src/swrast_setup/ss_triangle.h
 	Mesa/src/swrast_setup/ss_vb.h Mesa/src/tnl/t_clip.c
 	Mesa/src/tnl/t_clip.h Mesa/src/tnl/t_context.c
 	Mesa/src/tnl/t_context.h Mesa/src/tnl/t_cva.c
 	Mesa/src/tnl/t_cva.h Mesa/src/tnl/t_debug.c
 	Mesa/src/tnl/t_debug.h Mesa/src/tnl/t_dlist.h
 	Mesa/src/tnl/t_eval.c Mesa/src/tnl/t_eval.h
 	Mesa/src/tnl/t_fog.c Mesa/src/tnl/t_fog.h
 	Mesa/src/tnl/t_light.c Mesa/src/tnl/t_light.h
 	Mesa/src/tnl/t_pipeline.c Mesa/src/tnl/t_pipeline.h
 	Mesa/src/tnl/t_shade.c Mesa/src/tnl/t_shade.h
 	Mesa/src/tnl/t_stages.c Mesa/src/tnl/t_stages.h
 	Mesa/src/tnl/t_texture.c Mesa/src/tnl/t_texture.h
 	Mesa/src/tnl/t_trans_elt.c Mesa/src/tnl/t_trans_elt.h
 	Mesa/src/tnl/t_varray.c Mesa/src/tnl/t_varray.h
 	Mesa/src/tnl/t_vb.c Mesa/src/tnl/t_vb.h
 	Mesa/src/tnl/t_vbcull.c Mesa/src/tnl/t_vbcull.h
 	Mesa/src/tnl/t_vbfill.c Mesa/src/tnl/t_vbfill.h
 	Mesa/src/tnl/t_vbindirect.c Mesa/src/tnl/t_vbindirect.h
 	Mesa/src/tnl/t_vbrender.c Mesa/src/tnl/t_vbrender.h
 	Mesa/src/tnl/t_vbxform.c Mesa/src/tnl/t_vbxform.h
 	Mesa/src/tnl/tnl.h
 Added Files:
 	Mesa/src/mtypes.h
 Removed Files:
 	Mesa/src/types.h

 Changed Mesa/src/types to Mesa/src/mtypes.h to avoid conflicts while
compiling on a VMS system.

----------------------------------------------------------------------

67 files changed, 2376 insertions, 664 deletions

diff --git a/src/mesa/main/accum.c b/src/mesa/main/accum.c
index a43472fb595..3f4c1f7d682 100644
--- a/src/mesa/main/accum.c
+++ b/src/mesa/main/accum.c
@@ -1,21 +1,21 @@
-/* $Id: accum.c,v 1.31 2000/10/31 18:09:44 keithw Exp $ */
+/* $Id: accum.c,v 1.32 2000/11/22 07:32:16 joukj Exp $ */
 
 /*
  * Mesa 3-D graphics library
  * Version:  3.5
- * 
+ *
  * Copyright (C) 1999-2000  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"),
  * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
  * and/or sell copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included
  * in all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
@@ -34,7 +34,7 @@
 #include "macros.h"
 #include "mem.h"
 #include "state.h"
-#include "types.h"
+#include "mtypes.h"
 #include "swrast/swrast.h"
 #endif
 
@@ -60,7 +60,7 @@ _mesa_Accum( GLenum op, GLfloat value )
 {
    GET_CURRENT_CONTEXT(ctx);
    GLuint xpos, ypos, width, height;
-   
+
    ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glAccum");
 
    if (ctx->Visual.AccumRedBits == 0 || ctx->DrawBuffer != ctx->ReadBuffer) {
diff --git a/src/mesa/main/accum.h b/src/mesa/main/accum.h
index 18865849566..4c39a3ebc88 100644
--- a/src/mesa/main/accum.h
+++ b/src/mesa/main/accum.h
@@ -1,21 +1,21 @@
-/* $Id: accum.h,v 1.4 2000/10/31 18:09:44 keithw Exp $ */
+/* $Id: accum.h,v 1.5 2000/11/22 07:32:16 joukj Exp $ */
 
 /*
  * Mesa 3-D graphics library
  * Version:  3.1
- * 
+ *
  * Copyright (C) 1999  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"),
  * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
  * and/or sell copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included
  * in all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
@@ -29,7 +29,7 @@
 #define ACCUM_H
 
 
-#include "types.h"
+#include "mtypes.h"
 
 
 extern void
diff --git a/src/mesa/main/attrib.c b/src/mesa/main/attrib.c
index 155af4cbbcf..b8106fad455 100644
--- a/src/mesa/main/attrib.c
+++ b/src/mesa/main/attrib.c
@@ -1,21 +1,21 @@
-/* $Id: attrib.c,v 1.35 2000/11/19 23:10:25 brianp Exp $ */
+/* $Id: attrib.c,v 1.36 2000/11/22 07:32:16 joukj Exp $ */
 
 /*
  * Mesa 3-D graphics library
  * Version:  3.5
- * 
+ *
  * Copyright (C) 1999-2000  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"),
  * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
  * and/or sell copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included
  * in all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
@@ -38,7 +38,7 @@
 #include "mem.h"
 #include "simple_list.h"
 #include "texstate.h"
-#include "types.h"
+#include "mtypes.h"
 #endif
 
 
@@ -761,7 +761,7 @@ _mesa_PopAttrib(void)
 	 case GL_POLYGON_STIPPLE_BIT:
 	    MEMCPY( ctx->PolygonStipple, attr->data, 32*sizeof(GLuint) );
 	    ctx->NewState |= _NEW_POLYGONSTIPPLE;
-	    if (ctx->Driver.PolygonStipple) 
+	    if (ctx->Driver.PolygonStipple)
 	       ctx->Driver.PolygonStipple( ctx, (const GLubyte *) attr->data );
 	    break;
          case GL_SCISSOR_BIT:
@@ -838,9 +838,9 @@ _mesa_PopAttrib(void)
                }
             }
             break;
-         case GL_VIEWPORT_BIT: 
+         case GL_VIEWPORT_BIT:
 	 {
-	    struct gl_viewport_attrib *v = 
+	    struct gl_viewport_attrib *v =
 	       (struct gl_viewport_attrib *)attr->data;
 
 	    ctx->NewState |= _NEW_VIEWPORT;
diff --git a/src/mesa/main/attrib.h b/src/mesa/main/attrib.h
index 22e667bde0d..d478aeb0654 100644
--- a/src/mesa/main/attrib.h
+++ b/src/mesa/main/attrib.h
@@ -1,21 +1,21 @@
-/* $Id: attrib.h,v 1.3 2000/02/02 22:03:31 brianp Exp $ */
+/* $Id: attrib.h,v 1.4 2000/11/22 07:32:16 joukj Exp $ */
 
 /*
  * Mesa 3-D graphics library
  * Version:  3.3
- * 
+ *
  * Copyright (C) 1999-2000  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"),
  * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
  * and/or sell copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included
  * in all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
@@ -29,7 +29,7 @@
 #define ATTRIB_h
 
 
-#include "types.h"
+#include "mtypes.h"
 
 
 extern void
diff --git a/src/mesa/main/blend.c b/src/mesa/main/blend.c
index be7baf35470..621969de244 100644
--- a/src/mesa/main/blend.c
+++ b/src/mesa/main/blend.c
@@ -1,21 +1,21 @@
-/* $Id: blend.c,v 1.25 2000/11/05 18:40:57 keithw Exp $ */
+/* $Id: blend.c,v 1.26 2000/11/22 07:32:16 joukj Exp $ */
 
 /*
  * Mesa 3-D graphics library
  * Version:  3.5
- * 
+ *
  * Copyright (C) 1999-2000  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"),
  * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
  * and/or sell copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included
  * in all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
@@ -34,7 +34,7 @@
 #include "context.h"
 #include "enums.h"
 #include "macros.h"
-#include "types.h"
+#include "mtypes.h"
 #endif
 
 
@@ -298,7 +298,7 @@ _mesa_BlendEquation( GLenum mode )
    }
 
    ctx->NewState |= _NEW_COLOR;
-   
+
    if (ctx->Driver.BlendEquation)
       ctx->Driver.BlendEquation( ctx, mode );
 }
diff --git a/src/mesa/main/blend.h b/src/mesa/main/blend.h
index f495673b4f5..186cee857de 100644
--- a/src/mesa/main/blend.h
+++ b/src/mesa/main/blend.h
@@ -1,21 +1,21 @@
-/* $Id: blend.h,v 1.6 2000/10/31 18:09:44 keithw Exp $ */
+/* $Id: blend.h,v 1.7 2000/11/22 07:32:16 joukj Exp $ */
 
 /*
  * Mesa 3-D graphics library
  * Version:  3.5
- * 
+ *
  * Copyright (C) 1999-2000  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"),
  * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
  * and/or sell copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included
  * in all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
@@ -29,7 +29,7 @@
 #define BLEND_H
 
 
-#include "types.h"
+#include "mtypes.h"
 
 extern void
 _mesa_BlendFunc( GLenum sfactor, GLenum dfactor );
diff --git a/src/mesa/main/buffers.c b/src/mesa/main/buffers.c
index 513f0f69a01..dc802d9e111 100644
--- a/src/mesa/main/buffers.c
+++ b/src/mesa/main/buffers.c
@@ -1,21 +1,21 @@
-/* $Id: buffers.c,v 1.19 2000/11/13 20:02:56 keithw Exp $ */
+/* $Id: buffers.c,v 1.20 2000/11/22 07:32:16 joukj Exp $ */
 
 /*
  * Mesa 3-D graphics library
  * Version:  3.5
- * 
+ *
  * Copyright (C) 1999-2000  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"),
  * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
  * and/or sell copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included
  * in all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
@@ -39,7 +39,7 @@
 #include "mem.h"
 #include "stencil.h"
 #include "state.h"
-#include "types.h"
+#include "mtypes.h"
 #include "swrast/swrast.h"
 #endif
 
@@ -88,7 +88,7 @@ _mesa_ClearColor( GLclampf red, GLclampf green,
 
 
 
-void 
+void
 _mesa_Clear( GLbitfield mask )
 {
    GET_CURRENT_CONTEXT(ctx);
diff --git a/src/mesa/main/buffers.h b/src/mesa/main/buffers.h
index 66a83e671bc..8700e407009 100644
--- a/src/mesa/main/buffers.h
+++ b/src/mesa/main/buffers.h
@@ -1,21 +1,21 @@
-/* $Id: buffers.h,v 1.1 2000/02/02 19:15:03 brianp Exp $ */
+/* $Id: buffers.h,v 1.2 2000/11/22 07:32:16 joukj Exp $ */
 
 /*
  * Mesa 3-D graphics library
  * Version:  3.3
- * 
+ *
  * Copyright (C) 1999-2000  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"),
  * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
  * and/or sell copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included
  * in all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
@@ -29,7 +29,7 @@
 #define BUFFERS_H
 
 
-#include "types.h"
+#include "mtypes.h"
 
 
 extern void
diff --git a/src/mesa/main/clip.c b/src/mesa/main/clip.c
index 77d12814055..2df12db2e5f 100644
--- a/src/mesa/main/clip.c
+++ b/src/mesa/main/clip.c
@@ -1,21 +1,21 @@
-/* $Id: clip.c,v 1.15 2000/11/16 21:05:34 keithw Exp $ */
+/* $Id: clip.c,v 1.16 2000/11/22 07:32:16 joukj Exp $ */
 
 /*
  * Mesa 3-D graphics library
  * Version:  3.3
- * 
+ *
  * Copyright (C) 1999  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"),
  * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
  * and/or sell copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included
  * in all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
@@ -33,7 +33,7 @@
 #include "context.h"
 #include "macros.h"
 #include "mmath.h"
-#include "types.h"
+#include "mtypes.h"
 
 #include "math/m_xform.h"
 #include "math/m_matrix.h"
@@ -77,7 +77,7 @@ _mesa_ClipPlane( GLenum plane, const GLdouble *eq )
     * clipping now takes place.  The clip-space equations are recalculated
     * whenever the projection matrix changes.
     */
-   if (ctx->ModelView.flags & MAT_DIRTY) 
+   if (ctx->ModelView.flags & MAT_DIRTY)
       _math_matrix_analyze( &ctx->ModelView );
 
    gl_transform_vector( ctx->Transform.EyeUserPlane[p], equation,
@@ -89,11 +89,11 @@ _mesa_ClipPlane( GLenum plane, const GLdouble *eq )
     * code in gl_update_state().
     */
    if (ctx->Transform.ClipEnabled[p]) {
-      if (ctx->ProjectionMatrix.flags & MAT_DIRTY) 
+      if (ctx->ProjectionMatrix.flags & MAT_DIRTY)
 	 _math_matrix_analyze( &ctx->ProjectionMatrix );
-      
-      gl_transform_vector( ctx->Transform._ClipUserPlane[p], 
-			   ctx->Transform.EyeUserPlane[p], 
+
+      gl_transform_vector( ctx->Transform._ClipUserPlane[p],
+			   ctx->Transform.EyeUserPlane[p],
 			   ctx->ProjectionMatrix.inv );
    }
 
diff --git a/src/mesa/main/clip.h b/src/mesa/main/clip.h
index a44d6d0fe12..19c5fe6a5dd 100644
--- a/src/mesa/main/clip.h
+++ b/src/mesa/main/clip.h
@@ -1,21 +1,21 @@
-/* $Id: clip.h,v 1.4 2000/11/16 21:05:34 keithw Exp $ */
+/* $Id: clip.h,v 1.5 2000/11/22 07:32:16 joukj Exp $ */
 
 /*
  * Mesa 3-D graphics library
  * Version:  3.1
- * 
+ *
  * Copyright (C) 1999  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"),
  * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
  * and/or sell copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included
  * in all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
@@ -31,7 +31,7 @@
 #ifndef CLIP_H
 #define CLIP_H
 
-#include "types.h"
+#include "mtypes.h"
 
 extern void _mesa_ClipPlane( GLenum plane, const GLdouble *equation );
 
diff --git a/src/mesa/main/colortab.h b/src/mesa/main/colortab.h
index 9e976e0a26b..cf866c66c24 100644
--- a/src/mesa/main/colortab.h
+++ b/src/mesa/main/colortab.h
@@ -1,21 +1,21 @@
-/* $Id: colortab.h,v 1.7 2000/04/17 17:57:04 brianp Exp $ */
+/* $Id: colortab.h,v 1.8 2000/11/22 07:32:16 joukj Exp $ */
 
 /*
  * Mesa 3-D graphics library
  * Version:  3.3
- * 
+ *
  * Copyright (C) 1999-2000  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"),
  * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
  * and/or sell copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included
  * in all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
@@ -29,7 +29,7 @@
 #define COLORTAB_H
 
 
-#include "types.h"
+#include "mtypes.h"
 
 
 extern void
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index 83c64cc3216..170bb37e8c6 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -1,4 +1,4 @@
-/* $Id: context.c,v 1.107 2000/11/19 23:10:25 brianp Exp $ */
+/* $Id: context.c,v 1.108 2000/11/22 07:32:16 joukj Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -52,7 +52,7 @@
 #include "teximage.h"
 #include "texobj.h"
 #include "texture.h"
-#include "types.h"
+#include "mtypes.h"
 #include "varray.h"
 
 #include "math/m_translate.h"
@@ -69,7 +69,7 @@
 
 
 #ifndef MESA_VERBOSE
-int MESA_VERBOSE = 0 
+int MESA_VERBOSE = 0
 /*                 | VERBOSE_PIPELINE */
 /*                 | VERBOSE_IMMEDIATE */
 /*                 | VERBOSE_VARRAY */
@@ -83,7 +83,7 @@ int MESA_VERBOSE = 0
 #endif
 
 #ifndef MESA_DEBUG_FLAGS
-int MESA_DEBUG_FLAGS = 0 
+int MESA_DEBUG_FLAGS = 0
 /*                 | DEBUG_ALWAYS_FLUSH */
 ;
 #endif
@@ -1457,7 +1457,7 @@ _mesa_initialize_context( GLcontext *ctx,
    ctx->Visual = *visual;
    ctx->DrawBuffer = NULL;
    ctx->ReadBuffer = NULL;
-   
+
    if (share_list) {
       /* share the group of display lists of another context */
       ctx->Shared = share_list->Shared;
@@ -1808,13 +1808,13 @@ _mesa_make_current( GLcontext *newCtx, GLframebuffer *buffer )
 
 static void print_info( void )
 {
-   fprintf(stderr, "Mesa GL_VERSION = %s\n", 
+   fprintf(stderr, "Mesa GL_VERSION = %s\n",
 	   (char *) _mesa_GetString(GL_VERSION));
-   fprintf(stderr, "Mesa GL_RENDERER = %s\n", 
+   fprintf(stderr, "Mesa GL_RENDERER = %s\n",
 	   (char *) _mesa_GetString(GL_RENDERER));
-   fprintf(stderr, "Mesa GL_VENDOR = %s\n", 
+   fprintf(stderr, "Mesa GL_VENDOR = %s\n",
 	   (char *) _mesa_GetString(GL_VENDOR));
-   fprintf(stderr, "Mesa GL_EXTENSIONS = %s\n", 
+   fprintf(stderr, "Mesa GL_EXTENSIONS = %s\n",
 	   (char *) _mesa_GetString(GL_EXTENSIONS));
 #if defined(THREADS)
    fprintf(stderr, "Mesa thread-safe: YES\n");
@@ -1837,7 +1837,7 @@ void
 _mesa_make_current2( GLcontext *newCtx, GLframebuffer *drawBuffer,
                      GLframebuffer *readBuffer )
 {
-   if (MESA_VERBOSE) 
+   if (MESA_VERBOSE)
       fprintf(stderr, "_mesa_make_current2()\n");
 
    /* We call this function periodically (just here for now) in
@@ -1863,7 +1863,7 @@ _mesa_make_current2( GLcontext *newCtx, GLframebuffer *drawBuffer,
 	 /* gl_update_state( newCtx ); */
       }
 
-      if (newCtx->Driver.MakeCurrent) 
+      if (newCtx->Driver.MakeCurrent)
 	 newCtx->Driver.MakeCurrent( newCtx, drawBuffer, readBuffer );
 
       /* We can use this to help debug user's problems.  Tell them to set
diff --git a/src/mesa/main/context.h b/src/mesa/main/context.h
index 71ed19119ce..9050fabc759 100644
--- a/src/mesa/main/context.h
+++ b/src/mesa/main/context.h
@@ -1,21 +1,21 @@
-/* $Id: context.h,v 1.21 2000/11/16 21:05:34 keithw Exp $ */
+/* $Id: context.h,v 1.22 2000/11/22 07:32:16 joukj Exp $ */
 
 /*
  * Mesa 3-D graphics library
  * Version:  3.3
- * 
+ *
  * Copyright (C) 1999-2000  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"),
  * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
  * and/or sell copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included
  * in all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
@@ -30,7 +30,7 @@
 
 
 #include "glapi.h"
-#include "types.h"
+#include "mtypes.h"
 
 
 /*
diff --git a/src/mesa/main/convolve.c b/src/mesa/main/convolve.c
index 172afd3dd26..48fb0e1a58b 100644
--- a/src/mesa/main/convolve.c
+++ b/src/mesa/main/convolve.c
@@ -1,4 +1,4 @@
-/* $Id: convolve.c,v 1.13 2000/11/21 23:26:13 brianp Exp $ */
+/* $Id: convolve.c,v 1.14 2000/11/22 07:32:16 joukj Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -41,7 +41,7 @@
 #include "convolve.h"
 #include "context.h"
 #include "image.h"
-#include "types.h"
+#include "mtypes.h"
 #include "swrast/s_span.h" /* XXX SWRAST hack */
 #endif
 
@@ -885,7 +885,7 @@ _mesa_SeparableFilter2D(GLenum target, GLenum internalFormat, GLsizei width, GLs
          ctx->Separable2D.Filter[i * 4 + 3 + colStart] = a;
       }
    }
-   
+
    ctx->NewState |= _NEW_PIXEL;
 }
 
diff --git a/src/mesa/main/convolve.h b/src/mesa/main/convolve.h
index 99c1584fa8f..7d8acc3d58a 100644
--- a/src/mesa/main/convolve.h
+++ b/src/mesa/main/convolve.h
@@ -1,4 +1,4 @@
-/* $Id: convolve.h,v 1.2 2000/08/23 14:31:25 brianp Exp $ */
+/* $Id: convolve.h,v 1.3 2000/11/22 07:32:16 joukj Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -29,7 +29,7 @@
 #define CONVOLVE_H
 
 
-#include "types.h"
+#include "mtypes.h"
 
 
 extern void
diff --git a/src/mesa/main/debug.c b/src/mesa/main/debug.c
index b467499816f..072d6e526ca 100644
--- a/src/mesa/main/debug.c
+++ b/src/mesa/main/debug.c
@@ -1,4 +1,4 @@
-#include "types.h"
+#include "mtypes.h"
 #include "debug.h"
 
 void gl_print_state( const char *msg, GLuint state )
@@ -59,9 +59,9 @@ void gl_print_enable_flags( const char *msg, GLuint flags )
 	   (flags & ENABLE_RESCALE)    ? "rescale, " : "");
 }
 
-void gl_print_tri_caps( const char *name, GLuint flags ) 
+void gl_print_tri_caps( const char *name, GLuint flags )
 {
-   fprintf(stderr, 
+   fprintf(stderr,
 	   "%s: (0x%x) %s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s\n",
 	   name,
 	   flags,
@@ -79,10 +79,10 @@ void gl_print_tri_caps( const char *name, GLuint flags )
 	   (flags & DD_LINE_SMOOTH)         ? "line-smooth, " : "",
 	   (flags & DD_LINE_STIPPLE)        ? "line-stipple, " : "",
 	   (flags & DD_LINE_WIDTH)          ? "line-wide, " : "",
-	   (flags & DD_POINT_SMOOTH)        ? "point-smooth, " : "", 
-	   (flags & DD_POINT_SIZE)          ? "point-size, " : "", 
-	   (flags & DD_POINT_ATTEN)         ? "point-atten, " : "", 
-	   (flags & DD_LIGHTING_CULL)       ? "lighting-cull, " : "", 
+	   (flags & DD_POINT_SMOOTH)        ? "point-smooth, " : "",
+	   (flags & DD_POINT_SIZE)          ? "point-size, " : "",
+	   (flags & DD_POINT_ATTEN)         ? "point-atten, " : "",
+	   (flags & DD_LIGHTING_CULL)       ? "lighting-cull, " : "",
 	   (flags & DD_TRI_CULL_FRONT_BACK) ? "cull-all, " : "",
 	   (flags & DD_STENCIL)             ? "stencil, " : ""
       );
diff --git a/src/mesa/main/depth.c b/src/mesa/main/depth.c
index d9758c52f1c..3660bd51ba6 100644
--- a/src/mesa/main/depth.c
+++ b/src/mesa/main/depth.c
@@ -1,21 +1,21 @@
-/* $Id: depth.c,v 1.23 2000/11/05 18:40:57 keithw Exp $ */
+/* $Id: depth.c,v 1.24 2000/11/22 07:32:16 joukj Exp $ */
 
 /*
  * Mesa 3-D graphics library
  * Version:  3.3
- * 
+ *
  * Copyright (C) 1999-2000  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"),
  * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
  * and/or sell copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included
  * in all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
@@ -34,7 +34,7 @@
 #include "depth.h"
 #include "macros.h"
 #include "mem.h"
-#include "types.h"
+#include "mtypes.h"
 #endif
 
 
diff --git a/src/mesa/main/depth.h b/src/mesa/main/depth.h
index 152d355caf2..2120507fdf8 100644
--- a/src/mesa/main/depth.h
+++ b/src/mesa/main/depth.h
@@ -1,21 +1,21 @@
-/* $Id: depth.h,v 1.9 2000/10/31 18:09:44 keithw Exp $ */
+/* $Id: depth.h,v 1.10 2000/11/22 07:32:16 joukj Exp $ */
 
 /*
  * Mesa 3-D graphics library
  * Version:  3.3
- * 
+ *
  * Copyright (C) 1999-2000  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"),
  * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
  * and/or sell copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included
  * in all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
@@ -29,7 +29,7 @@
 #define DEPTH_H
 
 
-#include "types.h"
+#include "mtypes.h"
 
 
 /*
diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c
index d66c0745a86..01f222caf79 100644
--- a/src/mesa/main/dlist.c
+++ b/src/mesa/main/dlist.c
@@ -1,21 +1,21 @@
-/* $Id: dlist.c,v 1.51 2000/11/16 21:05:34 keithw Exp $ */
+/* $Id: dlist.c,v 1.52 2000/11/22 07:32:16 joukj Exp $ */
 
 /*
  * Mesa 3-D graphics library
  * Version:  3.3
- * 
+ *
  * Copyright (C) 1999-2000  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"),
  * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
  * and/or sell copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included
  * in all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
@@ -67,7 +67,7 @@
 #include "texobj.h"
 #include "teximage.h"
 #include "texstate.h"
-#include "types.h"
+#include "mtypes.h"
 #include "varray.h"
 
 #include "math/m_matrix.h"
@@ -109,7 +109,7 @@ Functions which cause errors if called while compiling a display list:
  */
 
 
-/* How many nodes to allocate at a time: 
+/* How many nodes to allocate at a time:
  * - reduced now that we hold vertices etc. elsewhere.
  */
 #define BLOCK_SIZE 64
@@ -440,7 +440,7 @@ void gl_destroy_list( GLcontext *ctx, GLuint list )
 	 }
       }
    }
-   
+
    _mesa_HashRemove(ctx->Shared->DisplayList, list);
 }
 
@@ -695,7 +695,7 @@ _mesa_alloc_instruction( GLcontext *ctx, int opcode, GLint sz )
  */
 int
 _mesa_alloc_opcode( GLcontext *ctx,
-		    GLuint sz, 
+		    GLuint sz,
 		    void (*execute)( GLcontext *, void * ),
 		    void (*destroy)( GLcontext *, void * ),
 		    void (*print)( GLcontext *, void * ) )
@@ -713,7 +713,7 @@ _mesa_alloc_opcode( GLcontext *ctx,
 
 
 
-/* Mimic the old behaviour of alloc_instruction:  
+/* Mimic the old behaviour of alloc_instruction:
  *   - sz is in units of sizeof(Node)
  *   - return value a pointer to sizeof(Node) before the actual
  *     usable data area.
@@ -1681,7 +1681,7 @@ static void save_EvalMesh1( GLenum mode, GLint i1, GLint i2 )
 }
 
 
-static void save_EvalMesh2( 
+static void save_EvalMesh2(
                         GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2 )
 {
    GET_CURRENT_CONTEXT(ctx);
@@ -2883,7 +2883,7 @@ static void save_Rectfv( const GLfloat *v1, const GLfloat *v2 )
 {
    save_Rectf(v1[0], v1[1], v2[0], v2[1]);
 }
- 
+
 static void save_Recti(GLint x1, GLint y1, GLint x2, GLint y2)
 {
    save_Rectf(x1, y1, x2, y2);
@@ -3322,7 +3322,7 @@ static void save_TexImage3D( GLenum target,
          n[3].i = internalFormat;
          n[4].i = (GLint) width;
          n[5].i = (GLint) height;
-         n[6].i = (GLint) depth; 
+         n[6].i = (GLint) depth;
          n[7].i = border;
          n[8].e = format;
          n[9].e = type;
@@ -3989,10 +3989,10 @@ static void save_PixelTexGenParameterfvSGIS(GLenum target, const GLfloat *value)
 }
 
 
-/* KW: Compile commands  
- * 
+/* KW: Compile commands
+ *
  * Will appear in the list before the vertex buffer containing the
- * command that provoked the error.  I don't see this as a problem.  
+ * command that provoked the error.  I don't see this as a problem.
  */
 void gl_save_error( GLcontext *ctx, GLenum error, const char *s )
 {
@@ -4056,7 +4056,7 @@ static void execute_list( GLcontext *ctx, GLuint list )
       else {
 	 switch (opcode) {
 	 case OPCODE_ERROR:
-	    gl_error( ctx, n[1].e, (const char *) n[2].data ); 
+	    gl_error( ctx, n[1].e, (const char *) n[2].data );
 	    break;
          case OPCODE_ACCUM:
 	    (*ctx->Exec->Accum)( n[1].e, n[2].f );
@@ -4442,7 +4442,7 @@ static void execute_list( GLcontext *ctx, GLuint list )
 		params[0] = n[2].f;
 		params[1] = n[3].f;
 		params[2] = n[4].f;
-		(*ctx->Exec->PointParameterfvEXT)( n[1].e, params ); 
+		(*ctx->Exec->PointParameterfvEXT)( n[1].e, params );
 	    }
 	    break;
 	 case OPCODE_POLYGON_MODE:
@@ -4881,12 +4881,12 @@ _mesa_CallList( GLuint list )
 
    if (MESA_VERBOSE&VERBOSE_API) {
       fprintf(stderr, "glCallList %u\n", list);
-      mesa_print_display_list( list ); 
+      mesa_print_display_list( list );
    }
 
-   save_compile_flag = ctx->CompileFlag;   
+   save_compile_flag = ctx->CompileFlag;
    ctx->CompileFlag = GL_FALSE;
-   
+
    FLUSH_TNL( ctx, (FLUSH_STORED_VERTICES | FLUSH_UPDATE_CURRENT) );
    execute_list( ctx, list );
    ctx->CompileFlag = save_compile_flag;
@@ -5363,7 +5363,7 @@ _mesa_init_dlist_table( struct _glapi_table *table, GLuint tableSize )
    table->SeparableFilter2D = _mesa_SeparableFilter2D;
 
    /* 2. GL_EXT_blend_color */
-#if 0 
+#if 0
    table->BlendColorEXT = save_BlendColorEXT;
 #endif
 
@@ -5636,11 +5636,11 @@ static void print_list( GLcontext *ctx, FILE *f, GLuint list )
             fprintf(f,"Translate %g %g %g\n", n[1].f, n[2].f, n[3].f );
             break;
          case OPCODE_BIND_TEXTURE:
-	    fprintf(f,"BindTexture %s %d\n", gl_lookup_enum_by_nr(n[1].ui), 
+	    fprintf(f,"BindTexture %s %d\n", gl_lookup_enum_by_nr(n[1].ui),
 		    n[2].ui);
 	    break;
          case OPCODE_SHADE_MODEL:
-	    fprintf(f,"ShadeModel %s\n", gl_lookup_enum_by_nr(n[1].ui)); 
+	    fprintf(f,"ShadeModel %s\n", gl_lookup_enum_by_nr(n[1].ui));
 	    break;
 
 	 /*
diff --git a/src/mesa/main/dlist.h b/src/mesa/main/dlist.h
index cbe8a4b47c2..7ec6c2e681b 100644
--- a/src/mesa/main/dlist.h
+++ b/src/mesa/main/dlist.h
@@ -1,21 +1,21 @@
-/* $Id: dlist.h,v 1.7 2000/11/16 21:05:34 keithw Exp $ */
+/* $Id: dlist.h,v 1.8 2000/11/22 07:32:16 joukj Exp $ */
 
 /*
  * Mesa 3-D graphics library
  * Version:  3.5
- * 
+ *
  * Copyright (C) 1999-2000  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"),
  * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
  * and/or sell copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included
  * in all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
@@ -29,7 +29,7 @@
 #define DLIST_H
 
 
-#include "types.h"
+#include "mtypes.h"
 
 
 extern void gl_init_lists( void );
@@ -61,7 +61,7 @@ void *
 _mesa_alloc_instruction( GLcontext *ctx, int opcode, GLint sz );
 
 int
-_mesa_alloc_opcode( GLcontext *ctx, GLuint sz, 
+_mesa_alloc_opcode( GLcontext *ctx, GLuint sz,
 		    void (*execute)( GLcontext *, void * ),
 		    void (*destroy)( GLcontext *, void * ),
 		    void (*print)( GLcontext *, void * ) );
diff --git a/src/mesa/main/drawpix.c b/src/mesa/main/drawpix.c
index 34e1dcf991b..21c74ffdf08 100644
--- a/src/mesa/main/drawpix.c
+++ b/src/mesa/main/drawpix.c
@@ -1,21 +1,21 @@
-/* $Id: drawpix.c,v 1.45 2000/11/16 21:05:34 keithw Exp $ */
+/* $Id: drawpix.c,v 1.46 2000/11/22 07:32:16 joukj Exp $ */
 
 /*
  * Mesa 3-D graphics library
  * Version:  3.5
- * 
+ *
  * Copyright (C) 1999-2000  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"),
  * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
  * and/or sell copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included
  * in all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
@@ -37,7 +37,7 @@
 #include "mem.h"
 #include "mmath.h"
 #include "state.h"
-#include "types.h"
+#include "mtypes.h"
 #include "swrast/swrast.h"
 #endif
 
diff --git a/src/mesa/main/drawpix.h b/src/mesa/main/drawpix.h
index b67731a831a..37c8d3ab99f 100644
--- a/src/mesa/main/drawpix.h
+++ b/src/mesa/main/drawpix.h
@@ -1,21 +1,21 @@
-/* $Id: drawpix.h,v 1.4 2000/10/31 18:09:44 keithw Exp $ */
+/* $Id: drawpix.h,v 1.5 2000/11/22 07:32:16 joukj Exp $ */
 
 /*
  * Mesa 3-D graphics library
  * Version:  3.3
- * 
+ *
  * Copyright (C) 1999  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"),
  * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
  * and/or sell copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included
  * in all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
@@ -29,7 +29,7 @@
 #define DRAWPIXELS_H
 
 
-#include "types.h"
+#include "mtypes.h"
 
 extern void
 _mesa_DrawPixels( GLsizei width, GLsizei height,
diff --git a/src/mesa/main/enable.c b/src/mesa/main/enable.c
index afcb916fe8a..7ac2f79087b 100644
--- a/src/mesa/main/enable.c
+++ b/src/mesa/main/enable.c
@@ -1,21 +1,21 @@
-/* $Id: enable.c,v 1.32 2000/11/16 21:05:35 keithw Exp $ */
+/* $Id: enable.c,v 1.33 2000/11/22 07:32:16 joukj Exp $ */
 
 /*
  * Mesa 3-D graphics library
  * Version:  3.5
- * 
+ *
  * Copyright (C) 1999-2000  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"),
  * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
  * and/or sell copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included
  * in all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
@@ -35,7 +35,7 @@
 #include "macros.h"
 #include "mmath.h"
 #include "simple_list.h"
-#include "types.h"
+#include "mtypes.h"
 #include "enums.h"
 
 #include "math/m_matrix.h"
@@ -52,8 +52,8 @@ void _mesa_set_enable( GLcontext *ctx, GLenum cap, GLboolean state )
 {
    ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH( ctx, "gl_enable/disable" );
 
-   if (MESA_VERBOSE & VERBOSE_API) 
-      fprintf(stderr, "%s %s (newstate is %x)\n", 
+   if (MESA_VERBOSE & VERBOSE_API)
+      fprintf(stderr, "%s %s (newstate is %x)\n",
 	      state ? "glEnable" : "glDisable",
 	      gl_lookup_enum_by_nr(cap),
 	      ctx->NewState);
@@ -88,7 +88,7 @@ void _mesa_set_enable( GLcontext *ctx, GLenum cap, GLboolean state )
       case GL_CLIP_PLANE3:
       case GL_CLIP_PLANE4:
       case GL_CLIP_PLANE5:
-	 if (ctx->Transform.ClipEnabled[cap-GL_CLIP_PLANE0] != state) 
+	 if (ctx->Transform.ClipEnabled[cap-GL_CLIP_PLANE0] != state)
 	 {
 	    GLuint p = cap-GL_CLIP_PLANE0;
 
@@ -98,11 +98,11 @@ void _mesa_set_enable( GLcontext *ctx, GLenum cap, GLboolean state )
 	    if (state) {
 	       ctx->_Enabled |= ENABLE_USERCLIP;
 	       ctx->Transform._AnyClip++;
-	       
+	
 	       if (ctx->ProjectionMatrix.flags & MAT_DIRTY) {
  		  _math_matrix_analyze( &ctx->ProjectionMatrix );
 	       }
-	       
+	
 	       /* This derived state also calculated in clip.c and
 		* from gl_update_state() on changes to EyeUserPlane
 		* and ctx->ProjectionMatrix respectively.
@@ -112,8 +112,8 @@ void _mesa_set_enable( GLcontext *ctx, GLenum cap, GLboolean state )
 				    ctx->ProjectionMatrix.inv );
 	    } else {
 	       if (--ctx->Transform._AnyClip == 0)
-		  ctx->_Enabled &= ~ENABLE_USERCLIP;	       
-	    }	    
+		  ctx->_Enabled &= ~ENABLE_USERCLIP;	
+	    }	
 	 }
 	 break;
       case GL_COLOR_MATERIAL:
@@ -183,7 +183,7 @@ void _mesa_set_enable( GLcontext *ctx, GLenum cap, GLboolean state )
 	    ctx->Light.Light[cap-GL_LIGHT0].Enabled = state;
 
 	    if (state) {
-	       insert_at_tail(&ctx->Light.EnabledList, 
+	       insert_at_tail(&ctx->Light.EnabledList,
 			      &ctx->Light.Light[cap-GL_LIGHT0]);
 	       if (ctx->Light.Enabled)
 		  ctx->_Enabled |= ENABLE_LIGHT;
@@ -279,7 +279,7 @@ void _mesa_set_enable( GLcontext *ctx, GLenum cap, GLboolean state )
 	 ctx->Eval.Map2Normal = state;
 	 ctx->NewState |= _NEW_EVAL;
 	 break;
-      case GL_MAP2_TEXTURE_COORD_1: 
+      case GL_MAP2_TEXTURE_COORD_1:
 	 ctx->Eval.Map2TextureCoord1 = state;
 	 ctx->NewState |= _NEW_EVAL;
 	 break;
@@ -691,7 +691,7 @@ _mesa_IsEnabled( GLenum cap )
 	 return ctx->Eval.Map2Index;
       case GL_MAP2_NORMAL:
 	 return ctx->Eval.Map2Normal;
-      case GL_MAP2_TEXTURE_COORD_1: 
+      case GL_MAP2_TEXTURE_COORD_1:
 	 return ctx->Eval.Map2TextureCoord1;
       case GL_MAP2_TEXTURE_COORD_2:
 	 return ctx->Eval.Map2TextureCoord2;
@@ -837,9 +837,9 @@ _mesa_IsEnabled( GLenum cap )
 static void
 client_state( GLcontext *ctx, GLenum cap, GLboolean state )
 {
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH( ctx, 
-				       (state 
-					? "glEnableClientState" 
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH( ctx,
+				       (state
+					? "glEnableClientState"
 					: "glDisableClientState") );
 
    switch (cap) {
diff --git a/src/mesa/main/enable.h b/src/mesa/main/enable.h
index f0e9dfd6ae8..f47e807c591 100644
--- a/src/mesa/main/enable.h
+++ b/src/mesa/main/enable.h
@@ -1,21 +1,21 @@
-/* $Id: enable.h,v 1.2 1999/11/11 01:22:26 brianp Exp $ */
+/* $Id: enable.h,v 1.3 2000/11/22 07:32:16 joukj Exp $ */
 
 /*
  * Mesa 3-D graphics library
  * Version:  3.3
- * 
+ *
  * Copyright (C) 1999  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"),
  * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
  * and/or sell copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included
  * in all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
@@ -29,7 +29,7 @@
 #define ENABLE_H
 
 
-#include "types.h"
+#include "mtypes.h"
 
 
 extern void
diff --git a/src/mesa/main/eval.c b/src/mesa/main/eval.c
index 1cb8e26d1ac..8bf8929e78b 100644
--- a/src/mesa/main/eval.c
+++ b/src/mesa/main/eval.c
@@ -1,21 +1,21 @@
-/* $Id: eval.c,v 1.15 2000/11/16 21:05:35 keithw Exp $ */
+/* $Id: eval.c,v 1.16 2000/11/22 07:32:16 joukj Exp $ */
 
 /*
  * Mesa 3-D graphics library
  * Version:  3.5
- * 
+ *
  * Copyright (C) 1999-2000  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"),
  * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
  * and/or sell copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included
  * in all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
@@ -48,7 +48,7 @@
 #include "macros.h"
 #include "mem.h"
 #include "mmath.h"
-#include "types.h"
+#include "mtypes.h"
 #endif
 
 
@@ -89,7 +89,7 @@ GLuint _mesa_evaluator_components( GLenum target )
 
 
 /*
- * Copy 1-parametric evaluator control points from user-specified 
+ * Copy 1-parametric evaluator control points from user-specified
  * memory space to a buffer of contiguous control points.
  * Input:  see glMap1f for details
  * Return:  pointer to buffer of contiguous control points or NULL if out
@@ -107,7 +107,7 @@ GLfloat *gl_copy_map_points1f( GLenum target, GLint ustride, GLint uorder,
 
    buffer = (GLfloat *) MALLOC(uorder * size * sizeof(GLfloat));
 
-   if(buffer) 
+   if(buffer)
       for(i=0, p=buffer; i<uorder; i++, points+=ustride)
 	for(k=0; k<size; k++)
 	  *p++ = points[k];
@@ -143,7 +143,7 @@ GLfloat *gl_copy_map_points1d( GLenum target, GLint ustride, GLint uorder,
 
 
 /*
- * Copy 2-parametric evaluator control points from user-specified 
+ * Copy 2-parametric evaluator control points from user-specified
  * memory space to a buffer of contiguous control points.
  * Additional memory is allocated to be used by the horner and
  * de Casteljau evaluation schemes.
@@ -181,7 +181,7 @@ GLfloat *gl_copy_map_points2f( GLenum target,
    /* compute the increment value for the u-loop */
    uinc = ustride - vorder*vstride;
 
-   if (buffer) 
+   if (buffer)
       for (i=0, p=buffer; i<uorder; i++, points += uinc)
 	 for (j=0; j<vorder; j++, points += vstride)
 	    for (k=0; k<size; k++)
@@ -224,7 +224,7 @@ GLfloat *gl_copy_map_points2d(GLenum target,
    /* compute the increment value for the u-loop */
    uinc = ustride - vorder*vstride;
 
-   if (buffer) 
+   if (buffer)
       for (i=0, p=buffer; i<uorder; i++, points += uinc)
 	 for (j=0; j<vorder; j++, points += vstride)
 	    for (k=0; k<size; k++)
@@ -691,7 +691,7 @@ _mesa_Map2d( GLenum target,
 }
 
 
-   
+
 void
 _mesa_GetMapdv( GLenum target, GLenum query, GLdouble *v )
 {
diff --git a/src/mesa/main/eval.h b/src/mesa/main/eval.h
index e2c61657af8..096623752e1 100644
--- a/src/mesa/main/eval.h
+++ b/src/mesa/main/eval.h
@@ -1,21 +1,21 @@
-/* $Id: eval.h,v 1.3 2000/11/16 21:05:35 keithw Exp $ */
+/* $Id: eval.h,v 1.4 2000/11/22 07:32:16 joukj Exp $ */
 
 /*
  * Mesa 3-D graphics library
  * Version:  3.3
- * 
+ *
  * Copyright (C) 1999  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"),
  * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
  * and/or sell copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included
  * in all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
@@ -29,7 +29,7 @@
 #define EVAL_H
 
 
-#include "types.h"
+#include "mtypes.h"
 
 
 extern void gl_init_eval( void );
diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c
index a36e6b00bee..24a0f031a27 100644
--- a/src/mesa/main/extensions.c
+++ b/src/mesa/main/extensions.c
@@ -1,21 +1,21 @@
-/* $Id: extensions.c,v 1.41 2000/11/17 21:01:25 brianp Exp $ */
+/* $Id: extensions.c,v 1.42 2000/11/22 07:32:16 joukj Exp $ */
 
 /*
  * Mesa 3-D graphics library
  * Version:  3.5
- * 
+ *
  * Copyright (C) 1999-2000  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"),
  * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
  * and/or sell copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included
  * in all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
@@ -33,7 +33,7 @@
 #include "extensions.h"
 #include "mem.h"
 #include "simple_list.h"
-#include "types.h"
+#include "mtypes.h"
 #endif
 
 
@@ -44,17 +44,17 @@ struct extension {
    GLint enabled;
    GLboolean *flag;			/* optional flag stored elsewhere */
    char name[MAX_EXT_NAMELEN+1];
-   void (*notify)( GLcontext *, GLboolean ); 
+   void (*notify)( GLcontext *, GLboolean );
 };
 
 #define F(x) (int)&(((struct gl_extensions *)0)->x)
 #define ON GL_TRUE
 #define OFF GL_FALSE
 
-static struct { 
-   GLboolean enabled; 
-   const char *name; 
-   int flag_offset; 
+static struct {
+   GLboolean enabled;
+   const char *name;
+   int flag_offset;
 } default_extensions[] = {
    { ON,  "GL_ARB_imaging",                   F(ARB_imaging) },
    { ON,  "GL_ARB_multitexture",              F(ARB_multitexture) },
@@ -80,7 +80,7 @@ static struct {
    { ON,  "GL_EXT_point_parameters",          F(EXT_point_parameters) },
    { ON,  "GL_EXT_polygon_offset",            F(EXT_polygon_offset) },
    { ON,  "GL_EXT_rescale_normal",            F(EXT_rescale_normal) },
-   { ON,  "GL_EXT_secondary_color",           F(EXT_secondary_color) }, 
+   { ON,  "GL_EXT_secondary_color",           F(EXT_secondary_color) },
    { ON,  "GL_EXT_shared_texture_palette",    F(EXT_shared_texture_palette) },
    { ON,  "GL_EXT_stencil_wrap",              F(EXT_stencil_wrap) },
    { ON,  "GL_EXT_texture3D",                 F(EXT_texture3D) },
@@ -125,9 +125,9 @@ _mesa_enable_sw_extensions(GLcontext *ctx)
 
 
 
-int gl_extensions_add( GLcontext *ctx, 
-		       GLboolean enabled, 
-		       const char *name, 
+int gl_extensions_add( GLcontext *ctx,
+		       GLboolean enabled,
+		       const char *name,
 		       GLboolean *flag_ptr )
 {
    if (ctx->Extensions.ext_string == 0) {
@@ -151,23 +151,23 @@ int gl_extensions_add( GLcontext *ctx,
 static int set_extension( GLcontext *ctx, const char *name, GLint state )
 {
    struct extension *i;
-   foreach( i, ctx->Extensions.ext_list ) 
-      if (strncmp(i->name, name, MAX_EXT_NAMELEN) == 0) 
+   foreach( i, ctx->Extensions.ext_list )
+      if (strncmp(i->name, name, MAX_EXT_NAMELEN) == 0)
 	 break;
 
    if (i == ctx->Extensions.ext_list)
       return 1;
 
    if (i->flag)
-      *(i->flag) = state;      
+      *(i->flag) = state;
    i->enabled = state;
    return 0;
-}   
+}
 
 
 int gl_extensions_enable( GLcontext *ctx, const char *name )
 {
-   if (ctx->Extensions.ext_string == 0) 
+   if (ctx->Extensions.ext_string == 0)
       return set_extension( ctx, name, 1 );
    return 1;
 }
@@ -175,11 +175,11 @@ int gl_extensions_enable( GLcontext *ctx, const char *name )
 
 int gl_extensions_disable( GLcontext *ctx, const char *name )
 {
-   if (ctx->Extensions.ext_string == 0) 
+   if (ctx->Extensions.ext_string == 0)
       return set_extension( ctx, name, 0 );
    return 1;
 }
-      
+
 
 /*
  * Test if the named extension is enabled in this context.
@@ -213,10 +213,10 @@ void gl_extensions_dtr( GLcontext *ctx )
 	 remove_from_list( i );
 	 FREE( i );
       }
-   
+
       FREE(ctx->Extensions.ext_list);
       ctx->Extensions.ext_list = 0;
-   }      
+   }
 }
 
 
@@ -235,7 +235,7 @@ void gl_extensions_ctr( GLcontext *ctx )
       if (default_extensions[i].flag_offset)
 	 ptr = base + default_extensions[i].flag_offset;
 
-      gl_extensions_add( ctx, 
+      gl_extensions_add( ctx,
 			 default_extensions[i].enabled,
 			 default_extensions[i].name,
 			 ptr);
@@ -245,22 +245,22 @@ void gl_extensions_ctr( GLcontext *ctx )
 
 const char *gl_extensions_get_string( GLcontext *ctx )
 {
-   if (ctx->Extensions.ext_string == 0) 
+   if (ctx->Extensions.ext_string == 0)
    {
       struct extension *i;
       char *str;
       GLuint len = 0;
-      foreach (i, ctx->Extensions.ext_list) 
+      foreach (i, ctx->Extensions.ext_list)
 	 if (i->enabled)
 	    len += strlen(i->name) + 1;
-      
-      if (len == 0) 
+
+      if (len == 0)
 	 return "";
 
       str = (char *)MALLOC(len * sizeof(char));
       ctx->Extensions.ext_string = str;
 
-      foreach (i, ctx->Extensions.ext_list) 
+      foreach (i, ctx->Extensions.ext_list)
 	 if (i->enabled) {
 	    strcpy(str, i->name);
 	    str += strlen(str);
@@ -269,6 +269,6 @@ const char *gl_extensions_get_string( GLcontext *ctx )
 
       *(str-1) = 0;
    }
-      
+
    return ctx->Extensions.ext_string;
 }
diff --git a/src/mesa/main/extensions.h b/src/mesa/main/extensions.h
index f11926b1966..5be9ac9b6f8 100644
--- a/src/mesa/main/extensions.h
+++ b/src/mesa/main/extensions.h
@@ -1,21 +1,21 @@
-/* $Id: extensions.h,v 1.10 2000/11/17 21:01:25 brianp Exp $ */
+/* $Id: extensions.h,v 1.11 2000/11/22 07:32:17 joukj Exp $ */
 
 /*
  * Mesa 3-D graphics library
  * Version:  3.3
- * 
+ *
  * Copyright (C) 1999-2000  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"),
  * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
  * and/or sell copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included
  * in all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
@@ -28,7 +28,7 @@
 #ifndef _EXTENSIONS_H_
 #define _EXTENSIONS_H_
 
-#include "types.h"
+#include "mtypes.h"
 
 
 extern void
@@ -37,7 +37,7 @@ _mesa_enable_sw_extensions(GLcontext *ctx);
 
 /* Return 0 on success.
  */
-extern int gl_extensions_add( GLcontext *ctx, GLboolean enabled, 
+extern int gl_extensions_add( GLcontext *ctx, GLboolean enabled,
 			      const char *name, GLboolean *flag_ptr );
 
 extern int gl_extensions_enable( GLcontext *ctx, const char *name );
diff --git a/src/mesa/main/feedback.c b/src/mesa/main/feedback.c
index ea947e9fe49..d9ed6a51734 100644
--- a/src/mesa/main/feedback.c
+++ b/src/mesa/main/feedback.c
@@ -1,21 +1,21 @@
-/* $Id: feedback.c,v 1.16 2000/11/05 18:40:57 keithw Exp $ */
+/* $Id: feedback.c,v 1.17 2000/11/22 07:32:17 joukj Exp $ */
 
 /*
  * Mesa 3-D graphics library
  * Version:  3.3
- * 
+ *
  * Copyright (C) 1999-2000  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"),
  * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
  * and/or sell copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included
  * in all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
@@ -35,7 +35,7 @@
 #include "feedback.h"
 #include "macros.h"
 #include "mmath.h"
-#include "types.h"
+#include "mtypes.h"
 #endif
 
 
@@ -127,7 +127,7 @@ _mesa_PassThrough( GLfloat token )
  */
 void gl_feedback_vertex( GLcontext *ctx,
                          const GLfloat win[4],
-			 const GLfloat color[4], 
+			 const GLfloat color[4],
 			 GLuint index,
 			 const GLfloat texcoord[4] )
 {
diff --git a/src/mesa/main/feedback.h b/src/mesa/main/feedback.h
index 3e95bcb4e28..bc4c7ae207b 100644
--- a/src/mesa/main/feedback.h
+++ b/src/mesa/main/feedback.h
@@ -1,21 +1,21 @@
-/* $Id: feedback.h,v 1.4 2000/11/05 18:40:58 keithw Exp $ */
+/* $Id: feedback.h,v 1.5 2000/11/22 07:32:17 joukj Exp $ */
 
 /*
  * Mesa 3-D graphics library
  * Version:  3.3
- * 
+ *
  * Copyright (C) 1999  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"),
  * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
  * and/or sell copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included
  * in all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
@@ -29,7 +29,7 @@
 #define FEEDBACK_H
 
 
-#include "types.h"
+#include "mtypes.h"
 
 
 #define FEEDBACK_TOKEN( CTX, T )				\
@@ -41,7 +41,7 @@
 
 extern void gl_feedback_vertex( GLcontext *ctx,
                                 const GLfloat win[4],
-                                const GLfloat color[4], 
+                                const GLfloat color[4],
 				GLuint index,
                                 const GLfloat texcoord[4] );
 
diff --git a/src/mesa/main/fog.c b/src/mesa/main/fog.c
index 9593fa2a976..0bf0f4824e2 100644
--- a/src/mesa/main/fog.c
+++ b/src/mesa/main/fog.c
@@ -1,21 +1,21 @@
-/* $Id: fog.c,v 1.29 2000/11/16 21:05:35 keithw Exp $ */
+/* $Id: fog.c,v 1.30 2000/11/22 07:32:17 joukj Exp $ */
 
 /*
  * Mesa 3-D graphics library
  * Version:  3.5
- * 
+ *
  * Copyright (C) 1999-2000  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"),
  * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
  * and/or sell copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included
  * in all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
@@ -32,7 +32,7 @@
 #include "colormac.h"
 #include "context.h"
 #include "fog.h"
-#include "types.h"
+#include "mtypes.h"
 #endif
 
 
@@ -79,7 +79,7 @@ _mesa_Fogiv(GLenum pname, const GLint *params )
 }
 
 
-void 
+void
 _mesa_Fogfv( GLenum pname, const GLfloat *params )
 {
    GET_CURRENT_CONTEXT(ctx);
diff --git a/src/mesa/main/fog.h b/src/mesa/main/fog.h
index 371fb80d8bf..2fdac07f5e7 100644
--- a/src/mesa/main/fog.h
+++ b/src/mesa/main/fog.h
@@ -1,21 +1,21 @@
-/* $Id: fog.h,v 1.10 2000/11/16 21:05:35 keithw Exp $ */
+/* $Id: fog.h,v 1.11 2000/11/22 07:32:17 joukj Exp $ */
 
 /*
  * Mesa 3-D graphics library
  * Version:  3.5
- * 
+ *
  * Copyright (C) 1999-2000  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"),
  * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
  * and/or sell copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included
  * in all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
@@ -29,7 +29,7 @@
 #define FOG_H
 
 
-#include "types.h"
+#include "mtypes.h"
 
 
 
diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c
index b373f70107d..21b9a0f0feb 100644
--- a/src/mesa/main/get.c
+++ b/src/mesa/main/get.c
@@ -1,21 +1,21 @@
-/* $Id: get.c,v 1.42 2000/11/19 23:10:25 brianp Exp $ */
+/* $Id: get.c,v 1.43 2000/11/22 07:32:17 joukj Exp $ */
 
 /*
  * Mesa 3-D graphics library
  * Version:  3.5
- * 
+ *
  * Copyright (C) 1999-2000  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"),
  * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
  * and/or sell copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included
  * in all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
@@ -37,7 +37,7 @@
 #include "get.h"
 #include "macros.h"
 #include "mmath.h"
-#include "types.h"
+#include "mtypes.h"
 
 #include "math/m_matrix.h"
 #endif
@@ -97,7 +97,7 @@ _mesa_GetBooleanv( GLenum pname, GLboolean *params )
    if (!params)
       return;
 
-   if (MESA_VERBOSE & VERBOSE_API) 
+   if (MESA_VERBOSE & VERBOSE_API)
       fprintf(stderr, "glGetBooleanv %s\n", gl_lookup_enum_by_nr(pname));
 
    if (ctx->Driver.GetBooleanv
@@ -844,7 +844,7 @@ _mesa_GetBooleanv( GLenum pname, GLboolean *params )
 	 break;
       case GL_TEXTURE_MATRIX:
 	 for (i=0;i<16;i++) {
-	    params[i] = 
+	    params[i] =
 	       FLOAT_TO_BOOL(ctx->TextureMatrix[texTransformUnit].m[i]);
 	 }
 	 break;
@@ -1035,12 +1035,12 @@ _mesa_GetBooleanv( GLenum pname, GLboolean *params )
 	 break;
       case GL_ALWAYS_FAST_HINT_PGI:
 	 *params = (GLboolean) (ctx->Hint.AllowDrawWin == GL_TRUE &&
-			      ctx->Hint.AllowDrawFrg == GL_FALSE && 
+			      ctx->Hint.AllowDrawFrg == GL_FALSE &&
 			      ctx->Hint.AllowDrawMem == GL_FALSE);
 	 break;
       case GL_ALWAYS_SOFT_HINT_PGI:
 	 *params = (GLboolean) (ctx->Hint.AllowDrawWin == GL_TRUE &&
-			      ctx->Hint.AllowDrawFrg == GL_TRUE && 
+			      ctx->Hint.AllowDrawFrg == GL_TRUE &&
 			      ctx->Hint.AllowDrawMem == GL_TRUE);
 	 break;
       case GL_ALLOW_DRAW_OBJ_HINT_PGI:
@@ -1235,12 +1235,12 @@ _mesa_GetBooleanv( GLenum pname, GLboolean *params )
       case GL_POST_COLOR_MATRIX_COLOR_TABLE_SGI:
          *params = ctx->Pixel.PostColorMatrixColorTableEnabled;
          break;
-	 
+	
       /* GL_EXT_secondary_color */
-      case GL_COLOR_SUM_EXT: 
+      case GL_COLOR_SUM_EXT:
 	 *params = ctx->Fog.ColorSumEnabled;
 	 break;
-      case GL_CURRENT_SECONDARY_COLOR_EXT: 
+      case GL_CURRENT_SECONDARY_COLOR_EXT:
 	 FLUSH_TNL( ctx, FLUSH_UPDATE_CURRENT );
          params[0] = INT_TO_BOOL(ctx->Current.SecondaryColor[0]);
          params[1] = INT_TO_BOOL(ctx->Current.SecondaryColor[1]);
@@ -1249,28 +1249,28 @@ _mesa_GetBooleanv( GLenum pname, GLboolean *params )
       case GL_SECONDARY_COLOR_ARRAY_EXT:
          *params = ctx->Array.SecondaryColor.Enabled;
          break;
-      case GL_SECONDARY_COLOR_ARRAY_TYPE_EXT: 
+      case GL_SECONDARY_COLOR_ARRAY_TYPE_EXT:
 	 *params = ENUM_TO_BOOL(ctx->Array.SecondaryColor.Type);
 	 break;
-      case GL_SECONDARY_COLOR_ARRAY_STRIDE_EXT: 
+      case GL_SECONDARY_COLOR_ARRAY_STRIDE_EXT:
 	 *params = INT_TO_BOOL(ctx->Array.SecondaryColor.Stride);
 	 break;
-      case GL_SECONDARY_COLOR_ARRAY_SIZE_EXT: 
+      case GL_SECONDARY_COLOR_ARRAY_SIZE_EXT:
 	 *params = INT_TO_BOOL(ctx->Array.SecondaryColor.Stride);
 	 break;
 
       /* GL_EXT_fog_coord */
-      case GL_CURRENT_FOG_COORDINATE_EXT: 
+      case GL_CURRENT_FOG_COORDINATE_EXT:
 	 FLUSH_TNL( ctx, FLUSH_UPDATE_CURRENT );
 	 *params = FLOAT_TO_BOOL(ctx->Current.FogCoord);
 	 break;
       case GL_FOG_COORDINATE_ARRAY_EXT:
          *params = ctx->Array.FogCoord.Enabled;
          break;
-      case GL_FOG_COORDINATE_ARRAY_TYPE_EXT: 
+      case GL_FOG_COORDINATE_ARRAY_TYPE_EXT:
 	 *params = ENUM_TO_BOOL(ctx->Array.FogCoord.Type);
 	 break;
-      case GL_FOG_COORDINATE_ARRAY_STRIDE_EXT: 
+      case GL_FOG_COORDINATE_ARRAY_STRIDE_EXT:
 	 *params = INT_TO_BOOL(ctx->Array.FogCoord.Stride);
 	 break;
 
@@ -1296,7 +1296,7 @@ _mesa_GetDoublev( GLenum pname, GLdouble *params )
    if (!params)
       return;
 
-   if (MESA_VERBOSE & VERBOSE_API) 
+   if (MESA_VERBOSE & VERBOSE_API)
       fprintf(stderr, "glGetDoublev %s\n", gl_lookup_enum_by_nr(pname));
 
    if (ctx->Driver.GetDoublev && (*ctx->Driver.GetDoublev)(ctx, pname, params))
@@ -2233,12 +2233,12 @@ _mesa_GetDoublev( GLenum pname, GLdouble *params )
 	 break;
       case GL_ALWAYS_FAST_HINT_PGI:
 	 *params = (GLdouble) (ctx->Hint.AllowDrawWin == GL_TRUE &&
-			      ctx->Hint.AllowDrawFrg == GL_FALSE && 
+			      ctx->Hint.AllowDrawFrg == GL_FALSE &&
 			      ctx->Hint.AllowDrawMem == GL_FALSE);
 	 break;
       case GL_ALWAYS_SOFT_HINT_PGI:
 	 *params = (GLdouble) (ctx->Hint.AllowDrawWin == GL_TRUE &&
-			      ctx->Hint.AllowDrawFrg == GL_TRUE && 
+			      ctx->Hint.AllowDrawFrg == GL_TRUE &&
 			      ctx->Hint.AllowDrawMem == GL_TRUE);
 	 break;
       case GL_ALLOW_DRAW_OBJ_HINT_PGI:
@@ -2435,10 +2435,10 @@ _mesa_GetDoublev( GLenum pname, GLdouble *params )
          break;
 
       /* GL_EXT_secondary_color */
-      case GL_COLOR_SUM_EXT: 
+      case GL_COLOR_SUM_EXT:
 	 *params = (GLdouble) ctx->Fog.ColorSumEnabled;
 	 break;
-      case GL_CURRENT_SECONDARY_COLOR_EXT: 
+      case GL_CURRENT_SECONDARY_COLOR_EXT:
 	 FLUSH_TNL( ctx, FLUSH_UPDATE_CURRENT );
          params[0] = UBYTE_COLOR_TO_FLOAT_COLOR(ctx->Current.SecondaryColor[0]);
          params[1] = UBYTE_COLOR_TO_FLOAT_COLOR(ctx->Current.SecondaryColor[1]);
@@ -2447,28 +2447,28 @@ _mesa_GetDoublev( GLenum pname, GLdouble *params )
       case GL_SECONDARY_COLOR_ARRAY_EXT:
          *params = (GLdouble) ctx->Array.SecondaryColor.Enabled;
          break;
-      case GL_SECONDARY_COLOR_ARRAY_TYPE_EXT: 
+      case GL_SECONDARY_COLOR_ARRAY_TYPE_EXT:
 	 *params = (GLdouble) ctx->Array.SecondaryColor.Type;
 	 break;
-      case GL_SECONDARY_COLOR_ARRAY_STRIDE_EXT: 
+      case GL_SECONDARY_COLOR_ARRAY_STRIDE_EXT:
 	 *params = (GLdouble) ctx->Array.SecondaryColor.Stride;
 	 break;
-      case GL_SECONDARY_COLOR_ARRAY_SIZE_EXT: 
+      case GL_SECONDARY_COLOR_ARRAY_SIZE_EXT:
 	 *params = (GLdouble) ctx->Array.SecondaryColor.Stride;
 	 break;
 
       /* GL_EXT_fog_coord */
-      case GL_CURRENT_FOG_COORDINATE_EXT: 
+      case GL_CURRENT_FOG_COORDINATE_EXT:
 	 FLUSH_TNL( ctx, FLUSH_UPDATE_CURRENT );
 	 *params = (GLdouble) ctx->Current.FogCoord;
 	 break;
       case GL_FOG_COORDINATE_ARRAY_EXT:
          *params = (GLdouble) ctx->Array.FogCoord.Enabled;
          break;
-      case GL_FOG_COORDINATE_ARRAY_TYPE_EXT: 
+      case GL_FOG_COORDINATE_ARRAY_TYPE_EXT:
 	 *params = (GLdouble) ctx->Array.FogCoord.Type;
 	 break;
-      case GL_FOG_COORDINATE_ARRAY_STRIDE_EXT: 
+      case GL_FOG_COORDINATE_ARRAY_STRIDE_EXT:
 	 *params = (GLdouble) ctx->Array.FogCoord.Stride;
 	 break;
 
@@ -2495,7 +2495,7 @@ _mesa_GetFloatv( GLenum pname, GLfloat *params )
    if (!params)
       return;
 
-   if (MESA_VERBOSE & VERBOSE_API) 
+   if (MESA_VERBOSE & VERBOSE_API)
       fprintf(stderr, "glGetFloatv %s\n", gl_lookup_enum_by_nr(pname));
 
    if (ctx->Driver.GetFloatv && (*ctx->Driver.GetFloatv)(ctx, pname, params))
@@ -3434,12 +3434,12 @@ _mesa_GetFloatv( GLenum pname, GLfloat *params )
 	 break;
       case GL_ALWAYS_FAST_HINT_PGI:
 	 *params = (GLfloat) (ctx->Hint.AllowDrawWin == GL_TRUE &&
-			      ctx->Hint.AllowDrawFrg == GL_FALSE && 
+			      ctx->Hint.AllowDrawFrg == GL_FALSE &&
 			      ctx->Hint.AllowDrawMem == GL_FALSE);
 	 break;
       case GL_ALWAYS_SOFT_HINT_PGI:
 	 *params = (GLfloat) (ctx->Hint.AllowDrawWin == GL_TRUE &&
-			      ctx->Hint.AllowDrawFrg == GL_TRUE && 
+			      ctx->Hint.AllowDrawFrg == GL_TRUE &&
 			      ctx->Hint.AllowDrawMem == GL_TRUE);
 	 break;
       case GL_ALLOW_DRAW_OBJ_HINT_PGI:
@@ -3608,10 +3608,10 @@ _mesa_GetFloatv( GLenum pname, GLfloat *params )
          break;
 
       /* GL_EXT_secondary_color */
-      case GL_COLOR_SUM_EXT: 
+      case GL_COLOR_SUM_EXT:
 	 *params = (GLfloat) ctx->Fog.ColorSumEnabled;
 	 break;
-      case GL_CURRENT_SECONDARY_COLOR_EXT: 
+      case GL_CURRENT_SECONDARY_COLOR_EXT:
 	 FLUSH_TNL( ctx, FLUSH_UPDATE_CURRENT );
          params[0] = UBYTE_COLOR_TO_FLOAT_COLOR(ctx->Current.SecondaryColor[0]);
          params[1] = UBYTE_COLOR_TO_FLOAT_COLOR(ctx->Current.SecondaryColor[1]);
@@ -3620,28 +3620,28 @@ _mesa_GetFloatv( GLenum pname, GLfloat *params )
       case GL_SECONDARY_COLOR_ARRAY_EXT:
          *params = (GLfloat) ctx->Array.SecondaryColor.Enabled;
          break;
-      case GL_SECONDARY_COLOR_ARRAY_TYPE_EXT: 
+      case GL_SECONDARY_COLOR_ARRAY_TYPE_EXT:
 	 *params = (GLfloat) ctx->Array.SecondaryColor.Type;
 	 break;
-      case GL_SECONDARY_COLOR_ARRAY_STRIDE_EXT: 
+      case GL_SECONDARY_COLOR_ARRAY_STRIDE_EXT:
 	 *params = (GLfloat) ctx->Array.SecondaryColor.Stride;
 	 break;
-      case GL_SECONDARY_COLOR_ARRAY_SIZE_EXT: 
+      case GL_SECONDARY_COLOR_ARRAY_SIZE_EXT:
 	 *params = (GLfloat) ctx->Array.SecondaryColor.Stride;
 	 break;
 
       /* GL_EXT_fog_coord */
-      case GL_CURRENT_FOG_COORDINATE_EXT: 
+      case GL_CURRENT_FOG_COORDINATE_EXT:
 	 FLUSH_TNL( ctx, FLUSH_UPDATE_CURRENT );
 	 *params = (GLfloat) ctx->Current.FogCoord;
 	 break;
       case GL_FOG_COORDINATE_ARRAY_EXT:
          *params = (GLfloat) ctx->Array.FogCoord.Enabled;
          break;
-      case GL_FOG_COORDINATE_ARRAY_TYPE_EXT: 
+      case GL_FOG_COORDINATE_ARRAY_TYPE_EXT:
 	 *params = (GLfloat) ctx->Array.FogCoord.Type;
 	 break;
-      case GL_FOG_COORDINATE_ARRAY_STRIDE_EXT: 
+      case GL_FOG_COORDINATE_ARRAY_STRIDE_EXT:
 	 *params = (GLfloat) ctx->Array.FogCoord.Stride;
 	 break;
 
@@ -3668,7 +3668,7 @@ _mesa_GetIntegerv( GLenum pname, GLint *params )
    if (!params)
       return;
 
-   if (MESA_VERBOSE & VERBOSE_API) 
+   if (MESA_VERBOSE & VERBOSE_API)
       fprintf(stderr, "glGetIntegerv %s\n", gl_lookup_enum_by_nr(pname));
 
    if (ctx->Driver.GetIntegerv
@@ -4607,12 +4607,12 @@ _mesa_GetIntegerv( GLenum pname, GLint *params )
 	 break;
       case GL_ALWAYS_FAST_HINT_PGI:
 	 *params = (ctx->Hint.AllowDrawWin == GL_TRUE &&
-		    ctx->Hint.AllowDrawFrg == GL_FALSE && 
+		    ctx->Hint.AllowDrawFrg == GL_FALSE &&
 		    ctx->Hint.AllowDrawMem == GL_FALSE);
 	 break;
       case GL_ALWAYS_SOFT_HINT_PGI:
 	 *params =  (ctx->Hint.AllowDrawWin == GL_TRUE &&
-		     ctx->Hint.AllowDrawFrg == GL_TRUE && 
+		     ctx->Hint.AllowDrawFrg == GL_TRUE &&
 		     ctx->Hint.AllowDrawMem == GL_TRUE);
 	 break;
       case GL_ALLOW_DRAW_OBJ_HINT_PGI:
@@ -4648,7 +4648,7 @@ _mesa_GetIntegerv( GLenum pname, GLint *params )
       case GL_ARRAY_ELEMENT_LOCK_COUNT_EXT:
 	 *params = ctx->Array.LockCount;
 	 break;
-	 
+	
       /* GL_ARB_transpose_matrix */
       case GL_TRANSPOSE_COLOR_MATRIX_ARB:
          {
@@ -4810,10 +4810,10 @@ _mesa_GetIntegerv( GLenum pname, GLint *params )
 
 
       /* GL_EXT_secondary_color */
-      case GL_COLOR_SUM_EXT: 
+      case GL_COLOR_SUM_EXT:
 	 *params = (GLint) ctx->Fog.ColorSumEnabled;
 	 break;
-      case GL_CURRENT_SECONDARY_COLOR_EXT: 
+      case GL_CURRENT_SECONDARY_COLOR_EXT:
 	 FLUSH_TNL( ctx, FLUSH_UPDATE_CURRENT );
          params[0] = FLOAT_TO_INT( UBYTE_COLOR_TO_FLOAT_COLOR( ctx->Current.SecondaryColor[0] ) );
          params[1] = FLOAT_TO_INT( UBYTE_COLOR_TO_FLOAT_COLOR( ctx->Current.SecondaryColor[1] ) );
@@ -4822,28 +4822,28 @@ _mesa_GetIntegerv( GLenum pname, GLint *params )
       case GL_SECONDARY_COLOR_ARRAY_EXT:
          *params = (GLint) ctx->Array.SecondaryColor.Enabled;
          break;
-      case GL_SECONDARY_COLOR_ARRAY_TYPE_EXT: 
+      case GL_SECONDARY_COLOR_ARRAY_TYPE_EXT:
 	 *params = (GLint) ctx->Array.SecondaryColor.Type;
 	 break;
-      case GL_SECONDARY_COLOR_ARRAY_STRIDE_EXT: 
+      case GL_SECONDARY_COLOR_ARRAY_STRIDE_EXT:
 	 *params = (GLint) ctx->Array.SecondaryColor.Stride;
 	 break;
-      case GL_SECONDARY_COLOR_ARRAY_SIZE_EXT: 
+      case GL_SECONDARY_COLOR_ARRAY_SIZE_EXT:
 	 *params = (GLint) ctx->Array.SecondaryColor.Stride;
 	 break;
 
       /* GL_EXT_fog_coord */
-      case GL_CURRENT_FOG_COORDINATE_EXT: 
+      case GL_CURRENT_FOG_COORDINATE_EXT:
 	 FLUSH_TNL( ctx, FLUSH_UPDATE_CURRENT );
 	 *params = (GLint) ctx->Current.FogCoord;
 	 break;
       case GL_FOG_COORDINATE_ARRAY_EXT:
          *params = (GLint) ctx->Array.FogCoord.Enabled;
          break;
-      case GL_FOG_COORDINATE_ARRAY_TYPE_EXT: 
+      case GL_FOG_COORDINATE_ARRAY_TYPE_EXT:
 	 *params = (GLint) ctx->Array.FogCoord.Type;
 	 break;
-      case GL_FOG_COORDINATE_ARRAY_STRIDE_EXT: 
+      case GL_FOG_COORDINATE_ARRAY_STRIDE_EXT:
 	 *params = (GLint) ctx->Array.FogCoord.Stride;
 	 break;
 
@@ -4865,7 +4865,7 @@ _mesa_GetPointerv( GLenum pname, GLvoid **params )
    if (!params)
       return;
 
-   if (MESA_VERBOSE & VERBOSE_API) 
+   if (MESA_VERBOSE & VERBOSE_API)
       fprintf(stderr, "glGetPointerv %s\n", gl_lookup_enum_by_nr(pname));
 
    if (ctx->Driver.GetPointerv
diff --git a/src/mesa/main/get.h b/src/mesa/main/get.h
index 609a86ad3c8..530a0b5f05f 100644
--- a/src/mesa/main/get.h
+++ b/src/mesa/main/get.h
@@ -1,21 +1,21 @@
-/* $Id: get.h,v 1.3 1999/11/11 01:22:26 brianp Exp $ */
+/* $Id: get.h,v 1.4 2000/11/22 07:32:17 joukj Exp $ */
 
 /*
  * Mesa 3-D graphics library
  * Version:  3.3
- * 
+ *
  * Copyright (C) 1999  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"),
  * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
  * and/or sell copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included
  * in all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
@@ -29,7 +29,7 @@
 #define GET_H
 
 
-#include "types.h"
+#include "mtypes.h"
 
 
 extern void
diff --git a/src/mesa/main/hint.h b/src/mesa/main/hint.h
index aded0904f30..fa29af6e148 100644
--- a/src/mesa/main/hint.h
+++ b/src/mesa/main/hint.h
@@ -1,21 +1,21 @@
-/* $Id: hint.h,v 1.1 2000/02/02 19:14:56 brianp Exp $ */
+/* $Id: hint.h,v 1.2 2000/11/22 07:32:17 joukj Exp $ */
 
 /*
  * Mesa 3-D graphics library
  * Version:  3.3
- * 
+ *
  * Copyright (C) 1999-2000  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"),
  * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
  * and/or sell copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included
  * in all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
@@ -29,7 +29,7 @@
 #define HINT_H
 
 
-#include "types.h"
+#include "mtypes.h"
 
 
 extern GLboolean
diff --git a/src/mesa/main/histogram.h b/src/mesa/main/histogram.h
index 99683d1244b..66928e772e4 100644
--- a/src/mesa/main/histogram.h
+++ b/src/mesa/main/histogram.h
@@ -1,4 +1,4 @@
-/* $Id: histogram.h,v 1.1 2000/11/10 18:06:14 brianp Exp $ */
+/* $Id: histogram.h,v 1.2 2000/11/22 07:32:17 joukj Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -33,7 +33,7 @@
 #include "all.h"
 #else
 #include "glheader.h"
-#include "types.h"
+#include "mtypes.h"
 #endif
 
 
diff --git a/src/mesa/main/image.c b/src/mesa/main/image.c
index 9083e0975ea..1c3203f63fe 100644
--- a/src/mesa/main/image.c
+++ b/src/mesa/main/image.c
@@ -1,21 +1,21 @@
-/* $Id: image.c,v 1.48 2000/11/10 18:06:14 brianp Exp $ */
+/* $Id: image.c,v 1.49 2000/11/22 07:32:17 joukj Exp $ */
 
 /*
  * Mesa 3-D graphics library
  * Version:  3.5
- * 
+ *
  * Copyright (C) 1999-2000  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"),
  * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
  * and/or sell copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included
  * in all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
@@ -37,7 +37,7 @@
 #include "mem.h"
 #include "mmath.h"
 #include "pixel.h"
-#include "types.h"
+#include "mtypes.h"
 #endif
 
 
@@ -1997,7 +1997,7 @@ extract_float_rgba(GLuint n, GLfloat rgba[][4],
          alphaIndex = 0;
          stride = 1;
          break;
-      case GL_LUMINANCE: 
+      case GL_LUMINANCE:
          redIndex = greenIndex = blueIndex = 0;
          alphaIndex = -1;
          stride = 1;
@@ -2345,7 +2345,7 @@ extract_float_rgba(GLuint n, GLfloat rgba[][4],
             GLuint i;
             for (i = 0; i < n; i ++) {
                GLuint p = uisrc[i];
-               rgba[i][rComp] = UBYTE_COLOR_TO_FLOAT_COLOR((p >> 24)       ); 
+               rgba[i][rComp] = UBYTE_COLOR_TO_FLOAT_COLOR((p >> 24)       );
                rgba[i][gComp] = UBYTE_COLOR_TO_FLOAT_COLOR((p >> 16) & 0xff);
                rgba[i][bComp] = UBYTE_COLOR_TO_FLOAT_COLOR((p >>  8) & 0xff);
                rgba[i][aComp] = UBYTE_COLOR_TO_FLOAT_COLOR((p      ) & 0xff);
@@ -2359,7 +2359,7 @@ extract_float_rgba(GLuint n, GLfloat rgba[][4],
                rgba[i][rComp] = UBYTE_COLOR_TO_FLOAT_COLOR((p      ) & 0xff);
                rgba[i][gComp] = UBYTE_COLOR_TO_FLOAT_COLOR((p >>  8) & 0xff);
                rgba[i][bComp] = UBYTE_COLOR_TO_FLOAT_COLOR((p >> 16) & 0xff);
-               rgba[i][aComp] = UBYTE_COLOR_TO_FLOAT_COLOR((p >> 24)       ); 
+               rgba[i][aComp] = UBYTE_COLOR_TO_FLOAT_COLOR((p >> 24)       );
             }
          }
          break;
@@ -2447,7 +2447,7 @@ _mesa_unpack_chan_color_span( GLcontext *ctx,
                               GLuint transferOps )
 {
    ASSERT(dstFormat == GL_ALPHA ||
-          dstFormat == GL_LUMINANCE || 
+          dstFormat == GL_LUMINANCE ||
           dstFormat == GL_LUMINANCE_ALPHA ||
           dstFormat == GL_INTENSITY ||
           dstFormat == GL_RGB ||
@@ -2648,7 +2648,7 @@ _mesa_unpack_chan_color_span( GLcontext *ctx,
             dstRedIndex = dstGreenIndex = dstBlueIndex = -1;
             dstLuminanceIndex = dstIntensityIndex = -1;
             break;
-         case GL_LUMINANCE: 
+         case GL_LUMINANCE:
             dstLuminanceIndex = 0;
             dstRedIndex = dstGreenIndex = dstBlueIndex = dstAlphaIndex = -1;
             dstIntensityIndex = -1;
@@ -2755,7 +2755,7 @@ _mesa_unpack_float_color_span( GLcontext *ctx,
                                GLuint transferOps, GLboolean clamp )
 {
    ASSERT(dstFormat == GL_ALPHA ||
-          dstFormat == GL_LUMINANCE || 
+          dstFormat == GL_LUMINANCE ||
           dstFormat == GL_LUMINANCE_ALPHA ||
           dstFormat == GL_INTENSITY ||
           dstFormat == GL_RGB ||
@@ -2906,7 +2906,7 @@ _mesa_unpack_float_color_span( GLcontext *ctx,
             dstRedIndex = dstGreenIndex = dstBlueIndex = -1;
             dstLuminanceIndex = dstIntensityIndex = -1;
             break;
-         case GL_LUMINANCE: 
+         case GL_LUMINANCE:
             dstLuminanceIndex = 0;
             dstRedIndex = dstGreenIndex = dstBlueIndex = dstAlphaIndex = -1;
             dstIntensityIndex = -1;
diff --git a/src/mesa/main/image.h b/src/mesa/main/image.h
index bd28ed4197c..db197414596 100644
--- a/src/mesa/main/image.h
+++ b/src/mesa/main/image.h
@@ -1,21 +1,21 @@
-/* $Id: image.h,v 1.13 2000/10/29 18:12:15 brianp Exp $ */
+/* $Id: image.h,v 1.14 2000/11/22 07:32:17 joukj Exp $ */
 
 /*
  * Mesa 3-D graphics library
  * Version:  3.5
- * 
+ *
  * Copyright (C) 1999-2000  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"),
  * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
  * and/or sell copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included
  * in all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
@@ -29,7 +29,7 @@
 #define IMAGE_H
 
 
-#include "types.h"
+#include "mtypes.h"
 
 
 extern const struct gl_pixelstore_attrib _mesa_native_packing;
diff --git a/src/mesa/main/imports.c b/src/mesa/main/imports.c
index aeb51c3e25a..bb3c49376c8 100644
--- a/src/mesa/main/imports.c
+++ b/src/mesa/main/imports.c
@@ -1,4 +1,4 @@
-/* $Id: imports.c,v 1.2 2000/09/27 03:30:49 brianp Exp $ */
+/* $Id: imports.c,v 1.3 2000/11/22 07:32:17 joukj Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -42,7 +42,7 @@
 #include "glheader.h"
 #include "imports.h"
 #include "mem.h"
-#include "types.h"
+#include "mtypes.h"
 
 
 static void *
diff --git a/src/mesa/main/light.c b/src/mesa/main/light.c
index ef31c561ba6..a1c58f8f3cf 100644
--- a/src/mesa/main/light.c
+++ b/src/mesa/main/light.c
@@ -1,21 +1,21 @@
-/* $Id: light.c,v 1.26 2000/11/16 21:05:35 keithw Exp $ */
+/* $Id: light.c,v 1.27 2000/11/22 07:32:17 joukj Exp $ */
 
 /*
  * Mesa 3-D graphics library
  * Version:  3.5
- * 
+ *
  * Copyright (C) 1999-2000  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"),
  * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
  * and/or sell copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included
  * in all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
@@ -37,7 +37,7 @@
 #include "mem.h"
 #include "mmath.h"
 #include "simple_list.h"
-#include "types.h"
+#include "mtypes.h"
 
 #include "math/m_xform.h"
 #include "math/m_matrix.h"
@@ -69,7 +69,7 @@ _mesa_ShadeModel( GLenum mode )
 
          ctx->NewState |= _NEW_LIGHT;
 
-         if (ctx->Driver.ShadeModel) 
+         if (ctx->Driver.ShadeModel)
             (*ctx->Driver.ShadeModel)( ctx, mode );
       }
    }
@@ -114,7 +114,7 @@ _mesa_Lightfv( GLenum light, GLenum pname, const GLfloat *params )
       case GL_POSITION:
 	 /* transform position by ModelView matrix */
 	 TRANSFORM_POINT( l->EyePosition, ctx->ModelView.m, params );
-	 if (l->EyePosition[3] != 0.0F) 
+	 if (l->EyePosition[3] != 0.0F)
 	    l->_Flags |= LIGHT_POSITIONAL;
 	 else
 	    l->_Flags &= ~LIGHT_POSITIONAL;
@@ -143,7 +143,7 @@ _mesa_Lightfv( GLenum light, GLenum pname, const GLfloat *params )
          }
          l->SpotCutoff = params[0];
          l->_CosCutoff = cos(params[0]*DEG2RAD);
-         if (l->_CosCutoff < 0) 
+         if (l->_CosCutoff < 0)
 	    l->_CosCutoff = 0;
 	 if (l->SpotCutoff != 180.0F)
 	    l->_Flags |= LIGHT_SPOT;
@@ -372,7 +372,7 @@ _mesa_LightModelfv( GLenum pname, const GLfloat *params )
             ctx->Light.Model.LocalViewer = GL_TRUE;
          break;
       case GL_LIGHT_MODEL_TWO_SIDE:
-         if (params[0]==0.0) 
+         if (params[0]==0.0)
             ctx->Light.Model.TwoSide = GL_FALSE;
          else
             ctx->Light.Model.TwoSide = GL_TRUE;
@@ -396,7 +396,7 @@ _mesa_LightModelfv( GLenum pname, const GLfloat *params )
          break;
    }
 
-   if (ctx->Driver.LightModelfv) 
+   if (ctx->Driver.LightModelfv)
       ctx->Driver.LightModelfv( ctx, pname, params );
 
    ctx->NewState |= _NEW_LIGHT;
@@ -452,7 +452,7 @@ _mesa_LightModelf( GLenum pname, GLfloat param )
  * Given a face and pname value (ala glColorMaterial), compute a bitmask
  * of the targeted material values.
  */
-GLuint gl_material_bitmask( GLcontext *ctx, GLenum face, GLenum pname, 
+GLuint gl_material_bitmask( GLcontext *ctx, GLenum face, GLenum pname,
 			    GLuint legal,
 			    const char *where )
 {
@@ -497,7 +497,7 @@ GLuint gl_material_bitmask( GLcontext *ctx, GLenum face, GLenum pname,
       gl_error( ctx, GL_INVALID_ENUM, where );
       return 0;
    }
-   
+
    if (bitmask & ~legal) {
       gl_error( ctx, GL_INVALID_ENUM, where );
       return 0;
@@ -519,12 +519,12 @@ GLuint gl_material_bitmask( GLcontext *ctx, GLenum face, GLenum pname,
  *
  * KW: Added code here to keep the precomputed variables uptodate.
  *     This means we can use the faster shade functions when using
- *     GL_COLOR_MATERIAL, and we can also now use the precomputed 
+ *     GL_COLOR_MATERIAL, and we can also now use the precomputed
  *     values in the slower shading functions, which further offsets
  *     the cost of doing this here.
  */
-void gl_update_material( GLcontext *ctx, 
-			 const struct gl_material src[2], 
+void gl_update_material( GLcontext *ctx,
+			 const struct gl_material src[2],
 			 GLuint bitmask )
 {
    struct gl_light *light, *list = &ctx->Light.EnabledList;
@@ -532,10 +532,10 @@ void gl_update_material( GLcontext *ctx,
    if (ctx->Light.ColorMaterialEnabled)
       bitmask &= ~ctx->Light.ColorMaterialBitmask;
 
-   if (MESA_VERBOSE&VERBOSE_IMMEDIATE) 
+   if (MESA_VERBOSE&VERBOSE_IMMEDIATE)
       fprintf(stderr, "gl_update_material, mask 0x%x\n", bitmask);
 
-   if (!bitmask) 
+   if (!bitmask)
       return;
 
    /* update material emission */
@@ -605,7 +605,7 @@ void gl_update_material( GLcontext *ctx,
       SUB_3V( tmp, src[0].Specular, mat->Specular );
       foreach (light, list) {
 	 ACC_SCALE_3V( light->_MatSpecular[0], light->Specular, tmp );
-	 light->_IsMatSpecular[0] = 
+	 light->_IsMatSpecular[0] =
 	    (LEN_SQUARED_3FV(light->_MatSpecular[0]) > 1e-16);
       }
       COPY_4FV( mat->Specular, src[0].Specular );
@@ -616,7 +616,7 @@ void gl_update_material( GLcontext *ctx,
       SUB_3V( tmp, src[1].Specular, mat->Specular );
       foreach (light, list) {
 	 ACC_SCALE_3V( light->_MatSpecular[1], light->Specular, tmp );
-	 light->_IsMatSpecular[1] = 
+	 light->_IsMatSpecular[1] =
 	    (LEN_SQUARED_3FV(light->_MatSpecular[1]) > 1e-16);
       }
       COPY_4FV( mat->Specular, src[1].Specular );
@@ -674,7 +674,7 @@ void gl_update_material( GLcontext *ctx,
  * according to the bitmask in ColorMaterialBitmask, which is
  * set by glColorMaterial().
  */
-void gl_update_color_material( GLcontext *ctx, 
+void gl_update_color_material( GLcontext *ctx,
 			       const GLchan rgba[4] )
 {
    struct gl_light *light, *list = &ctx->Light.EnabledList;
@@ -760,7 +760,7 @@ void gl_update_color_material( GLcontext *ctx,
       SUB_3V( tmp, color, mat->Specular );
       foreach (light, list) {
 	 ACC_SCALE_3V( light->_MatSpecular[0], light->Specular, tmp );
-	 light->_IsMatSpecular[0] = 
+	 light->_IsMatSpecular[0] =
 	    (LEN_SQUARED_3FV(light->_MatSpecular[0]) > 1e-16);
       }
       COPY_4FV( mat->Specular, color );
@@ -772,7 +772,7 @@ void gl_update_color_material( GLcontext *ctx,
       SUB_3V( tmp, color, mat->Specular );
       foreach (light, list) {
 	 ACC_SCALE_3V( light->_MatSpecular[1], light->Specular, tmp );
-	 light->_IsMatSpecular[1] = 
+	 light->_IsMatSpecular[1] =
 	    (LEN_SQUARED_3FV(light->_MatSpecular[1]) > 1e-16);
       }
       COPY_4FV( mat->Specular, color );
@@ -815,8 +815,8 @@ _mesa_ColorMaterial( GLenum face, GLenum mode )
 
    ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glColorMaterial");
 
-   if (MESA_VERBOSE&VERBOSE_API) 
-      fprintf(stderr, "glColorMaterial %s %s\n", 
+   if (MESA_VERBOSE&VERBOSE_API)
+      fprintf(stderr, "glColorMaterial %s %s\n",
 	      gl_lookup_enum_by_nr(face),
 	      gl_lookup_enum_by_nr(mode));
 
@@ -1002,7 +1002,7 @@ _mesa_GetMaterialiv( GLenum face, GLenum pname, GLint *params )
  *   orientation of the facet is later learned, we can determine which
  *   color (or index) to use for rendering.
  *
- *   KW: We now know orientation in advance and only shade for 
+ *   KW: We now know orientation in advance and only shade for
  *       the side or sides which are actually required.
  *
  * Variables:
@@ -1016,7 +1016,7 @@ _mesa_GetMaterialiv( GLenum face, GLenum pname, GLint *params )
  *       // light at infinity
  *       IF local_viewer THEN
  *           _VP_inf_norm = unit vector from V to P      // Precompute
- *       ELSE 
+ *       ELSE
  *           // eye at infinity
  *           _h_inf_norm = Normalize( VP + <0,0,1> )     // Precompute
  *       ENDIF
@@ -1084,7 +1084,7 @@ compute_shine_table( struct gl_shine_tab *tab, GLfloat shininess )
             m[i] = t;
          else
             m[i] = 0.0;
-      }      
+      }
       m[SHINE_TABLE_SIZE] = 1.0;
    }
 
@@ -1099,12 +1099,12 @@ gl_compute_shine_table( GLcontext *ctx, GLuint i, GLfloat shininess )
    struct gl_shine_tab *list = ctx->_ShineTabList;
    struct gl_shine_tab *s;
 
-   foreach(s, list) 
-      if ( DISTSQR(s->shininess, shininess) < 1e-4 ) 
+   foreach(s, list)
+      if ( DISTSQR(s->shininess, shininess) < 1e-4 )
 	 break;
 
    if (s == list) {
-      foreach(s, list) 
+      foreach(s, list)
 	 if (s->refcount == 0)
             break;
 
@@ -1135,8 +1135,8 @@ gl_update_lighting( GLcontext *ctx )
    ctx->_NeedEyeCoords &= ~NEED_EYE_LIGHT;
    ctx->_NeedNormals &= ~NEED_NORMALS_LIGHT;
    ctx->Light._Flags = 0;
-   
-   if (!ctx->Light.Enabled) 
+
+   if (!ctx->Light.Enabled)
       return;
 
    ctx->_NeedNormals |= NEED_NORMALS_LIGHT;
@@ -1148,23 +1148,23 @@ gl_update_lighting( GLcontext *ctx )
       ctx->Light._Flags |= light->_Flags;
    }
 
-   ctx->Light._NeedVertices = 
+   ctx->Light._NeedVertices =
       ((ctx->Light._Flags & (LIGHT_POSITIONAL|LIGHT_SPOT)) ||
        ctx->Light.Model.ColorControl == GL_SEPARATE_SPECULAR_COLOR ||
        ctx->Light.Model.LocalViewer);
-   
-   if ((ctx->Light._Flags & LIGHT_POSITIONAL) || 
-       ctx->Light.Model.LocalViewer) 
+
+   if ((ctx->Light._Flags & LIGHT_POSITIONAL) ||
+       ctx->Light.Model.LocalViewer)
       ctx->_NeedEyeCoords |= NEED_EYE_LIGHT;
-      
-   
+
+
    /* XXX: This test is overkill & needs to be fixed both for software and
     * hardware t&l drivers.  The above should be sufficient & should
-    * be tested to verify this.  
+    * be tested to verify this.
     */
    if (ctx->Light._NeedVertices)
       ctx->_NeedEyeCoords |= NEED_EYE_LIGHT;
-  
+
 
    /* Precompute some shading values.
     */
@@ -1175,26 +1175,26 @@ gl_update_lighting( GLcontext *ctx )
 	 struct gl_material *mat = &ctx->Light.Material[side];
 
 	 COPY_3V(ctx->Light._BaseColor[side], mat->Emission);
-	 ACC_SCALE_3V(ctx->Light._BaseColor[side], 
+	 ACC_SCALE_3V(ctx->Light._BaseColor[side],
 		      ctx->Light.Model.Ambient,
 		      mat->Ambient);
 
 	 FLOAT_COLOR_TO_CHAN(ctx->Light._BaseAlpha[side],
                              ctx->Light.Material[side].Diffuse[3] );
       }
-      
-      foreach (light, &ctx->Light.EnabledList) {	 
+
+      foreach (light, &ctx->Light.EnabledList) {	
 	 for (side=0; side< sides; side++) {
 	    const struct gl_material *mat = &ctx->Light.Material[side];
 	    SCALE_3V( light->_MatDiffuse[side], light->Diffuse, mat->Diffuse );
 	    SCALE_3V( light->_MatAmbient[side], light->Ambient, mat->Ambient );
 	    SCALE_3V( light->_MatSpecular[side], light->Specular,
 		      mat->Specular);
-	    light->_IsMatSpecular[side] = 
+	    light->_IsMatSpecular[side] =
 	       (LEN_SQUARED_3FV(light->_MatSpecular[side]) > 1e-16);
 	 }
       }
-   } 
+   }
    else {
       static const GLfloat ci[3] = { .30, .59, .11 };
       foreach(light, &ctx->Light.EnabledList) {
@@ -1227,14 +1227,14 @@ gl_compute_light_positions( GLcontext *ctx )
    else {
       TRANSFORM_NORMAL( ctx->_EyeZDir, eye_z, ctx->ModelView.m );
    }
-   
+
    foreach (light, &ctx->Light.EnabledList) {
 
       if (ctx->_NeedEyeCoords) {
 	 COPY_4FV( light->_Position, light->EyePosition );
       }
       else {
-	 TRANSFORM_POINT( light->_Position, ctx->ModelView.inv, 
+	 TRANSFORM_POINT( light->_Position, ctx->ModelView.inv,
 			  light->EyePosition );
       }
 
@@ -1250,13 +1250,13 @@ gl_compute_light_positions( GLcontext *ctx )
 	 }
 	 light->_VP_inf_spot_attenuation = 1.0;
       }
-      
+
       if (light->_Flags & LIGHT_SPOT) {
 	 if (ctx->_NeedEyeCoords) {
 	    COPY_3V( light->_NormDirection, light->EyeDirection );
 	 }
          else {
-	    TRANSFORM_NORMAL( light->_NormDirection, 
+	    TRANSFORM_NORMAL( light->_NormDirection,
 			      light->EyeDirection,
 			      ctx->ModelView.m);
 	 }
@@ -1264,14 +1264,14 @@ gl_compute_light_positions( GLcontext *ctx )
 	 NORMALIZE_3FV( light->_NormDirection );
 
 	 if (!(light->_Flags & LIGHT_POSITIONAL)) {
-	    GLfloat PV_dot_dir = - DOT3(light->_VP_inf_norm, 
+	    GLfloat PV_dot_dir = - DOT3(light->_VP_inf_norm,
 					light->_NormDirection);
 
 	    if (PV_dot_dir > light->_CosCutoff) {
 	       double x = PV_dot_dir * (EXP_TABLE_SIZE-1);
 	       int k = (int) x;
-	       light->_VP_inf_spot_attenuation = 
-		  (light->_SpotExpTable[k][0] + 
+	       light->_VP_inf_spot_attenuation =
+		  (light->_SpotExpTable[k][0] +
 		   (x-k)*light->_SpotExpTable[k][1]);
 	    }
 	    else {
diff --git a/src/mesa/main/light.h b/src/mesa/main/light.h
index 4c2589fbf47..134e3782e58 100644
--- a/src/mesa/main/light.h
+++ b/src/mesa/main/light.h
@@ -1,21 +1,21 @@
-/* $Id: light.h,v 1.5 2000/11/16 21:05:35 keithw Exp $ */
+/* $Id: light.h,v 1.6 2000/11/22 07:32:17 joukj Exp $ */
 
 /*
  * Mesa 3-D graphics library
  * Version:  3.5
- * 
+ *
  * Copyright (C) 1999-2000  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"),
  * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
  * and/or sell copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included
  * in all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
@@ -29,7 +29,7 @@
 #define LIGHT_H
 
 
-#include "types.h"
+#include "mtypes.h"
 
 
 extern void
@@ -89,7 +89,7 @@ _mesa_GetMaterialiv( GLenum face, GLenum pname, GLint *params );
 
 /* Lerp between adjacent values in the f(x) lookup table, giving a
  * continuous function, with adequeate overall accuracy.  (Though
- * still pretty good compared to a straight lookup). 
+ * still pretty good compared to a straight lookup).
  */
 #define GET_SHINE_TAB_ENTRY( table, dp, result )			\
 do {									\
@@ -105,8 +105,8 @@ do {									\
 
 
 
-extern GLuint gl_material_bitmask( GLcontext *ctx, 
-				   GLenum face, GLenum pname, 
+extern GLuint gl_material_bitmask( GLcontext *ctx,
+				   GLenum face, GLenum pname,
 				   GLuint legal,
 				   const char * );
 
@@ -115,15 +115,15 @@ extern void gl_set_material( GLcontext *ctx, GLuint bitmask,
 
 extern void gl_compute_spot_exp_table( struct gl_light *l );
 
-extern void gl_compute_shine_table( GLcontext *ctx, GLuint i, 
+extern void gl_compute_shine_table( GLcontext *ctx, GLuint i,
 				    GLfloat shininess );
 
 extern void gl_update_lighting( GLcontext *ctx );
 
 extern void gl_compute_light_positions( GLcontext *ctx );
 
-extern void gl_update_material( GLcontext *ctx, 
-				const struct gl_material src[2], 
+extern void gl_update_material( GLcontext *ctx,
+				const struct gl_material src[2],
 				GLuint bitmask );
 
 extern void gl_update_color_material( GLcontext *ctx, const GLchan rgba[4] );
diff --git a/src/mesa/main/lines.c b/src/mesa/main/lines.c
index 3d9aad52b71..e23d8a4de2d 100644
--- a/src/mesa/main/lines.c
+++ b/src/mesa/main/lines.c
@@ -1,21 +1,21 @@
-/* $Id: lines.c,v 1.22 2000/11/16 21:05:35 keithw Exp $ */
+/* $Id: lines.c,v 1.23 2000/11/22 07:32:17 joukj Exp $ */
 
 /*
  * Mesa 3-D graphics library
  * Version:  3.5
- * 
+ *
  * Copyright (C) 1999-2000  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"),
  * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
  * and/or sell copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included
  * in all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
@@ -36,7 +36,7 @@
 #include "macros.h"
 #include "mmath.h"
 #include "texstate.h"
-#include "types.h"
+#include "mtypes.h"
 #endif
 
 
@@ -50,7 +50,7 @@ _mesa_LineWidth( GLfloat width )
       return;
    }
    ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glLineWidth");
-   
+
    if (ctx->Line.Width != width) {
       ctx->Line.Width = width;
       ctx->_TriangleCaps &= ~DD_LINE_WIDTH;
diff --git a/src/mesa/main/lines.h b/src/mesa/main/lines.h
index 60437c447a3..163663d78be 100644
--- a/src/mesa/main/lines.h
+++ b/src/mesa/main/lines.h
@@ -1,21 +1,21 @@
-/* $Id: lines.h,v 1.3 2000/10/31 18:09:44 keithw Exp $ */
+/* $Id: lines.h,v 1.4 2000/11/22 07:32:17 joukj Exp $ */
 
 /*
  * Mesa 3-D graphics library
  * Version:  3.3
- * 
+ *
  * Copyright (C) 1999  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"),
  * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
  * and/or sell copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included
  * in all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
@@ -29,7 +29,7 @@
 #define LINES_H
 
 
-#include "types.h"
+#include "mtypes.h"
 
 
 extern void
diff --git a/src/mesa/main/matrix.c b/src/mesa/main/matrix.c
index 227f54b73d5..6573a46c02f 100644
--- a/src/mesa/main/matrix.c
+++ b/src/mesa/main/matrix.c
@@ -1,21 +1,21 @@
-/* $Id: matrix.c,v 1.26 2000/11/16 21:05:35 keithw Exp $ */
+/* $Id: matrix.c,v 1.27 2000/11/22 07:32:17 joukj Exp $ */
 
 /*
  * Mesa 3-D graphics library
  * Version:  3.5
- * 
+ *
  * Copyright (C) 1999-2000  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"),
  * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
  * and/or sell copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included
  * in all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
@@ -46,7 +46,7 @@
 #include "matrix.h"
 #include "mem.h"
 #include "mmath.h"
-#include "types.h"
+#include "mtypes.h"
 
 #include "math/m_matrix.h"
 #endif
@@ -95,15 +95,15 @@ _mesa_Frustum( GLdouble left, GLdouble right,
    GET_ACTIVE_MATRIX( ctx,  mat, ctx->NewState, "glFrustrum" );
 
    if (nearval <= 0.0 ||
-       farval <= 0.0 || 
-       nearval == farval || 
-       left == right || 
-       top == bottom) 
+       farval <= 0.0 ||
+       nearval == farval ||
+       left == right ||
+       top == bottom)
    {
       gl_error( ctx,  GL_INVALID_VALUE, "glFrustum" );
       return;
    }
-   
+
    _math_matrix_frustrum( mat, left, right, bottom, top, nearval, farval );
 }
 
@@ -117,10 +117,10 @@ _mesa_Ortho( GLdouble left, GLdouble right,
    GLmatrix *mat = 0;
 
    GET_ACTIVE_MATRIX( ctx,  mat, ctx->NewState, "glOrtho" );
-   
-   if (left == right || 
-       bottom == top || 
-       nearval == farval) 
+
+   if (left == right ||
+       bottom == top ||
+       nearval == farval)
    {
       gl_error( ctx,  GL_INVALID_VALUE, "gl_Ortho" );
       return;
@@ -156,7 +156,7 @@ _mesa_PushMatrix( void )
    ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glPushMatrix");
 
    if (MESA_VERBOSE&VERBOSE_API)
-      fprintf(stderr, "glPushMatrix %s\n", 
+      fprintf(stderr, "glPushMatrix %s\n",
 	      gl_lookup_enum_by_nr(ctx->Transform.MatrixMode));
 
    switch (ctx->Transform.MatrixMode) {
@@ -209,7 +209,7 @@ _mesa_PopMatrix( void )
    ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glPopMatrix");
 
    if (MESA_VERBOSE&VERBOSE_API)
-      fprintf(stderr, "glPopMatrix %s\n", 
+      fprintf(stderr, "glPopMatrix %s\n",
 	      gl_lookup_enum_by_nr(ctx->Transform.MatrixMode));
 
    switch (ctx->Transform.MatrixMode) {
@@ -306,7 +306,7 @@ _mesa_MultMatrixf( const GLfloat *m )
 
 
 /*
- * Multiply the active matrix by an arbitary matrix.  
+ * Multiply the active matrix by an arbitary matrix.
  */
 void
 _mesa_MultMatrixd( const GLdouble *m )
@@ -450,7 +450,7 @@ gl_Viewport( GLcontext *ctx, GLint x, GLint y, GLsizei width, GLsizei height )
 
    if (MESA_VERBOSE & VERBOSE_API)
       fprintf(stderr, "glViewport %d %d %d %d\n", x, y, width, height);
-   
+
    /* clamp width, and height to implementation dependent range */
    width  = CLAMP( width,  1, MAX_WIDTH );
    height = CLAMP( height, 1, MAX_HEIGHT );
@@ -503,7 +503,7 @@ _mesa_DepthRange( GLclampd nearval, GLclampd farval )
    ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glDepthRange");
 
    if (MESA_VERBOSE&VERBOSE_API)
-      fprintf(stderr, "glDepthRange %f %f\n", nearval, farval); 
+      fprintf(stderr, "glDepthRange %f %f\n", nearval, farval);
 
    n = (GLfloat) CLAMP( nearval, 0.0, 1.0 );
    f = (GLfloat) CLAMP( farval, 0.0, 1.0 );
diff --git a/src/mesa/main/matrix.h b/src/mesa/main/matrix.h
index fce9dace657..f49a3f16937 100644
--- a/src/mesa/main/matrix.h
+++ b/src/mesa/main/matrix.h
@@ -1,21 +1,21 @@
-/* $Id: matrix.h,v 1.9 2000/11/16 21:05:35 keithw Exp $ */
+/* $Id: matrix.h,v 1.10 2000/11/22 07:32:17 joukj Exp $ */
 
 /*
  * Mesa 3-D graphics library
  * Version:  3.5
- * 
+ *
  * Copyright (C) 1999-2000  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"),
  * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
  * and/or sell copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included
  * in all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
@@ -29,7 +29,7 @@
 #define MATRIX_H
 
 
-#include "types.h"
+#include "mtypes.h"
 
 
 #ifdef VMS
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
new file mode 100644
index 00000000000..03ac0c4f2a3
--- /dev/null
+++ b/src/mesa/main/mtypes.h
@@ -0,0 +1,1712 @@
+/* $Id: mtypes.h,v 1.1 2000/11/22 07:32:17 joukj Exp $ */
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.5
+ * 
+ * Copyright (C) 1999-2000  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"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * 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.
+ */
+
+
+#ifndef TYPES_H
+#define TYPES_H
+ 
+
+#include "glheader.h"
+#include "config.h"		/* Hardwired parameters */
+#include "fixed.h"		/* GLfixed */
+#include "glapitable.h"
+#include "glthread.h"
+
+#include "math/m_matrix.h"	/* GLmatrix */
+#include "math/m_translate.h"	/* trans_XXX_func */
+
+#if defined(MESA_TRACE)
+#include "Trace/tr_context.h"
+#endif
+
+
+/* This is a macro on IRIX */
+#ifdef _P
+#undef _P
+#endif
+
+
+/* Please try to mark derived values with a leading underscore ('_').
+ */
+
+/*
+ * Color channel data type:
+ */
+#if CHAN_BITS == 8
+   typedef GLubyte GLchan;
+#define CHAN_MAX 255
+#define CHAN_MAXF 255.0F
+#define CHAN_TYPE GL_UNSIGNED_BYTE
+#elif CHAN_BITS == 16
+   typedef GLushort GLchan;
+#define CHAN_MAX 65535
+#define CHAN_MAXF 65535.0F
+#define CHAN_TYPE GL_UNSIGNED_SHORT
+#elif CHAN_BITS == 32
+   typedef GLfloat GLchan;
+#define CHAN_MAX 1.0
+#define CHAN_MAXF 1.0F
+#define CHAN_TYPE GL_FLOAT
+#else
+#error  illegal number of color channel bits
+#endif
+
+
+/*
+ * Accumulation buffer data type:
+ */
+#if ACCUM_BITS==8
+   typedef GLbyte GLaccum;
+#elif ACCUM_BITS==16
+   typedef GLshort GLaccum;
+#else
+#  error "illegal number of accumulation bits"
+#endif
+
+
+/*
+ * Stencil buffer data type:
+ */
+#if STENCIL_BITS==8
+   typedef GLubyte GLstencil;
+#  define STENCIL_MAX 0xff
+#elif STENCIL_BITS==16
+   typedef GLushort GLstencil;
+#  define STENCIL_MAX 0xffff
+#else
+#  error "illegal number of stencil bits"
+#endif
+
+
+/*
+ * Depth buffer data type:
+ */
+typedef GLuint GLdepth;  /* Must be 32-bits! */
+
+
+/*
+ * Some forward type declarations
+ */
+struct _mesa_HashTable;
+struct gl_texture_object;
+typedef struct gl_visual GLvisual;
+typedef struct gl_frame_buffer GLframebuffer;
+typedef struct __GLcontextRec GLcontext;
+
+
+
+/* Data structure for color tables */
+struct gl_color_table {
+   GLvoid *Table;
+   GLboolean FloatTable;  /* entries stored as floats? (or GLchan type) */
+   GLuint Size;           /* number of entries (rows) in table */
+   GLenum Format;
+   GLenum IntFormat;
+   GLint RedSize;
+   GLint GreenSize;
+   GLint BlueSize;
+   GLint AlphaSize;
+   GLint LuminanceSize;
+   GLint IntensitySize;
+};
+
+
+/*
+ * Bit flags used for updating material values.
+ */
+#define FRONT_AMBIENT_BIT     0x1
+#define BACK_AMBIENT_BIT      0x2
+#define FRONT_DIFFUSE_BIT     0x4
+#define BACK_DIFFUSE_BIT      0x8
+#define FRONT_SPECULAR_BIT   0x10
+#define BACK_SPECULAR_BIT    0x20
+#define FRONT_EMISSION_BIT   0x40
+#define BACK_EMISSION_BIT    0x80
+#define FRONT_SHININESS_BIT 0x100
+#define BACK_SHININESS_BIT  0x200
+#define FRONT_INDEXES_BIT   0x400
+#define BACK_INDEXES_BIT    0x800
+
+#define FRONT_MATERIAL_BITS	(FRONT_EMISSION_BIT | FRONT_AMBIENT_BIT | \
+				 FRONT_DIFFUSE_BIT | FRONT_SPECULAR_BIT | \
+				 FRONT_SHININESS_BIT | FRONT_INDEXES_BIT)
+
+#define BACK_MATERIAL_BITS	(BACK_EMISSION_BIT | BACK_AMBIENT_BIT | \
+				 BACK_DIFFUSE_BIT | BACK_SPECULAR_BIT | \
+				 BACK_SHININESS_BIT | BACK_INDEXES_BIT)
+
+#define ALL_MATERIAL_BITS	(FRONT_MATERIAL_BITS | BACK_MATERIAL_BITS)
+
+
+
+/*
+ * Specular exponent and material shininess lookup table sizes:
+ */
+#define EXP_TABLE_SIZE 512
+#define SHINE_TABLE_SIZE 256
+
+struct gl_shine_tab {
+   struct gl_shine_tab *next, *prev;
+   GLfloat tab[SHINE_TABLE_SIZE+1];
+   GLfloat shininess;
+   GLuint refcount;
+};
+
+
+struct gl_light {
+   struct gl_light *next;	        /* double linked list with sentinel */
+   struct gl_light *prev;
+
+   GLfloat Ambient[4];		/* ambient color */
+   GLfloat Diffuse[4];		/* diffuse color */
+   GLfloat Specular[4];		/* specular color */
+   GLfloat EyePosition[4];	/* position in eye coordinates */
+   GLfloat EyeDirection[4];	/* spotlight dir in eye coordinates */
+   GLfloat SpotExponent;
+   GLfloat SpotCutoff;		/* in degress */
+   GLfloat _CosCutoff;		/* = MAX(0, cos(SpotCutoff)) */
+   GLfloat ConstantAttenuation;
+   GLfloat LinearAttenuation;
+   GLfloat QuadraticAttenuation;
+   GLboolean Enabled;		/* On/off flag */
+
+   /* Derived fields */
+   GLuint _Flags;		/* State */
+
+   GLfloat _Position[4];	/* position in eye/obj coordinates */
+   GLfloat _VP_inf_norm[3];	/* Norm direction to infinite light */
+   GLfloat _h_inf_norm[3];	/* Norm( _VP_inf_norm + <0,0,1> ) */
+   GLfloat _NormDirection[4];	/* normalized spotlight direction */
+   GLfloat _VP_inf_spot_attenuation; 
+
+   GLfloat _SpotExpTable[EXP_TABLE_SIZE][2];  /* to replace a pow() call */
+   GLfloat _MatAmbient[2][3];	/* material ambient * light ambient */
+   GLfloat _MatDiffuse[2][3];	/* material diffuse * light diffuse */
+   GLfloat _MatSpecular[2][3];	/* material spec * light specular */
+   GLfloat _dli;			/* CI diffuse light intensity */
+   GLfloat _sli;			/* CI specular light intensity */
+   GLboolean _IsMatSpecular[2];
+};
+
+
+struct gl_lightmodel {
+   GLfloat Ambient[4];		/* ambient color */
+   GLboolean LocalViewer;	/* Local (or infinite) view point? */
+   GLboolean TwoSide;		/* Two (or one) sided lighting? */
+   GLenum ColorControl;		/* either GL_SINGLE_COLOR */
+				/* or GL_SEPARATE_SPECULAR_COLOR */
+};
+
+
+/* Move to using pointers to this struct in the immediate structs -
+ * this is too big to keep 94 unused copies (7K) lying around in
+ * display lists.  
+ */
+struct gl_material 
+{
+   GLfloat Ambient[4];
+   GLfloat Diffuse[4];
+   GLfloat Specular[4];
+   GLfloat Emission[4];
+   GLfloat Shininess;
+   GLfloat AmbientIndex;	/* for color index lighting */
+   GLfloat DiffuseIndex;	/* for color index lighting */
+   GLfloat SpecularIndex;	/* for color index lighting */
+};
+
+
+
+
+
+/*
+ * Attribute structures:
+ *    We define a struct for each attribute group to make pushing and
+ *    popping attributes easy.  Also it's a good organization.
+ */
+
+struct gl_accum_attrib {
+   GLfloat ClearColor[4];	/* Accumulation buffer clear color */
+};
+
+
+/*
+ * Used in DrawDestMask below
+ */
+#define FRONT_LEFT_BIT  1
+#define FRONT_RIGHT_BIT 2
+#define BACK_LEFT_BIT   4
+#define BACK_RIGHT_BIT  8
+
+
+struct gl_colorbuffer_attrib {
+   GLuint ClearIndex;			/* Index to use for glClear */
+   GLfloat ClearColor[4];		/* Color to use for glClear */
+
+   GLuint IndexMask;			/* Color index write mask */
+   GLubyte ColorMask[4];		/* Each flag is 0xff or 0x0 */
+
+   GLenum DrawBuffer;			/* Which buffer to draw into */
+   GLenum DriverDrawBuffer;		/* Current device driver dest buffer */
+   GLboolean MultiDrawBuffer;		/* Drawing to mutliple buffers? */
+   GLubyte DrawDestMask;		/* bitwise-OR of bitflags above */
+
+   /* alpha testing */
+   GLboolean AlphaEnabled;		/* Alpha test enabled flag */
+   GLenum AlphaFunc;			/* Alpha test function */
+   GLchan AlphaRef;			/* Alpha ref value as GLchan */
+
+   /* blending */
+   GLboolean BlendEnabled;		/* Blending enabled flag */
+   GLenum BlendSrcRGB;			/* Blending source operator */
+   GLenum BlendDstRGB;			/* Blending destination operator */
+   GLenum BlendSrcA;			/* GL_INGR_blend_func_separate */
+   GLenum BlendDstA;			/* GL_INGR_blend_func_separate */
+   GLenum BlendEquation;
+   GLfloat BlendColor[4];
+
+   /* logic op */
+   GLenum LogicOp;			/* Logic operator */
+   GLboolean IndexLogicOpEnabled;	/* Color index logic op enabled flag */
+   GLboolean ColorLogicOpEnabled;	/* RGBA logic op enabled flag */
+
+   GLboolean DitherFlag;		/* Dither enable flag */
+};
+
+
+struct gl_current_attrib {
+   /* These values valid only when FLUSH_TNL( FLUSH_UPDATE_CURRENT )
+    * has been called.
+    */
+   GLfloat Normal[3];				/* Current vertex normal */
+   GLchan Color[4];				/* Current RGBA color */
+   GLchan SecondaryColor[4];			/* Current secondary color */
+   GLfloat FogCoord;			        /* Current Fog coord */
+   GLuint Index;				/* Current color index */
+   GLboolean EdgeFlag;				/* Current edge flag */
+   GLfloat Texcoord[MAX_TEXTURE_UNITS][4];	/* Current texture coords */
+	
+   /* These values are always valid.
+    */
+   GLfloat RasterPos[4];			/* Current raster position */
+   GLfloat RasterDistance;			/* Current raster distance */
+   GLfloat RasterColor[4];			/* Current raster color */
+   GLuint  RasterIndex;				/* Current raster index */
+   GLfloat *RasterTexCoord;			/* Current raster texcoord*/
+   GLfloat RasterMultiTexCoord[MAX_TEXTURE_UNITS][4];
+   GLboolean RasterPosValid;			/* Raster po valid flag */
+};
+
+
+struct gl_depthbuffer_attrib {
+   GLenum Func;			/* Function for depth buffer compare */
+   GLfloat Clear;		/* Value to clear depth buffer to */
+   GLboolean Test;		/* Depth buffering enabled flag */
+   GLboolean Mask;		/* Depth buffer writable? */
+   GLboolean OcclusionTest;	/* GL_HP_occlusion_test */
+};
+
+
+struct gl_enable_attrib {
+   GLboolean AlphaTest;
+   GLboolean AutoNormal;
+   GLboolean Blend;
+   GLboolean ClipPlane[MAX_CLIP_PLANES];
+   GLboolean ColorMaterial;
+   GLboolean Convolution1D;
+   GLboolean Convolution2D;
+   GLboolean Separable2D;
+   GLboolean CullFace;
+   GLboolean DepthTest;
+   GLboolean Dither;
+   GLboolean Fog;
+   GLboolean Histogram;
+   GLboolean Light[MAX_LIGHTS];
+   GLboolean Lighting;
+   GLboolean LineSmooth;
+   GLboolean LineStipple;
+   GLboolean IndexLogicOp;
+   GLboolean ColorLogicOp;
+   GLboolean Map1Color4;
+   GLboolean Map1Index;
+   GLboolean Map1Normal;
+   GLboolean Map1TextureCoord1;
+   GLboolean Map1TextureCoord2;
+   GLboolean Map1TextureCoord3;
+   GLboolean Map1TextureCoord4;
+   GLboolean Map1Vertex3;
+   GLboolean Map1Vertex4;
+   GLboolean Map2Color4;
+   GLboolean Map2Index;
+   GLboolean Map2Normal;
+   GLboolean Map2TextureCoord1;
+   GLboolean Map2TextureCoord2;
+   GLboolean Map2TextureCoord3;
+   GLboolean Map2TextureCoord4;
+   GLboolean Map2Vertex3;
+   GLboolean Map2Vertex4;
+   GLboolean MinMax;
+   GLboolean Normalize;
+   GLboolean PixelTexture;
+   GLboolean PointSmooth;
+   GLboolean PolygonOffsetPoint;
+   GLboolean PolygonOffsetLine;
+   GLboolean PolygonOffsetFill;
+   GLboolean PolygonSmooth;
+   GLboolean PolygonStipple;
+   GLboolean RescaleNormals;
+   GLboolean Scissor;
+   GLboolean Stencil;
+   GLuint Texture[MAX_TEXTURE_UNITS];
+   GLuint TexGen[MAX_TEXTURE_UNITS];
+};
+
+
+struct gl_eval_attrib {
+   /* Enable bits */
+   GLboolean Map1Color4;
+   GLboolean Map1Index;
+   GLboolean Map1Normal;
+   GLboolean Map1TextureCoord1;
+   GLboolean Map1TextureCoord2;
+   GLboolean Map1TextureCoord3;
+   GLboolean Map1TextureCoord4;
+   GLboolean Map1Vertex3;
+   GLboolean Map1Vertex4;
+   GLboolean Map2Color4;
+   GLboolean Map2Index;
+   GLboolean Map2Normal;
+   GLboolean Map2TextureCoord1;
+   GLboolean Map2TextureCoord2;
+   GLboolean Map2TextureCoord3;
+   GLboolean Map2TextureCoord4;
+   GLboolean Map2Vertex3;
+   GLboolean Map2Vertex4;
+   GLboolean AutoNormal;
+   /* Map Grid endpoints and divisions and calculated du values */
+   GLint MapGrid1un;
+   GLfloat MapGrid1u1, MapGrid1u2, MapGrid1du;
+   GLint MapGrid2un, MapGrid2vn;
+   GLfloat MapGrid2u1, MapGrid2u2, MapGrid2du;
+   GLfloat MapGrid2v1, MapGrid2v2, MapGrid2dv;
+};
+
+
+struct gl_fog_attrib {
+   GLboolean Enabled;		/* Fog enabled flag */
+   GLfloat Color[4];		/* Fog color */
+   GLfloat Density;		/* Density >= 0.0 */
+   GLfloat Start;		/* Start distance in eye coords */
+   GLfloat End;			/* End distance in eye coords */
+   GLfloat Index;		/* Fog index */
+   GLenum Mode;			/* Fog mode */
+   GLboolean ColorSumEnabled;
+   GLenum FogCoordinateSource;
+};
+
+
+struct gl_hint_attrib {
+   /* always one of GL_FASTEST, GL_NICEST, or GL_DONT_CARE */
+   GLenum PerspectiveCorrection;
+   GLenum PointSmooth;
+   GLenum LineSmooth;
+   GLenum PolygonSmooth;
+   GLenum Fog;
+
+   /* GL_PGI_misc_hints */
+   GLenum AllowDrawWin;
+   GLenum AllowDrawFrg;
+   GLenum AllowDrawMem;
+   GLenum StrictLighting;
+
+   /* GL_EXT_clip_volume_hint */
+   GLenum ClipVolumeClipping;
+
+   /* GL_ARB_texture_compression */
+   GLenum TextureCompression;
+};
+
+
+struct gl_histogram_attrib {
+   GLuint Width;
+   GLint Format;
+   GLboolean Sink;
+   GLuint RedSize;
+   GLuint GreenSize;
+   GLuint BlueSize;
+   GLuint AlphaSize;
+   GLuint LuminanceSize;
+   GLuint Count[HISTOGRAM_TABLE_SIZE][4];
+};
+
+
+struct gl_minmax_attrib {
+   GLenum Format;
+   GLboolean Sink;
+   GLfloat Min[4], Max[4];   /* RGBA */
+};
+
+
+struct gl_convolution_attrib {
+   GLenum Format;
+   GLenum InternalFormat;
+   GLuint Width;
+   GLuint Height;
+   GLfloat Filter[MAX_CONVOLUTION_WIDTH * MAX_CONVOLUTION_HEIGHT * 4];
+};
+
+
+struct gl_light_attrib {
+   struct gl_light Light[MAX_LIGHTS];	/* Array of lights */
+   struct gl_lightmodel Model;		/* Lighting model */
+   struct gl_material Material[2];	/* Material 0=front, 1=back */
+   GLboolean Enabled;			/* Lighting enabled flag */
+   GLenum ShadeModel;			/* GL_FLAT or GL_SMOOTH */
+   GLenum ColorMaterialFace;		/* GL_FRONT, BACK or FRONT_AND_BACK */
+   GLenum ColorMaterialMode;		/* GL_AMBIENT, GL_DIFFUSE, etc */
+   GLuint ColorMaterialBitmask;		/* bitmask formed from Face and Mode */
+   GLboolean ColorMaterialEnabled;
+
+   struct gl_light EnabledList;         /* List sentinel */
+
+   /* Derived for optimizations: */
+   GLboolean _NeedVertices;		/* Use fast shader? */
+   GLuint  _Flags;		        /* State, see below */
+   GLfloat _BaseColor[2][3];
+   GLchan _BaseAlpha[2];
+};
+
+
+#define LIGHT_POSITIONAL   0x4
+#define LIGHT_SPOT         0x10
+#define LIGHT_LOCAL_VIEWER 0x20
+#define LIGHT_TWO_SIDE     0x40
+
+#define LIGHT_NEED_VERTICES (LIGHT_POSITIONAL|LIGHT_LOCAL_VIEWER)
+
+struct gl_line_attrib {
+   GLboolean SmoothFlag;	/* GL_LINE_SMOOTH enabled? */
+   GLboolean StippleFlag;	/* GL_LINE_STIPPLE enabled? */
+   GLushort StipplePattern;	/* Stipple pattern */
+   GLint StippleFactor;		/* Stipple repeat factor */
+   GLfloat Width;		/* Line width */
+};
+
+
+struct gl_list_attrib {
+   GLuint ListBase;
+};
+
+struct gl_list_opcode {
+   GLuint size;
+   void (*execute)( GLcontext *ctx, void *data );
+   void (*destroy)( GLcontext *ctx, void *data );
+   void (*print)( GLcontext *ctx, void *data );
+};
+
+#define GL_MAX_EXT_OPCODES 16
+
+struct gl_list_extensions {
+   struct gl_list_opcode opcode[GL_MAX_EXT_OPCODES];
+   GLuint nr_opcodes;
+};
+
+struct gl_pixel_attrib {
+   GLenum ReadBuffer;		/* src buffer for glRead/CopyPixels */
+   GLenum DriverReadBuffer;	/* Driver's current source buffer */
+   GLfloat RedBias, RedScale;
+   GLfloat GreenBias, GreenScale;
+   GLfloat BlueBias, BlueScale;
+   GLfloat AlphaBias, AlphaScale;
+   GLfloat DepthBias, DepthScale;
+   GLint IndexShift, IndexOffset;
+   GLboolean MapColorFlag;
+   GLboolean MapStencilFlag;
+   GLfloat ZoomX, ZoomY;
+   GLint MapStoSsize;		/* Size of each pixel map */
+   GLint MapItoIsize;
+   GLint MapItoRsize;
+   GLint MapItoGsize;
+   GLint MapItoBsize;
+   GLint MapItoAsize;
+   GLint MapRtoRsize;
+   GLint MapGtoGsize;
+   GLint MapBtoBsize;
+   GLint MapAtoAsize;
+   GLint MapStoS[MAX_PIXEL_MAP_TABLE];	/* Pixel map tables */
+   GLint MapItoI[MAX_PIXEL_MAP_TABLE];
+   GLfloat MapItoR[MAX_PIXEL_MAP_TABLE];
+   GLfloat MapItoG[MAX_PIXEL_MAP_TABLE];
+   GLfloat MapItoB[MAX_PIXEL_MAP_TABLE];
+   GLfloat MapItoA[MAX_PIXEL_MAP_TABLE];
+   GLubyte MapItoR8[MAX_PIXEL_MAP_TABLE];  /* converted to 8-bit color */
+   GLubyte MapItoG8[MAX_PIXEL_MAP_TABLE];
+   GLubyte MapItoB8[MAX_PIXEL_MAP_TABLE];
+   GLubyte MapItoA8[MAX_PIXEL_MAP_TABLE];
+   GLfloat MapRtoR[MAX_PIXEL_MAP_TABLE];
+   GLfloat MapGtoG[MAX_PIXEL_MAP_TABLE];
+   GLfloat MapBtoB[MAX_PIXEL_MAP_TABLE];
+   GLfloat MapAtoA[MAX_PIXEL_MAP_TABLE];
+   /* GL_EXT_histogram */
+   GLboolean HistogramEnabled;
+   GLboolean MinMaxEnabled;
+   /* GL_SGIS_pixel_texture */
+   GLboolean PixelTextureEnabled;
+   GLenum FragmentRgbSource;
+   GLenum FragmentAlphaSource;
+   /* GL_SGI_color_matrix */
+   GLfloat PostColorMatrixScale[4];  /* RGBA */
+   GLfloat PostColorMatrixBias[4];   /* RGBA */
+   /* GL_SGI_color_table */
+   GLfloat ColorTableScale[4];
+   GLfloat ColorTableBias[4];
+   GLboolean ColorTableEnabled;
+   GLfloat PCCTscale[4];
+   GLfloat PCCTbias[4];
+   GLboolean PostConvolutionColorTableEnabled;
+   GLfloat PCMCTscale[4];
+   GLfloat PCMCTbias[4];
+   GLboolean PostColorMatrixColorTableEnabled;
+   /* Convolution */
+   GLboolean Convolution1DEnabled;
+   GLboolean Convolution2DEnabled;
+   GLboolean Separable2DEnabled;
+   GLfloat ConvolutionBorderColor[3][4];
+   GLenum ConvolutionBorderMode[3];
+   GLfloat ConvolutionFilterScale[3][4];
+   GLfloat ConvolutionFilterBias[3][4];
+   GLfloat PostConvolutionScale[4];  /* RGBA */
+   GLfloat PostConvolutionBias[4];   /* RGBA */
+};
+
+
+struct gl_point_attrib {
+   GLboolean SmoothFlag;	/* True if GL_POINT_SMOOTH is enabled */
+   GLfloat Size;		/* User-specified point size */
+   GLfloat _Size;		/* Size clamped to Const.Min/MaxPointSize */
+   GLfloat Params[3];		/* GL_EXT_point_parameters */
+   GLfloat MinSize, MaxSize;	/* GL_EXT_point_parameters */
+   GLfloat Threshold;		/* GL_EXT_point_parameters */
+   GLboolean _Attenuated;	/* True if Params != [1, 0, 0] */
+};
+
+
+struct gl_polygon_attrib {
+   GLenum FrontFace;		/* Either GL_CW or GL_CCW */
+   GLenum FrontMode;		/* Either GL_POINT, GL_LINE or GL_FILL */
+   GLenum BackMode;		/* Either GL_POINT, GL_LINE or GL_FILL */
+   GLboolean FrontBit;		/*  */
+   GLboolean _Unfilled;		/* True if back or front mode is not GL_FILL */
+   GLboolean CullFlag;		/* Culling on/off flag */
+   GLubyte _CullBits;		/* Used for cull testing */
+   GLboolean SmoothFlag;	/* True if GL_POLYGON_SMOOTH is enabled */
+   GLboolean StippleFlag;	/* True if GL_POLYGON_STIPPLE is enabled */
+   GLenum CullFaceMode;		/* Culling mode GL_FRONT or GL_BACK */
+   GLfloat OffsetFactor;	/* Polygon offset factor, from user */
+   GLfloat OffsetUnits;		/* Polygon offset units, from user */
+   GLfloat OffsetMRD;		/* = OffsetUnits * visual->MRD */
+   GLboolean OffsetPoint;	/* Offset in GL_POINT mode */
+   GLboolean OffsetLine;	/* Offset in GL_LINE mode */
+   GLboolean OffsetFill;	/* Offset in GL_FILL mode */
+   GLboolean _OffsetAny;
+};
+
+
+struct gl_scissor_attrib {
+   GLboolean Enabled;		/* Scissor test enabled? */
+   GLint X, Y;			/* Lower left corner of box */
+   GLsizei Width, Height;	/* Size of box */
+};
+
+
+struct gl_stencil_attrib {
+   GLboolean Enabled;		/* Enabled flag */
+   GLenum Function;		/* Stencil function */
+   GLenum FailFunc;		/* Fail function */
+   GLenum ZPassFunc;		/* Depth buffer pass function */
+   GLenum ZFailFunc;		/* Depth buffer fail function */
+   GLstencil Ref;		/* Reference value */
+   GLstencil ValueMask;		/* Value mask */
+   GLstencil Clear;		/* Clear value */
+   GLstencil WriteMask;		/* Write mask */
+};
+
+
+/* TexGenEnabled flags */
+#define S_BIT 1
+#define T_BIT 2
+#define R_BIT 4
+#define Q_BIT 8
+
+/* Texture Enabled flags */
+#define TEXTURE0_1D   0x1     /* Texture unit 0 (default) */
+#define TEXTURE0_2D   0x2
+#define TEXTURE0_3D   0x4
+#define TEXTURE0_CUBE 0x8
+#define TEXTURE0_ANY  (TEXTURE0_1D | TEXTURE0_2D | TEXTURE0_3D | TEXTURE0_CUBE)
+#define TEXTURE1_1D   (TEXTURE0_1D << 4)    /* Texture unit 1 */
+#define TEXTURE1_2D   (TEXTURE0_2D << 4)
+#define TEXTURE1_3D   (TEXTURE0_3D << 4)
+#define TEXTURE1_CUBE (TEXTURE0_CUBE << 4)
+#define TEXTURE1_ANY  (TEXTURE1_1D | TEXTURE1_2D | TEXTURE1_3D | TEXTURE1_CUBE)
+#define TEXTURE2_1D   (TEXTURE0_1D << 8)    /* Texture unit 2 */
+#define TEXTURE2_2D   (TEXTURE0_2D << 8)
+#define TEXTURE2_3D   (TEXTURE0_3D << 8)
+#define TEXTURE2_CUBE (TEXTURE0_CUBE << 8)
+#define TEXTURE2_ANY  (TEXTURE2_1D | TEXTURE2_2D | TEXTURE2_3D | TEXTURE2_CUBE)
+#define TEXTURE3_1D   (TEXTURE0_1D << 12)    /* Texture unit 3 */
+#define TEXTURE3_2D   (TEXTURE0_2D << 12)
+#define TEXTURE3_3D   (TEXTURE0_3D << 12)
+#define TEXTURE3_CUBE (TEXTURE0_CUBE << 12)
+#define TEXTURE3_ANY  (TEXTURE3_1D | TEXTURE3_2D | TEXTURE3_3D | TEXTURE3_CUBE)
+
+/* Bitmap versions of the GL_ constants.
+ */
+#define TEXGEN_SPHERE_MAP        0x1
+#define TEXGEN_OBJ_LINEAR        0x2
+#define TEXGEN_EYE_LINEAR        0x4
+#define TEXGEN_REFLECTION_MAP_NV 0x8
+#define TEXGEN_NORMAL_MAP_NV     0x10
+
+#define TEXGEN_NEED_M            (TEXGEN_SPHERE_MAP)
+#define TEXGEN_NEED_F            (TEXGEN_SPHERE_MAP        | \
+				  TEXGEN_REFLECTION_MAP_NV)
+#define TEXGEN_NEED_NORMALS      (TEXGEN_SPHERE_MAP        | \
+				  TEXGEN_REFLECTION_MAP_NV | \
+				  TEXGEN_NORMAL_MAP_NV)
+#define TEXGEN_NEED_VERTICES     (TEXGEN_OBJ_LINEAR | 		\
+				  TEXGEN_EYE_LINEAR |		\
+				  TEXGEN_REFLECTION_MAP_NV |	\
+				  TEXGEN_SPHERE_MAP )
+#define TEXGEN_NEED_EYE_COORD    (TEXGEN_SPHERE_MAP        | \
+				  TEXGEN_REFLECTION_MAP_NV | \
+				  TEXGEN_NORMAL_MAP_NV     | \
+				  TEXGEN_EYE_LINEAR)
+
+
+
+/* A selection of state flags to make driver and module's lives easier.
+ */
+#define ENABLE_TEX0            0x000f	/* TEXTURE0_ANY */
+#define ENABLE_TEX1            0x00f0	/* TEXTURE1_ANY */
+#define ENABLE_TEX2            0x0f00	/* TEXTURE2_ANY */
+#define ENABLE_TEX3            0xf000	/* TEXTURE3_ANY */
+#define ENABLE_TEXGEN0        0x10000
+#define ENABLE_TEXGEN1        0x20000
+#define ENABLE_TEXGEN2        0x40000
+#define ENABLE_TEXGEN3        0x80000
+#define ENABLE_TEXMAT0       0x100000	/* Ie. not the identity matrix */
+#define ENABLE_TEXMAT1       0x200000
+#define ENABLE_TEXMAT2       0x400000
+#define ENABLE_TEXMAT3       0x800000
+#define ENABLE_LIGHT        0x1000000
+#define ENABLE_FOG          0x2000000
+#define ENABLE_USERCLIP     0x4000000
+#define ENABLE_VIEWCLIP     0x8000000
+#define ENABLE_NORMALIZE   0x10000000
+#define ENABLE_RESCALE     0x20000000
+#define ENABLE_POINT_ATTEN 0x40000000
+
+
+#define ENABLE_TEX_ANY    (ENABLE_TEX0 | ENABLE_TEX1 | \
+                           ENABLE_TEX2 | ENABLE_TEX3)
+#define ENABLE_TEXGEN_ANY (ENABLE_TEXGEN0 | ENABLE_TEXGEN1 | \
+                           ENABLE_TEXGEN2 | ENABLE_TEXGEN3)
+#define ENABLE_TEXMAT_ANY (ENABLE_TEXMAT0 | ENABLE_TEXMAT1 | \
+                           ENABLE_TEXMAT2 | ENABLE_TEXMAT3)
+
+
+/* Texture image record */
+struct gl_texture_image {
+   GLenum Format;		/* GL_ALPHA, GL_LUMINANCE, GL_LUMINANCE_ALPHA,
+				 * GL_INTENSITY, GL_RGB, GL_RGBA, or
+				 * GL_COLOR_INDEX only
+				 */
+   GLenum IntFormat;		/* Internal format as given by the user */
+   GLubyte RedBits;		/* Bits per texel component              */
+   GLubyte GreenBits;		/*   These are initialized by Mesa but   */
+   GLubyte BlueBits;		/*   may be reassigned by the device     */
+   GLubyte AlphaBits;		/*   driver to indicate the true texture */
+   GLubyte IntensityBits;	/*   color resolution.                   */
+   GLubyte LuminanceBits;
+   GLubyte IndexBits;
+   GLuint Border;		/* 0 or 1 */
+   GLuint Width;		/* = 2^WidthLog2 + 2*Border */
+   GLuint Height;		/* = 2^HeightLog2 + 2*Border */
+   GLuint Depth;		/* = 2^DepthLog2 + 2*Border */
+   GLuint Width2;		/* = Width - 2*Border */
+   GLuint Height2;		/* = Height - 2*Border */
+   GLuint Depth2;		/* = Depth - 2*Border */
+   GLuint WidthLog2;		/* = log2(Width2) */
+   GLuint HeightLog2;		/* = log2(Height2) */
+   GLuint DepthLog2;		/* = log2(Depth2) */
+   GLuint MaxLog2;		/* = MAX(WidthLog2, HeightLog2) */
+   GLchan *Data;		/* Image data as GLchan's */
+
+   GLboolean IsCompressed;	/* GL_ARB_texture_compression */
+   GLuint CompressedSize;	/* GL_ARB_texture_compression */
+
+   /* For device driver: */
+   void *DriverData;		/* Arbitrary device driver data */
+};
+
+
+/* Texture object record */
+struct gl_texture_object {
+   _glthread_Mutex Mutex;	/* for thread safety */
+   GLint RefCount;		/* reference count */
+   GLuint Name;			/* an unsigned integer */
+   GLuint Dimensions;		/* 1 or 2 or 3 */
+   GLfloat Priority;		/* in [0,1] */
+   GLchan BorderColor[4];	/* as integers */
+   GLenum WrapS;		/* GL_CLAMP, REPEAT or CLAMP_TO_EDGE */
+   GLenum WrapT;		/* GL_CLAMP, REPEAT or CLAMP_TO_EDGE */
+   GLenum WrapR;		/* GL_CLAMP, REPEAT or CLAMP_TO_EDGE */
+   GLenum MinFilter;		/* minification filter */
+   GLenum MagFilter;		/* magnification filter */
+   GLfloat MinLod;		/* OpenGL 1.2 */
+   GLfloat MaxLod;		/* OpenGL 1.2 */
+   GLint BaseLevel;		/* OpenGL 1.2 */
+   GLint MaxLevel;		/* OpenGL 1.2 */
+   GLint _P;			/* Highest mipmap level */
+   GLfloat _M;			/* = MIN(MaxLevel, P) - BaseLevel */
+   struct gl_texture_image *Image[MAX_TEXTURE_LEVELS];
+
+   /* Texture cube faces */
+   /* Image[] is alias for *PosX[MAX_TEXTURE_LEVELS]; */
+   struct gl_texture_image *NegX[MAX_TEXTURE_LEVELS];
+   struct gl_texture_image *PosY[MAX_TEXTURE_LEVELS];
+   struct gl_texture_image *NegY[MAX_TEXTURE_LEVELS];
+   struct gl_texture_image *PosZ[MAX_TEXTURE_LEVELS];
+   struct gl_texture_image *NegZ[MAX_TEXTURE_LEVELS];
+
+   /* GL_EXT_paletted_texture */
+   struct gl_color_table Palette;
+
+   GLboolean Complete;			/* Is texture object complete? */
+   struct gl_texture_object *Next;	/* Next in linked list */
+
+   /* For device driver: */
+   void *DriverData;	/* Arbitrary device driver data */
+};
+
+
+
+/*
+ * Texture units are new with the multitexture extension.
+ */
+struct gl_texture_unit {
+   GLuint Enabled;              /* bitmask of TEXTURE0_1D, _2D, _3D, _CUBE */
+   GLuint _ReallyEnabled;        /* 0 or one of TEXTURE0_1D, _2D, _3D, _CUBE */
+
+   GLenum EnvMode;              /* GL_MODULATE, GL_DECAL, GL_BLEND, etc. */
+   GLfloat EnvColor[4];
+   GLuint TexGenEnabled;	/* Bitwise-OR of [STRQ]_BIT values */
+   GLenum GenModeS;		/* Tex coord generation mode, either */
+   GLenum GenModeT;		/*	GL_OBJECT_LINEAR, or */
+   GLenum GenModeR;		/*	GL_EYE_LINEAR, or    */
+   GLenum GenModeQ;		/*      GL_SPHERE_MAP        */
+   GLuint _GenBitS;
+   GLuint _GenBitT;
+   GLuint _GenBitR;
+   GLuint _GenBitQ;
+   GLuint _GenFlags;		/* bitwise or of GenBit[STRQ] */
+   GLfloat ObjectPlaneS[4];
+   GLfloat ObjectPlaneT[4];
+   GLfloat ObjectPlaneR[4];
+   GLfloat ObjectPlaneQ[4];
+   GLfloat EyePlaneS[4];
+   GLfloat EyePlaneT[4];
+   GLfloat EyePlaneR[4];
+   GLfloat EyePlaneQ[4];
+   GLfloat LodBias;		/* for biasing mipmap levels */
+
+   /* GL_EXT_texture_env_combine */
+   GLenum CombineModeRGB;       /* GL_REPLACE, GL_DECAL, GL_ADD, etc. */
+   GLenum CombineModeA;         /* GL_REPLACE, GL_DECAL, GL_ADD, etc. */
+   GLenum CombineSourceRGB[3];  /* GL_PRIMARY_COLOR, GL_TEXTURE, etc. */
+   GLenum CombineSourceA[3];    /* GL_PRIMARY_COLOR, GL_TEXTURE, etc. */
+   GLenum CombineOperandRGB[3]; /* SRC_COLOR, ONE_MINUS_SRC_COLOR, etc */
+   GLenum CombineOperandA[3];   /* SRC_ALPHA, ONE_MINUS_SRC_ALPHA, etc */
+   GLuint CombineScaleShiftRGB; /* 0, 1 or 2 */
+   GLuint CombineScaleShiftA;   /* 0, 1 or 2 */
+
+   struct gl_texture_object *Current1D;
+   struct gl_texture_object *Current2D;
+   struct gl_texture_object *Current3D;
+   struct gl_texture_object *CurrentCubeMap; /* GL_ARB_texture_cube_map */
+
+   struct gl_texture_object *_Current; /* Points to really enabled tex obj */
+
+   struct gl_texture_object Saved1D;  /* only used by glPush/PopAttrib */
+   struct gl_texture_object Saved2D;
+   struct gl_texture_object Saved3D;
+   struct gl_texture_object SavedCubeMap;
+};
+
+
+struct gl_texture_attrib {
+   /* multitexture */
+   GLuint CurrentUnit;	          /* Active texture unit */
+   GLuint CurrentTransformUnit;	  /* Client active texture xform unit */
+
+   GLuint _ReallyEnabled;     /* enables for all texture units: */
+                             /* = (Unit[0]._ReallyEnabled << 0) | */
+                             /*   (Unit[1]._ReallyEnabled << 4) | */
+	                     /*   (Unit[2]._ReallyEnabled << 8) | etc... */
+   GLuint _GenFlags;  /* for texgen */
+
+   struct gl_texture_unit Unit[MAX_TEXTURE_UNITS];
+	
+   struct gl_texture_object *Proxy1D;
+   struct gl_texture_object *Proxy2D;
+   struct gl_texture_object *Proxy3D;
+   struct gl_texture_object *ProxyCubeMap;
+
+   /* GL_EXT_shared_texture_palette */
+   GLboolean SharedPalette;
+   struct gl_color_table Palette;
+};
+
+
+
+/* KW: Renamed ClipEquation to avoid having 'ClipClipEquation'
+ */
+struct gl_transform_attrib {
+   GLenum MatrixMode;				/* Matrix mode */
+   GLfloat EyeUserPlane[MAX_CLIP_PLANES][4];
+   GLfloat _ClipUserPlane[MAX_CLIP_PLANES][4];	/* derived */
+   GLboolean ClipEnabled[MAX_CLIP_PLANES];
+   GLubyte   _AnyClip;				/* How many ClipEnabled? */
+   GLboolean Normalize;				/* Normalize all normals? */
+   GLboolean RescaleNormals;			/* GL_EXT_rescale_normal */
+};
+
+
+struct gl_viewport_attrib {
+   GLint X, Y;			/* position */
+   GLsizei Width, Height;	/* size */
+   GLfloat Near, Far;		/* Depth buffer range */
+   GLmatrix _WindowMap;		/* Mapping transformation as a matrix. */
+};
+
+
+/* For the attribute stack: */
+struct gl_attrib_node {
+   GLbitfield kind;
+   void *data;
+   struct gl_attrib_node *next;
+};
+
+
+
+/*
+ * Client pixel packing/unpacking attributes
+ */
+struct gl_pixelstore_attrib {
+   GLint Alignment;
+   GLint RowLength;
+   GLint SkipPixels;
+   GLint SkipRows;
+   GLint ImageHeight;     /* for GL_EXT_texture3D */
+   GLint SkipImages;      /* for GL_EXT_texture3D */
+   GLboolean SwapBytes;
+   GLboolean LsbFirst;
+};
+
+
+/*
+ * Client vertex array attributes
+ */
+struct gl_client_array {
+   GLint Size;
+   GLenum Type;
+   GLsizei Stride;		/* user-specified stride */
+   GLsizei StrideB;		/* actual stride in bytes */
+   void *Ptr;
+   GLboolean Enabled;
+};
+
+
+
+
+struct gl_array_attrib {
+   struct gl_client_array Vertex;	     /* client data descriptors */
+   struct gl_client_array Normal;
+   struct gl_client_array Color;
+   struct gl_client_array SecondaryColor;
+   struct gl_client_array FogCoord;
+   struct gl_client_array Index;
+   struct gl_client_array TexCoord[MAX_TEXTURE_UNITS];
+   struct gl_client_array EdgeFlag;
+
+   trans_4f_func  _VertexFunc;       /* conversion functions */
+   trans_3f_func  _NormalFunc;  
+   trans_4ub_func _ColorFunc;   
+   trans_1ui_func _IndexFunc;
+   trans_1f_func  _FogCoordFunc;
+   trans_4ub_func _SecondaryColorFunc;
+   trans_4f_func  _TexCoordFunc[MAX_TEXTURE_UNITS];
+   trans_1ub_func _EdgeFlagFunc;
+
+   GLint TexCoordInterleaveFactor;
+   GLint ActiveTexture;		/* Client Active Texture */
+
+   GLuint LockFirst;
+   GLuint LockCount;
+	
+};
+
+
+/* These are used to make the ctx->Current values look like
+ * arrays (with zero StrideB).
+ */
+struct gl_fallback_arrays {
+   struct gl_client_array Normal;
+   struct gl_client_array Color;
+   struct gl_client_array SecondaryColor;
+   struct gl_client_array FogCoord;
+   struct gl_client_array Index;
+   struct gl_client_array TexCoord[MAX_TEXTURE_UNITS];
+   struct gl_client_array EdgeFlag;
+};
+
+
+
+struct gl_feedback {
+   GLenum Type;
+   GLuint Mask;
+   GLfloat *Buffer;
+   GLuint BufferSize;
+   GLuint Count;
+};
+
+
+
+struct gl_selection {
+   GLuint *Buffer;
+   GLuint BufferSize;	/* size of SelectBuffer */
+   GLuint BufferCount;	/* number of values in SelectBuffer */
+   GLuint Hits;		/* number of records in SelectBuffer */
+   GLuint NameStackDepth;
+   GLuint NameStack[MAX_NAME_STACK_DEPTH];
+   GLboolean HitFlag;
+   GLfloat HitMinZ, HitMaxZ;
+};
+
+
+
+/*
+ * 1-D Evaluator control points
+ */
+struct gl_1d_map {
+   GLuint Order;	/* Number of control points */
+   GLfloat u1, u2, du;	/* u1, u2, 1.0/(u2-u1) */
+   GLfloat *Points;	/* Points to contiguous control points */
+};
+	
+
+/*
+ * 2-D Evaluator control points
+ */
+struct gl_2d_map {
+   GLuint Uorder;		/* Number of control points in U dimension */
+   GLuint Vorder;		/* Number of control points in V dimension */
+   GLfloat u1, u2, du;
+   GLfloat v1, v2, dv;
+   GLfloat *Points;		/* Points to contiguous control points */
+};
+
+
+/*
+ * All evalutator control points
+ */
+struct gl_evaluators {
+   /* 1-D maps */
+   struct gl_1d_map Map1Vertex3;
+   struct gl_1d_map Map1Vertex4;
+   struct gl_1d_map Map1Index;
+   struct gl_1d_map Map1Color4;
+   struct gl_1d_map Map1Normal;
+   struct gl_1d_map Map1Texture1;
+   struct gl_1d_map Map1Texture2;
+   struct gl_1d_map Map1Texture3;
+   struct gl_1d_map Map1Texture4;
+
+   /* 2-D maps */
+   struct gl_2d_map Map2Vertex3;
+   struct gl_2d_map Map2Vertex4;
+   struct gl_2d_map Map2Index;
+   struct gl_2d_map Map2Color4;
+   struct gl_2d_map Map2Normal;
+   struct gl_2d_map Map2Texture1;
+   struct gl_2d_map Map2Texture2;
+   struct gl_2d_map Map2Texture3;
+   struct gl_2d_map Map2Texture4;
+};
+
+
+
+/*
+ * State which can be shared by multiple contexts:
+ */
+struct gl_shared_state {
+   _glthread_Mutex Mutex;		   /* for thread safety */
+   GLint RefCount;			   /* Reference count */
+   struct _mesa_HashTable *DisplayList;	   /* Display lists hash table */
+   struct _mesa_HashTable *TexObjects;	   /* Texture objects hash table */
+   struct gl_texture_object *TexObjectList;/* Linked list of texture objects */
+
+   /* Default texture objects (shared by all multi-texture units) */
+   struct gl_texture_object *Default1D;
+   struct gl_texture_object *Default2D;
+   struct gl_texture_object *Default3D;
+   struct gl_texture_object *DefaultCubeMap;
+
+   void *DriverData;  /* Device driver shared state */
+};
+
+
+
+/*
+ * Describes the color, depth, stencil and accum buffer parameters.
+ * In C++ terms, think of this as a base class from which device drivers
+ * will make derived classes.
+ */
+struct gl_visual {
+   GLboolean RGBAflag;		/* Is frame buffer in RGBA mode, not CI? */
+   GLboolean DBflag;		/* Is color buffer double buffered? */
+   GLboolean StereoFlag;	/* stereo buffer? */
+
+   GLint RedBits;		/* Bits per color component */
+   GLint GreenBits;
+   GLint BlueBits;
+   GLint AlphaBits;
+
+   GLint IndexBits;		/* Bits/pixel if in color index mode */
+
+   GLint AccumRedBits;		/* Number of bits in red accum channel */
+   GLint AccumGreenBits;	/* Number of bits in green accum channel */
+   GLint AccumBlueBits;		/* Number of bits in blue accum channel */
+   GLint AccumAlphaBits;	/* Number of bits in alpha accum channel */
+   GLint DepthBits;		/* Number of bits in depth buffer, or 0 */
+   GLint StencilBits;		/* Number of bits in stencil buffer, or 0 */
+   GLint NumSamples;            /* Samples/pixel for multisampling */
+
+   GLuint DepthMax;		/* Max depth buffer value */
+   GLfloat DepthMaxF;		/* Float max depth buffer value */
+   GLfloat MRD;			/* minimum resolvable difference in Z values */
+};
+
+
+
+/*
+ * A "frame buffer" is a color buffer and its optional ancillary buffers:
+ * depth, accum, stencil, and software-simulated alpha buffers.
+ * In C++ terms, think of this as a base class from which device drivers
+ * will make derived classes.
+ */
+struct gl_frame_buffer {
+   GLvisual *Visual;		/* The corresponding visual */
+
+   GLint Width, Height;		/* size of frame buffer in pixels */
+
+   GLboolean UseSoftwareDepthBuffer;
+   GLboolean UseSoftwareAccumBuffer;
+   GLboolean UseSoftwareStencilBuffer;
+   GLboolean UseSoftwareAlphaBuffers;
+
+   /* Software depth (aka Z) buffer */
+   GLvoid *DepthBuffer;		/* array [Width*Height] of GLushort or GLuint*/
+
+   /* Software stencil buffer */
+   GLstencil *Stencil;		/* array [Width*Height] of GLstencil values */
+
+   /* Software accumulation buffer */
+   GLaccum *Accum;		/* array [4*Width*Height] of GLaccum values */
+
+   /* Software alpha planes */
+   GLchan *FrontLeftAlpha;	/* array [Width*Height] of GLubyte */
+   GLchan *BackLeftAlpha;	/* array [Width*Height] of GLubyte */
+   GLchan *FrontRightAlpha;	/* array [Width*Height] of GLubyte */
+   GLchan *BackRightAlpha;	/* array [Width*Height] of GLubyte */
+   GLchan *Alpha;		/* Points to current alpha buffer */
+
+   /* Drawing bounds: intersection of window size and scissor box */
+   GLint _Xmin, _Ymin;  /* inclusive */
+   GLint _Xmax, _Ymax;  /* exclusive */
+};
+
+
+/*
+ * Constants which may be overriden by device driver.
+ */
+struct gl_constants {
+   GLint MaxTextureSize;
+   GLint MaxCubeTextureSize;
+   GLint MaxTextureLevels;
+   GLuint MaxTextureUnits;
+   GLuint MaxArrayLockSize;
+   GLint SubPixelBits;
+   GLfloat MinPointSize, MaxPointSize;		/* aliased */
+   GLfloat MinPointSizeAA, MaxPointSizeAA;	/* antialiased */
+   GLfloat PointSizeGranularity;
+   GLfloat MinLineWidth, MaxLineWidth;		/* aliased */
+   GLfloat MinLineWidthAA, MaxLineWidthAA;	/* antialiased */
+   GLfloat LineWidthGranularity;
+   GLuint NumAuxBuffers;
+   GLuint MaxColorTableSize;
+   GLuint MaxConvolutionWidth;
+   GLuint MaxConvolutionHeight;
+   GLuint NumCompressedTextureFormats;	/* GL_ARB_texture_compression */
+   GLenum CompressedTextureFormats[MAX_COMPRESSED_TEXTURE_FORMATS];
+};
+
+
+/*
+ * List of extensions.
+ */
+struct extension;
+struct gl_extensions {
+   char *ext_string;
+   struct extension *ext_list;
+   /* Flags to quickly test if certain extensions are available.
+    * Not every extension needs to have such a flag, but it's encouraged.
+    */
+   GLboolean ARB_imaging;
+   GLboolean ARB_multitexture;
+   GLboolean ARB_texture_compression;
+   GLboolean ARB_texture_cube_map;
+   GLboolean ARB_texture_env_add;
+   GLboolean EXT_blend_color;
+   GLboolean EXT_blend_func_separate;
+   GLboolean EXT_blend_logic_op;
+   GLboolean EXT_blend_minmax;
+   GLboolean EXT_blend_subtract;
+   GLboolean EXT_clip_volume_hint;
+   GLboolean EXT_convolution;
+   GLboolean EXT_compiled_vertex_array;
+   GLboolean EXT_fog_coord;
+   GLboolean EXT_histogram;
+   GLboolean EXT_packed_pixels;
+   GLboolean EXT_paletted_texture;
+   GLboolean EXT_point_parameters;
+   GLboolean EXT_polygon_offset;
+   GLboolean EXT_rescale_normal;
+   GLboolean EXT_secondary_color;
+   GLboolean EXT_shared_texture_palette;
+   GLboolean EXT_stencil_wrap;
+   GLboolean EXT_texture3D;
+   GLboolean EXT_texture_compression_s3tc;
+   GLboolean EXT_texture_env_add;
+   GLboolean EXT_texture_env_combine;
+   GLboolean EXT_texture_object;
+   GLboolean EXT_texture_lod_bias;
+   GLboolean EXT_vertex_array_set;
+   GLboolean HP_occlusion_test;
+   GLboolean INGR_blend_func_separate;
+   GLboolean MESA_window_pos;
+   GLboolean MESA_resize_buffers;
+   GLboolean NV_blend_square;
+   GLboolean NV_texgen_reflection;
+   GLboolean PGI_misc_hints;
+   GLboolean SGI_color_matrix;
+   GLboolean SGI_color_table;
+   GLboolean SGIS_pixel_texture;
+   GLboolean SGIS_texture_edge_clamp;
+   GLboolean SGIX_pixel_texture;
+   GLboolean _3DFX_texture_compression_FXT1;
+};
+
+
+
+/*
+ * Bits for image transfer operations (ctx->ImageTransferState).
+ */
+#define IMAGE_SCALE_BIAS_BIT                      0x1
+#define IMAGE_SHIFT_OFFSET_BIT                    0x2
+#define IMAGE_MAP_COLOR_BIT                       0x4
+#define IMAGE_COLOR_TABLE_BIT                     0x8
+#define IMAGE_CONVOLUTION_BIT                     0x10
+#define IMAGE_POST_CONVOLUTION_COLOR_TABLE_BIT    0x20
+#define IMAGE_COLOR_MATRIX_BIT                    0x40
+#define IMAGE_POST_COLOR_MATRIX_COLOR_TABLE_BIT   0x80
+#define IMAGE_HISTOGRAM_BIT                       0x100
+#define IMAGE_MIN_MAX_BIT                         0x200
+
+/* transfer ops up to convolution: */
+#define IMAGE_PRE_CONVOLUTION_BITS (IMAGE_SCALE_BIAS_BIT |     \
+                                    IMAGE_SHIFT_OFFSET_BIT |   \
+                                    IMAGE_MAP_COLOR_BIT |      \
+                                    IMAGE_COLOR_TABLE_BIT)
+
+/* transfer ops after convolution: */
+#define IMAGE_POST_CONVOLUTION_BITS (IMAGE_POST_CONVOLUTION_COLOR_TABLE_BIT | \
+                                     IMAGE_COLOR_MATRIX_BIT |                 \
+                                     IMAGE_POST_COLOR_MATRIX_COLOR_TABLE_BIT |\
+                                     IMAGE_HISTOGRAM_BIT |                    \
+                                     IMAGE_MIN_MAX_BIT)
+
+
+/*
+ * Bits to indicate what state has changed.
+ */
+#define _NEW_MODELVIEW		0x1        /* ctx->ModelView */
+#define _NEW_PROJECTION		0x2        /* ctx->Projection */
+#define _NEW_TEXTURE_MATRIX	0x4        /* ctx->TextureMatrix */
+#define _NEW_COLOR_MATRIX	0x8        /* ctx->ColorMatrix */
+#define _NEW_ACCUM		0x10       /* ctx->Accum */
+#define _NEW_COLOR		0x20       /* ctx->Color */
+#define _NEW_DEPTH		0x40       /* ctx->Depth */
+#define _NEW_EVAL		0x80       /* ctx->Eval, ctx->EvalMap */
+#define _NEW_FOG		0x100      /* ctx->Fog */
+#define _NEW_HINT		0x200      /* ctx->Hint */
+#define _NEW_400		0x400      /* unused */
+#define _NEW_LIGHT		0x800      /* ctx->Light */
+#define _NEW_1000              	0x1000     /* unused */
+#define _NEW_LINE		0x2000     /* ctx->Line */
+#define _NEW_FEEDBACK_SELECT    0x4000     /* ctx->Feedback, ctx->Select */
+#define _NEW_PIXEL		0x8000     /* ctx->Pixel */
+#define _NEW_POINT		0x10000    /* ctx->Point */
+#define _NEW_POLYGON		0x20000    /* ctx->Polygon */
+#define _NEW_POLYGONSTIPPLE	0x40000    /* ctx->PolygonStipple */
+#define _NEW_SCISSOR		0x80000    /* ctx->Scissor */
+#define _NEW_STENCIL		0x100000   /* ctx->Stencil */
+#define _NEW_TEXTURE		0x200000   /* ctx->Texture */
+#define _NEW_TRANSFORM		0x400000   /* ctx->Transform */
+#define _NEW_VIEWPORT		0x800000   /* ctx->Viewport */
+#define _NEW_PACKUNPACK		0x1000000  /* ctx->Pack, ctx->Unpack */
+#define _NEW_ARRAY	        0x2000000  /* ctx->Array */
+#define _NEW_COLORTABLE		0x4000000  /* ctx->{*}ColorTable */
+#define _NEW_RENDERMODE		0x8000000  /* ctx->RenderMode */
+#define _NEW_BUFFERS            0x10000000 /* ctx->Visual, ctx->DrawBuffer, */
+
+#define _NEW_ALL ~0
+
+
+
+/* What can the driver do, what requires us to call render_triangle or
+ * a non-driver rasterize function?
+ */
+#define DD_FEEDBACK                 0x1
+#define DD_SELECT                   0x2
+#define DD_FLATSHADE                0x4
+#define DD_MULTIDRAW                0x8
+#define DD_SEPERATE_SPECULAR        0x10
+#define DD_TRI_LIGHT_TWOSIDE        0x20
+#define DD_TRI_UNFILLED             0x40
+#define DD_TRI_SMOOTH               0x80
+#define DD_TRI_STIPPLE              0x100
+#define DD_TRI_OFFSET               0x200
+#define DD_TRI_CULL                 0x400
+#define DD_LINE_SMOOTH              0x800
+#define DD_LINE_STIPPLE             0x1000
+#define DD_LINE_WIDTH               0x2000
+#define DD_POINT_SMOOTH             0x4000
+#define DD_POINT_SIZE               0x8000
+#define DD_POINT_ATTEN              0x10000
+#define DD_LIGHTING_CULL            0x20000 
+#define DD_TRI_CULL_FRONT_BACK      0x400000 /* not supported by most drivers */
+#define DD_Z_NEVER                  0x800000 
+#define DD_STENCIL                  0x1000000 
+
+/* Define the state changes under which each of these bits might change
+ */
+#define _DD_NEW_FEEDBACK                 _NEW_RENDERMODE
+#define _DD_NEW_SELECT                   _NEW_RENDERMODE
+#define _DD_NEW_FLATSHADE                _NEW_LIGHT
+#define _DD_NEW_MULTIDRAW                _NEW_COLOR
+#define _DD_NEW_SEPERATE_SPECULAR        (_NEW_LIGHT|_NEW_FOG)
+#define _DD_NEW_TRI_LIGHT_TWOSIDE        _NEW_LIGHT
+#define _DD_NEW_TRI_UNFILLED             _NEW_POLYGON
+#define _DD_NEW_TRI_SMOOTH               _NEW_POLYGON
+#define _DD_NEW_TRI_STIPPLE              _NEW_POLYGON
+#define _DD_NEW_TRI_OFFSET               _NEW_POLYGON
+#define _DD_NEW_TRI_CULL                 _NEW_POLYGON
+#define _DD_NEW_LINE_SMOOTH              _NEW_LINE
+#define _DD_NEW_LINE_STIPPLE             _NEW_LINE
+#define _DD_NEW_LINE_WIDTH               _NEW_LINE
+#define _DD_NEW_POINT_SMOOTH             _NEW_POINT
+#define _DD_NEW_POINT_SIZE               _NEW_POINT
+#define _DD_NEW_POINT_ATTEN              _NEW_POINT
+#define _DD_NEW_LIGHTING_CULL            _NEW_LIGHT
+#define _DD_NEW_TRI_CULL_FRONT_BACK      _NEW_POLYGON 
+#define _DD_NEW_Z_NEVER                  _NEW_DEPTH
+#define _DD_NEW_STENCIL                  _NEW_STENCIL
+
+#define _TNL_NEW_RENDERFLAGS              (_NEW_TEXTURE |		\
+                                           _DD_NEW_SEPERATE_SPECULAR |	\
+                                           _NEW_POLYGON |		\
+                                           _NEW_FOG |			\
+                                           _NEW_RENDERMODE) 
+
+#define _TNL_NEW_NEED_EYE_COORDS         (_NEW_LIGHT|		\
+                                          _NEW_TEXTURE|		\
+                                          _NEW_POINT|		\
+                                          _NEW_MODELVIEW)	
+					  
+#define _TNL_NEW_NEED_NORMALS            (_NEW_LIGHT|		\
+                                          _NEW_TEXTURE)
+
+#define _TNL_NEW_NORMAL_TRANSFORM        (_NEW_MODELVIEW|_NEW_TRANSFORM| \
+                                          _TNL_NEW_NEED_NORMALS)
+
+#define _TNL_NEW_SPACES                  (_TNL_NEW_NEED_NORMALS | \
+                                          _TNL_NEW_NEED_EYE_COORDS )
+
+#define NEED_NORMALS_TEXGEN      0x1
+#define NEED_NORMALS_LIGHT       0x2
+
+#define NEED_EYE_TEXGEN          0x1
+#define NEED_EYE_LIGHT           0x2
+#define NEED_EYE_LIGHT_MODELVIEW 0x4
+#define NEED_EYE_POINT_ATTEN     0x8
+
+
+
+#define DD_ANY_CULL           (DD_TRI_CULL_FRONT_BACK|	\
+                               DD_TRI_CULL|		\
+                               DD_LIGHTING_CULL)
+
+
+
+
+
+
+/*
+ * Forward declaration of display list datatypes:
+ */
+union node;
+typedef union node Node;
+
+
+
+
+
+/* This has to be included here. */
+#include "dd.h"
+
+
+/*
+ * The library context: 
+ */
+struct __GLcontextRec {
+   /*
+   ** Os related interfaces; these *must* be the first members of this
+   ** structure, because they are exposed to the outside world (i.e. GLX
+   ** extension).
+   */
+   __GLimports imports;
+   __GLexports exports;
+
+   /* State possibly shared with other contexts in the address space */
+   struct gl_shared_state *Shared;
+
+   /* API function pointer tables */
+   struct _glapi_table *Save;	/* Display list save funcs */
+   struct _glapi_table *Exec;	/* Execute funcs */
+   struct _glapi_table *CurrentDispatch;  /* == Save or Exec !! */
+
+   GLvisual Visual;
+   GLframebuffer *DrawBuffer;	/* buffer for writing */
+   GLframebuffer *ReadBuffer;	/* buffer for reading */
+
+   /* Driver function pointer table */
+   struct dd_function_table Driver;
+
+   void *DriverCtx;	/* Points to device driver context/state */
+   void *DriverMgrCtx;	/* Points to device driver manager (optional)*/
+
+   /* Core/Driver constants */
+   struct gl_constants Const;
+
+   /* Modelview matrix and stack */
+   GLmatrix ModelView;           /* current matrix, not stored on stack */
+   GLuint ModelViewStackDepth;
+   GLmatrix ModelViewStack[MAX_MODELVIEW_STACK_DEPTH - 1];
+
+   /* Projection matrix and stack */
+   GLmatrix ProjectionMatrix;    /* current matrix, not stored on stack */
+   GLuint ProjectionStackDepth;
+   GLmatrix ProjectionStack[MAX_PROJECTION_STACK_DEPTH - 1];
+
+   /* Combined modelview and projection matrix */
+   GLmatrix _ModelProjectMatrix;
+
+   /* Texture matrix and stack */
+   GLmatrix TextureMatrix[MAX_TEXTURE_UNITS];
+   GLuint TextureStackDepth[MAX_TEXTURE_UNITS];
+   GLmatrix TextureStack[MAX_TEXTURE_UNITS][MAX_TEXTURE_STACK_DEPTH - 1];
+
+   /* Color matrix and stack */
+   GLmatrix ColorMatrix;
+   GLuint ColorStackDepth;
+   GLmatrix ColorStack[MAX_COLOR_STACK_DEPTH - 1];
+
+   /* Display lists */
+   GLuint CallDepth;		/* Current recursion calling depth */
+   GLboolean ExecuteFlag;	/* Execute GL commands? */
+   GLboolean CompileFlag;	/* Compile GL commands into display list? */
+   Node *CurrentListPtr;	/* Head of list being compiled */
+   GLuint CurrentListNum;	/* Number of the list being compiled */
+   Node *CurrentBlock;		/* Pointer to current block of nodes */
+   GLuint CurrentPos;		/* Index into current block of nodes */
+
+   /* Extensions */
+   struct gl_extensions Extensions;
+
+   /* Renderer attribute stack */
+   GLuint AttribStackDepth;
+   struct gl_attrib_node *AttribStack[MAX_ATTRIB_STACK_DEPTH];
+
+   /* Renderer attribute groups */
+   struct gl_accum_attrib	Accum;
+   struct gl_colorbuffer_attrib	Color;
+   struct gl_current_attrib	Current;
+   struct gl_depthbuffer_attrib	Depth;
+   struct gl_eval_attrib	Eval;
+   struct gl_fog_attrib		Fog;
+   struct gl_hint_attrib	Hint;
+   struct gl_light_attrib	Light;
+   struct gl_line_attrib	Line;
+   struct gl_list_attrib	List;
+   struct gl_pixel_attrib	Pixel;
+   struct gl_point_attrib	Point;
+   struct gl_polygon_attrib	Polygon;
+   GLuint PolygonStipple[32];
+   struct gl_scissor_attrib	Scissor;
+   struct gl_stencil_attrib	Stencil;
+   struct gl_texture_attrib	Texture;
+   struct gl_transform_attrib	Transform;
+   struct gl_viewport_attrib	Viewport;
+
+   /* Other attribute groups */
+   struct gl_histogram_attrib	Histogram;
+   struct gl_minmax_attrib	MinMax;
+   struct gl_convolution_attrib Convolution1D;
+   struct gl_convolution_attrib Convolution2D;
+   struct gl_convolution_attrib Separable2D;
+
+   /* Client attribute stack */
+   GLuint ClientAttribStackDepth;
+   struct gl_attrib_node *ClientAttribStack[MAX_CLIENT_ATTRIB_STACK_DEPTH];
+
+   /* Client attribute groups */
+   struct gl_array_attrib	Array;	/* Vertex arrays */
+   struct gl_pixelstore_attrib	Pack;	/* Pixel packing */
+   struct gl_pixelstore_attrib	Unpack;	/* Pixel unpacking */
+
+   struct gl_evaluators EvalMap;   /* All evaluators */
+   struct gl_feedback   Feedback;  /* Feedback */
+   struct gl_selection  Select;    /* Selection */
+
+   struct gl_color_table ColorTable;       /* Pre-convolution */
+   struct gl_color_table ProxyColorTable;  /* Pre-convolution */
+   struct gl_color_table PostConvolutionColorTable;
+   struct gl_color_table ProxyPostConvolutionColorTable;
+   struct gl_color_table PostColorMatrixColorTable;
+   struct gl_color_table ProxyPostColorMatrixColorTable;
+
+   struct gl_fallback_arrays Fallback; 
+
+   GLenum ErrorValue;        /* Last error code */
+   GLenum RenderMode;        /* either GL_RENDER, GL_SELECT, GL_FEEDBACK */
+   GLuint NewState;          /* bitwise-or of _NEW_* flags */
+
+   /* Derived */
+   GLuint _Enabled;           /* bitwise-or of ENABLE_* flags */
+   GLuint _TriangleCaps;      /* bitwise-or of DD_* flags */
+   GLuint _ImageTransferState;/* bitwise-or of IMAGE_*_BIT flags */
+   GLfloat _EyeZDir[3];
+   GLfloat _ModelViewInvScale;
+   GLuint _NeedEyeCoords;
+   GLuint _NeedNormals;    /* Are vertex normal vectors needed? */
+
+   struct gl_shine_tab *_ShineTable[4];  /* Active shine tables */
+   struct gl_shine_tab *_ShineTabList;   /* Mru list of inactive shine tables */
+
+   struct gl_list_extensions listext; /* driver dlist extensions */
+
+
+   GLboolean OcclusionResult;  /* GL_HP_occlusion_test */
+   GLboolean OcclusionResultSaved;  /* GL_HP_occlusion_test */
+
+   /* Should 3Dfx Glide driver catch signals? */
+   GLboolean CatchSignals;
+        
+   /* For debugging/development only */
+   GLboolean NoRaster;
+   GLboolean FirstTimeCurrent;
+
+   /* Dither disable via MESA_NO_DITHER env var */
+   GLboolean NoDither;
+
+#ifdef DEBUG
+   GLboolean Rendering;
+#endif
+
+#if defined(MESA_TRACE)
+   struct _glapi_table *TraceDispatch;
+   trace_context_t     *TraceCtx;
+#endif
+
+   /* Hooks for module contexts.  These will eventually live
+    * in the driver or elsewhere.
+    */
+   void *swrast_context;
+   void *swsetup_context;
+   void *swtnl_context;
+   void *swtnl_vb;
+   void *swtnl_im;
+};
+
+
+/* The string names for GL_POINT, GL_LINE_LOOP, etc */
+extern const char *_mesa_prim_name[GL_POLYGON+2];
+extern GLenum gl_reduce_prim[];
+
+
+#ifdef MESA_DEBUG
+extern int MESA_VERBOSE; 
+extern int MESA_DEBUG_FLAGS;
+#else
+# define MESA_VERBOSE 0
+# define MESA_DEBUG_FLAGS 0
+# ifndef NDEBUG
+#  define NDEBUG
+# endif
+#endif
+
+
+enum _verbose {
+   VERBOSE_VARRAY          = 0x1,
+   VERBOSE_TEXTURE         = 0x2,
+   VERBOSE_IMMEDIATE       = 0x4,
+   VERBOSE_PIPELINE        = 0x8,
+   VERBOSE_DRIVER          = 0x10,
+   VERBOSE_STATE           = 0x20,
+   VERBOSE_API             = 0x40,
+   VERBOSE_TRIANGLE_CHECKS = 0x80,
+   VERBOSE_CULL            = 0x100,
+   VERBOSE_DISPLAY_LIST    = 0x200,
+   VERBOSE_LIGHTING        = 0x400
+}; 
+
+
+enum _debug {
+   DEBUG_ALWAYS_FLUSH          = 0x1
+}; 
+
+
+
+#define Elements(x) sizeof(x)/sizeof(*(x))
+
+
+#define FLUSH_TNL( ctx, flags )			\
+do {						\
+   if (ctx->Driver.NeedFlush & flags)		\
+      ctx->Driver.FlushVertices( ctx, flags );	\
+} while (0) 
+
+#define FLUSH_TNL_RETURN( ctx, flags, where )		\
+do {							\
+   if (ctx->Driver.NeedFlush & flags) {			\
+      if (!ctx->Driver.FlushVertices( ctx, flags )) {	\
+	 gl_error( ctx, GL_INVALID_OPERATION, where );	\
+	 return;					\
+      }							\
+   }							\
+} while (0)
+
+#define FLUSH_TNL_RETVAL( ctx, flags, where, what )	\
+do {							\
+   if (ctx->Driver.NeedFlush & flags) {			\
+      if (!ctx->Driver.FlushVertices( ctx, flags )) {	\
+	 gl_error( ctx, GL_INVALID_OPERATION, where );	\
+	 return what;					\
+      }							\
+   }							\
+} while (0)
+
+
+#define ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL( ctx, where, what )	\
+        FLUSH_TNL_RETVAL( ctx, 						\
+                         (FLUSH_INSIDE_BEGIN_END|			\
+                          FLUSH_STORED_VERTICES),			\
+                         where, what )
+
+#define ASSERT_OUTSIDE_BEGIN_END( ctx, where )		\
+        FLUSH_TNL_RETURN( ctx,				\
+                         (FLUSH_INSIDE_BEGIN_END|	\
+                          FLUSH_STORED_VERTICES),       \
+                          where )
+
+#define ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH( ctx, where ) \
+        ASSERT_OUTSIDE_BEGIN_END( ctx, where );
+      
+#define ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH_WITH_RETVAL( ctx, where, what )  \
+        ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL( ctx, where, what );
+
+
+#ifdef DEBUG
+
+#define RENDER_START(CTX)			\
+   do {						\
+      assert(!(CTX)->Rendering);		\
+      (CTX)->Rendering = GL_TRUE;		\
+      if ((CTX)->Driver.RenderStart) {		\
+         (*(CTX)->Driver.RenderStart)(CTX);	\
+      }						\
+   } while (0)
+
+#define RENDER_FINISH(CTX)			\
+   do {						\
+      assert((CTX)->Rendering);			\
+      (CTX)->Rendering = GL_FALSE;		\
+      if ((CTX)->Driver.RenderFinish) {		\
+         (*(CTX)->Driver.RenderFinish)(CTX);	\
+      }						\
+   } while (0)
+
+#else
+
+#define RENDER_START(CTX)			\
+   do {						\
+      if ((CTX)->Driver.RenderStart) {		\
+         (*(CTX)->Driver.RenderStart)(CTX);	\
+      }						\
+   } while (0)
+
+#define RENDER_FINISH(CTX)			\
+   do {						\
+      if ((CTX)->Driver.RenderFinish) {		\
+         (*(CTX)->Driver.RenderFinish)(CTX);	\
+      }						\
+   } while (0)
+
+#endif
+
+
+#endif /* TYPES_H */
diff --git a/src/mesa/main/pixel.c b/src/mesa/main/pixel.c
index a7787b667ae..12097397fbc 100644
--- a/src/mesa/main/pixel.c
+++ b/src/mesa/main/pixel.c
@@ -1,21 +1,21 @@
-/* $Id: pixel.c,v 1.18 2000/10/30 16:32:43 brianp Exp $ */
+/* $Id: pixel.c,v 1.19 2000/11/22 07:32:17 joukj Exp $ */
 
 /*
  * Mesa 3-D graphics library
  * Version:  3.5
- * 
+ *
  * Copyright (C) 1999-2000  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"),
  * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
  * and/or sell copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included
  * in all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
@@ -34,7 +34,7 @@
 #include "macros.h"
 #include "mem.h"
 #include "pixel.h"
-#include "types.h"
+#include "mtypes.h"
 #endif
 
 
diff --git a/src/mesa/main/pixel.h b/src/mesa/main/pixel.h
index 7eb0741aea1..2ff5a4ac6b3 100644
--- a/src/mesa/main/pixel.h
+++ b/src/mesa/main/pixel.h
@@ -1,21 +1,21 @@
-/* $Id: pixel.h,v 1.6 2000/10/29 18:12:15 brianp Exp $ */
+/* $Id: pixel.h,v 1.7 2000/11/22 07:32:17 joukj Exp $ */
 
 /*
  * Mesa 3-D graphics library
  * Version:  3.5
- * 
+ *
  * Copyright (C) 1999-2000  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"),
  * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
  * and/or sell copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included
  * in all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
@@ -29,7 +29,7 @@
 #define PIXEL_H
 
 
-#include "types.h"
+#include "mtypes.h"
 
 
 /*
diff --git a/src/mesa/main/points.c b/src/mesa/main/points.c
index 26c4d5efab4..8c84f279e0c 100644
--- a/src/mesa/main/points.c
+++ b/src/mesa/main/points.c
@@ -1,21 +1,21 @@
-/* $Id: points.c,v 1.23 2000/11/16 21:05:35 keithw Exp $ */
+/* $Id: points.c,v 1.24 2000/11/22 07:32:17 joukj Exp $ */
 
 /*
  * Mesa 3-D graphics library
  * Version:  3.4
- * 
+ *
  * Copyright (C) 1999-2000  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"),
  * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
  * and/or sell copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included
  * in all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
@@ -35,7 +35,7 @@
 #include "mmath.h"
 #include "points.h"
 #include "texstate.h"
-#include "types.h"
+#include "mtypes.h"
 #endif
 
 
diff --git a/src/mesa/main/points.h b/src/mesa/main/points.h
index 0da8c11ba1a..58973c80381 100644
--- a/src/mesa/main/points.h
+++ b/src/mesa/main/points.h
@@ -1,21 +1,21 @@
-/* $Id: points.h,v 1.3 2000/10/31 18:09:44 keithw Exp $ */
+/* $Id: points.h,v 1.4 2000/11/22 07:32:17 joukj Exp $ */
 
 /*
  * Mesa 3-D graphics library
  * Version:  3.3
- * 
+ *
  * Copyright (C) 1999  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"),
  * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
  * and/or sell copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included
  * in all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
@@ -32,7 +32,7 @@
 #define POINTS_H
 
 
-#include "types.h"
+#include "mtypes.h"
 
 
 extern void
diff --git a/src/mesa/main/polygon.c b/src/mesa/main/polygon.c
index 125804196ac..b48d70eaf93 100644
--- a/src/mesa/main/polygon.c
+++ b/src/mesa/main/polygon.c
@@ -1,21 +1,21 @@
-/* $Id: polygon.c,v 1.15 2000/11/05 18:40:58 keithw Exp $ */
+/* $Id: polygon.c,v 1.16 2000/11/22 07:32:17 joukj Exp $ */
 
 /*
  * Mesa 3-D graphics library
  * Version:  3.5
- * 
+ *
  * Copyright (C) 1999-2000  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"),
  * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
  * and/or sell copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included
  * in all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
@@ -35,7 +35,7 @@
 #include "macros.h"
 #include "mem.h"
 #include "polygon.h"
-#include "types.h"
+#include "mtypes.h"
 #endif
 
 
@@ -94,7 +94,7 @@ _mesa_PolygonMode( GLenum face, GLenum mode )
    ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glPolygonMode");
 
    if (MESA_VERBOSE&VERBOSE_API)
-      fprintf(stderr, "glPolygonMode %s %s\n", 
+      fprintf(stderr, "glPolygonMode %s %s\n",
 	      gl_lookup_enum_by_nr(face),
 	      gl_lookup_enum_by_nr(mode));
 
@@ -144,7 +144,7 @@ _mesa_PolygonStipple( const GLubyte *pattern )
    _mesa_unpack_polygon_stipple(pattern, ctx->PolygonStipple, &ctx->Unpack);
 
    ctx->NewState |= _NEW_POLYGONSTIPPLE;
-   
+
    if (ctx->Driver.PolygonStipple)
       ctx->Driver.PolygonStipple( ctx, (const GLubyte *) ctx->PolygonStipple );
 }
diff --git a/src/mesa/main/polygon.h b/src/mesa/main/polygon.h
index 71e17cf56a7..af8b34b53e1 100644
--- a/src/mesa/main/polygon.h
+++ b/src/mesa/main/polygon.h
@@ -1,21 +1,21 @@
-/* $Id: polygon.h,v 1.2 1999/11/11 01:22:27 brianp Exp $ */
+/* $Id: polygon.h,v 1.3 2000/11/22 07:32:17 joukj Exp $ */
 
 /*
  * Mesa 3-D graphics library
  * Version:  3.3
- * 
+ *
  * Copyright (C) 1999  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"),
  * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
  * and/or sell copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included
  * in all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
@@ -29,7 +29,7 @@
 #define POLYGON_H
 
 
-#include "types.h"
+#include "mtypes.h"
 
 
 extern void
diff --git a/src/mesa/main/rastpos.c b/src/mesa/main/rastpos.c
index a59e22a36a1..63f4e5aa49e 100644
--- a/src/mesa/main/rastpos.c
+++ b/src/mesa/main/rastpos.c
@@ -1,21 +1,21 @@
-/* $Id: rastpos.c,v 1.14 2000/11/16 21:05:35 keithw Exp $ */
+/* $Id: rastpos.c,v 1.15 2000/11/22 07:32:17 joukj Exp $ */
 
 /*
  * Mesa 3-D graphics library
  * Version:  3.5
- * 
+ *
  * Copyright (C) 1999-2000  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"),
  * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
  * and/or sell copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included
  * in all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
@@ -39,7 +39,7 @@
 #include "rastpos.h"
 #include "state.h"
 #include "simple_list.h"
-#include "types.h"
+#include "mtypes.h"
 
 #include "math/m_matrix.h"
 #include "math/m_xform.h"
@@ -91,7 +91,7 @@ static GLuint gl_userclip_point( GLcontext* ctx, const GLfloat v[] )
 
 
 /* This has been split off to allow the normal shade routines to
- * get a little closer to the vertex buffer, and to use the 
+ * get a little closer to the vertex buffer, and to use the
  * GLvector objects directly.
  */
 static void gl_shade_rastpos( GLcontext *ctx,
@@ -112,7 +112,7 @@ static void gl_shade_rastpos( GLcontext *ctx,
    foreach (light, &ctx->Light.EnabledList) {
       GLfloat n_dot_h;
       GLfloat attenuation = 1.0;
-      GLfloat VP[3];  
+      GLfloat VP[3];
       GLfloat n_dot_VP;
       GLfloat *h;
       GLfloat contrib[3];
@@ -123,27 +123,27 @@ static void gl_shade_rastpos( GLcontext *ctx,
 	 attenuation = light->_VP_inf_spot_attenuation;
       }
       else {
-	 GLfloat d; 
-	 
+	 GLfloat d;
+	
 	 SUB_3V(VP, light->_Position, vertex);
 	 d = LEN_3FV( VP );
-	 
+	
 	 if ( d > 1e-6) {
 	    GLfloat invd = 1.0F / d;
 	    SELF_SCALE_SCALAR_3V(VP, invd);
 	 }
-	 attenuation = 1.0F / (light->ConstantAttenuation + d * 
-			       (light->LinearAttenuation + d * 
+	 attenuation = 1.0F / (light->ConstantAttenuation + d *
+			       (light->LinearAttenuation + d *
 				light->QuadraticAttenuation));
-	 
-	 if (light->_Flags & LIGHT_SPOT) 
+	
+	 if (light->_Flags & LIGHT_SPOT)
 	 {
 	    GLfloat PV_dot_dir = - DOT3(VP, light->_NormDirection);
-	    
+	
 	    if (PV_dot_dir<light->_CosCutoff) {
-	       continue; 
+	       continue;
 	    }
-	    else 
+	    else
 	    {
 	       double x = PV_dot_dir * (EXP_TABLE_SIZE-1);
 	       int k = (int) x;
@@ -154,7 +154,7 @@ static void gl_shade_rastpos( GLcontext *ctx,
 	 }
       }
 
-      if (attenuation < 1e-3) 
+      if (attenuation < 1e-3)
 	 continue;
 
       n_dot_VP = DOT3( normal, VP );
@@ -162,7 +162,7 @@ static void gl_shade_rastpos( GLcontext *ctx,
       if (n_dot_VP < 0.0F) {
 	 ACC_SCALE_SCALAR_3V(color, attenuation, light->_MatAmbient[0]);
 	 continue;
-      } 
+      }
 
       COPY_3V(contrib, light->_MatAmbient[0]);
       ACC_SCALE_SCALAR_3V(contrib, n_dot_VP, light->_MatDiffuse[0]);
@@ -186,7 +186,7 @@ static void gl_shade_rastpos( GLcontext *ctx,
 	    h = light->_h_inf_norm;
 	    normalized = 1;
 	 }
-	 
+	
 	 n_dot_h = DOT3(normal, h);
 
 	 if (n_dot_h > 0.0F) {
@@ -199,7 +199,7 @@ static void gl_shade_rastpos( GLcontext *ctx,
 	       n_dot_h /= LEN_SQUARED_3FV( h );
 	       shininess *= .5;
 	    }
-	    
+	
 	    GET_SHINE_TAB_ENTRY( ctx->_ShineTable[0], n_dot_h, spec_coef );
 
 	    if (spec_coef > 1.0e-10) {
@@ -211,7 +211,7 @@ static void gl_shade_rastpos( GLcontext *ctx,
       }
 
       ACC_SCALE_SCALAR_3V( color, attenuation, contrib );
-   } 
+   }
 
    if (ctx->Visual.RGBAflag) {
       Rcolor[0] = CLAMP(color[0], 0.0F, 1.0F);
@@ -244,7 +244,7 @@ static void raster_pos4f( GLcontext *ctx,
 
    /* KW: Added this test, which is in the spec.  We can't do this
     *     inside begin/end any more because the ctx->Current values
-    *     aren't uptodate during that period. 
+    *     aren't uptodate during that period.
     */
    FLUSH_TNL_RETURN(ctx, (FLUSH_INSIDE_BEGIN_END|
 			  FLUSH_STORED_VERTICES|
@@ -257,7 +257,7 @@ static void raster_pos4f( GLcontext *ctx,
    TRANSFORM_POINT( eye, ctx->ModelView.m, v );
 
    /* raster color */
-   if (ctx->Light.Enabled) 
+   if (ctx->Light.Enabled)
    {
       GLfloat *norm, eyenorm[3];
       GLfloat *objnorm = ctx->Current.Normal;
@@ -270,7 +270,7 @@ static void raster_pos4f( GLcontext *ctx,
 	 norm = objnorm;
       }
 
-      gl_shade_rastpos( ctx, v, norm, 
+      gl_shade_rastpos( ctx, v, norm,
 			ctx->Current.RasterColor,
 			&ctx->Current.RasterIndex );
 
@@ -303,7 +303,7 @@ static void raster_pos4f( GLcontext *ctx,
 
    /* clip to user clipping planes */
    if ( ctx->Transform._AnyClip &&
-	gl_userclip_point(ctx, clip) == 0) 
+	gl_userclip_point(ctx, clip) == 0)
    {
       ctx->Current.RasterPosValid = GL_FALSE;
       return;
@@ -316,11 +316,11 @@ static void raster_pos4f( GLcontext *ctx,
    ndc[1] = clip[1] * d;
    ndc[2] = clip[2] * d;
 
-   ctx->Current.RasterPos[0] = (ndc[0] * ctx->Viewport._WindowMap.m[MAT_SX] + 
+   ctx->Current.RasterPos[0] = (ndc[0] * ctx->Viewport._WindowMap.m[MAT_SX] +
 				ctx->Viewport._WindowMap.m[MAT_TX]);
-   ctx->Current.RasterPos[1] = (ndc[1] * ctx->Viewport._WindowMap.m[MAT_SY] + 
+   ctx->Current.RasterPos[1] = (ndc[1] * ctx->Viewport._WindowMap.m[MAT_SY] +
 				ctx->Viewport._WindowMap.m[MAT_TY]);
-   ctx->Current.RasterPos[2] = (ndc[2] * ctx->Viewport._WindowMap.m[MAT_SZ] + 
+   ctx->Current.RasterPos[2] = (ndc[2] * ctx->Viewport._WindowMap.m[MAT_SZ] +
 				ctx->Viewport._WindowMap.m[MAT_TZ]) / ctx->Visual.DepthMaxF;
    ctx->Current.RasterPos[3] = clip[3];
    ctx->Current.RasterPosValid = GL_TRUE;
diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c
index 2439655143e..8db7f013040 100644
--- a/src/mesa/main/state.c
+++ b/src/mesa/main/state.c
@@ -1,4 +1,4 @@
-/* $Id: state.c,v 1.46 2000/11/19 23:10:25 brianp Exp $ */
+/* $Id: state.c,v 1.47 2000/11/22 07:32:17 joukj Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -76,7 +76,7 @@
 #include "texobj.h"
 #include "texstate.h"
 #include "texture.h"
-#include "types.h"
+#include "mtypes.h"
 #include "varray.h"
 #include "winpos.h"
 
@@ -725,7 +725,7 @@ update_polygon( GLcontext *ctx )
       ctx->_TriangleCaps |= DD_TRI_OFFSET;
 }
 
-static void 
+static void
 calculate_model_project_matrix( GLcontext *ctx )
 {
    if (!ctx->_NeedEyeCoords) {
@@ -756,13 +756,13 @@ update_modelview_scale( GLcontext *ctx )
 }
 
 
-/* Bring uptodate any state that relies on _NeedEyeCoords.  
+/* Bring uptodate any state that relies on _NeedEyeCoords.
  */
 static void
 update_tnl_spaces( GLcontext *ctx, GLuint oldneedeyecoords )
-{   
+{
    /* Check if the truth-value interpretations of the bitfields have
-    * changed: 
+    * changed:
     */
    if ((oldneedeyecoords == 0) != (ctx->_NeedEyeCoords == 0)) {
       /* Recalculate all state that depends on _NeedEyeCoords.
@@ -780,12 +780,12 @@ update_tnl_spaces( GLcontext *ctx, GLuint oldneedeyecoords )
       /* Recalculate that same state if and only if it has been
        * invalidated by other statechanges.
        */
-      if (new_state & _NEW_MODELVIEW) 
+      if (new_state & _NEW_MODELVIEW)
 	 update_modelview_scale(ctx);
 
-      if (new_state & (_NEW_MODELVIEW|_NEW_PROJECTION)) 
+      if (new_state & (_NEW_MODELVIEW|_NEW_PROJECTION))
 	 calculate_model_project_matrix(ctx);
-	    
+	
       if (new_state & (_NEW_LIGHT|_NEW_MODELVIEW))
 	 gl_compute_light_positions( ctx );
    }
@@ -825,7 +825,7 @@ static void
 update_projection( GLcontext *ctx )
 {
    _math_matrix_analyze( &ctx->ProjectionMatrix );
-      
+
    /* Recompute clip plane positions in clipspace.  This is also done
     * in _mesa_ClipPlane().
     */
@@ -860,7 +860,7 @@ update_image_transfer_state(GLcontext *ctx)
 
    if (ctx->Pixel.IndexShift || ctx->Pixel.IndexOffset)
       mask |= IMAGE_SHIFT_OFFSET_BIT;
-   
+
    if (ctx->Pixel.MapColorFlag)
       mask |= IMAGE_MAP_COLOR_BIT;
 
@@ -910,7 +910,7 @@ update_image_transfer_state(GLcontext *ctx)
  * state references this value, and must be treated with care to
  * ensure that updates are done correctly.  All state dependent on
  * _NeedEyeCoords is calculated from within _mesa_update_tnl_spaces(),
- * and from nowhere else.  
+ * and from nowhere else.
  */
 void gl_update_state( GLcontext *ctx )
 {
@@ -920,18 +920,18 @@ void gl_update_state( GLcontext *ctx )
    if (MESA_VERBOSE & VERBOSE_STATE)
       gl_print_state("", new_state);
 
-   if (new_state & _NEW_MODELVIEW) 
+   if (new_state & _NEW_MODELVIEW)
       _math_matrix_analyze( &ctx->ModelView );
 
-   if (new_state & _NEW_PROJECTION) 
+   if (new_state & _NEW_PROJECTION)
       update_projection( ctx );
 
-   if (new_state & _NEW_TEXTURE_MATRIX) 
+   if (new_state & _NEW_TEXTURE_MATRIX)
       _mesa_update_texture_matrices( ctx );
 
-   if (new_state & _NEW_COLOR_MATRIX) 
+   if (new_state & _NEW_COLOR_MATRIX)
       _math_matrix_analyze( &ctx->ColorMatrix );
-   
+
    /* References ColorMatrix.type (derived above).
     */
    if (new_state & (_NEW_PIXEL|_NEW_COLOR_MATRIX))
@@ -939,18 +939,18 @@ void gl_update_state( GLcontext *ctx )
 
    /* Contributes to NeedEyeCoords, NeedNormals.
     */
-   if (new_state & _NEW_TEXTURE) 
+   if (new_state & _NEW_TEXTURE)
       _mesa_update_texture_state( ctx );
 
-   if (new_state & (_NEW_BUFFERS|_NEW_SCISSOR)) 
+   if (new_state & (_NEW_BUFFERS|_NEW_SCISSOR))
       update_drawbuffer( ctx );
 
-   if (new_state & _NEW_POLYGON) 
+   if (new_state & _NEW_POLYGON)
       update_polygon( ctx );
 
    /* Contributes to NeedEyeCoords, NeedNormals.
     */
-   if (new_state & _NEW_LIGHT) 
+   if (new_state & _NEW_LIGHT)
       gl_update_lighting( ctx );
 
    /* We can light in object space if the modelview matrix preserves
@@ -968,15 +968,15 @@ void gl_update_state( GLcontext *ctx )
     * If the truth value of either has changed, update for the new
     * lighting space and recompute the positions of lights and the
     * normal transform.
-    * 
+    *
     * If the lighting space hasn't changed, may still need to recompute
-    * light positions & normal transforms for other reasons.  
+    * light positions & normal transforms for other reasons.
     */
    if (new_state & (_NEW_MODELVIEW |
 		    _NEW_PROJECTION |
 		    _TNL_NEW_NORMAL_TRANSFORM |
 		    _NEW_LIGHT |
-		    _TNL_NEW_NEED_EYE_COORDS)) 
+		    _TNL_NEW_NEED_EYE_COORDS))
       update_tnl_spaces( ctx, oldneedeyecoords );
 
    /*
diff --git a/src/mesa/main/state.h b/src/mesa/main/state.h
index cd1a78f226f..1352f343266 100644
--- a/src/mesa/main/state.h
+++ b/src/mesa/main/state.h
@@ -1,21 +1,21 @@
-/* $Id: state.h,v 1.4 2000/11/19 23:10:25 brianp Exp $ */
+/* $Id: state.h,v 1.5 2000/11/22 07:32:17 joukj Exp $ */
 
 /*
  * Mesa 3-D graphics library
  * Version:  3.5
- * 
+ *
  * Copyright (C) 1999-2000  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"),
  * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
  * and/or sell copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included
  * in all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
@@ -28,7 +28,7 @@
 #ifndef STATE_H
 #define STATE_H
 
-#include "types.h"
+#include "mtypes.h"
 
 
 extern void
diff --git a/src/mesa/main/stencil.c b/src/mesa/main/stencil.c
index 93a83034922..6aed338eb97 100644
--- a/src/mesa/main/stencil.c
+++ b/src/mesa/main/stencil.c
@@ -1,21 +1,21 @@
-/* $Id: stencil.c,v 1.22 2000/10/31 18:09:45 keithw Exp $ */
+/* $Id: stencil.c,v 1.23 2000/11/22 07:32:17 joukj Exp $ */
 
 /*
  * Mesa 3-D graphics library
  * Version:  3.5
- * 
+ *
  * Copyright (C) 1999-2000  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"),
  * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
  * and/or sell copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included
  * in all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
@@ -34,7 +34,7 @@
 #include "macros.h"
 #include "mem.h"
 #include "stencil.h"
-#include "types.h"
+#include "mtypes.h"
 #include "enable.h"
 #endif
 
diff --git a/src/mesa/main/stencil.h b/src/mesa/main/stencil.h
index e85a2bdc4af..dda7b043d1b 100644
--- a/src/mesa/main/stencil.h
+++ b/src/mesa/main/stencil.h
@@ -1,21 +1,21 @@
-/* $Id: stencil.h,v 1.7 2000/10/31 18:09:45 keithw Exp $ */
+/* $Id: stencil.h,v 1.8 2000/11/22 07:32:17 joukj Exp $ */
 
 /*
  * Mesa 3-D graphics library
  * Version:  3.3
- * 
+ *
  * Copyright (C) 1999-2000  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"),
  * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
  * and/or sell copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included
  * in all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
@@ -29,7 +29,7 @@
 #define STENCIL_H
 
 
-#include "types.h"
+#include "mtypes.h"
 
 
 extern void
diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index 25948e2bb22..52455a35955 100644
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -1,21 +1,21 @@
-/* $Id: teximage.c,v 1.64 2000/11/21 23:25:40 brianp Exp $ */
+/* $Id: teximage.c,v 1.65 2000/11/22 07:32:17 joukj Exp $ */
 
 /*
  * Mesa 3-D graphics library
  * Version:  3.5
- * 
+ *
  * Copyright (C) 1999-2000  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"),
  * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
  * and/or sell copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included
  * in all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
@@ -38,7 +38,7 @@
 #include "state.h"
 #include "teximage.h"
 #include "texstate.h"
-#include "types.h"
+#include "mtypes.h"
 #include "swrast/s_span.h" /* XXX SWRAST hack */
 #endif
 
@@ -759,7 +759,7 @@ fill_texture_image( GLcontext *ctx, GLuint dimensions,
          }
          return;  /* all done */
       }
-   }      
+   }
 
    /*
     * General case solutions
@@ -829,7 +829,7 @@ fill_texture_image( GLcontext *ctx, GLuint dimensions,
                ASSERT(ctx->Pixel.Convolution1DEnabled);
                _mesa_convolve_1d_image(ctx, &convWidth, tmpImage, convImage);
             }
-            else {         
+            else {
                if (ctx->Pixel.Convolution2DEnabled) {
                   _mesa_convolve_2d_image(ctx, &convWidth, &convHeight,
                                           tmpImage, convImage);
@@ -2657,7 +2657,7 @@ _mesa_CopyTexImage1D( GLenum target, GLint level,
    if (ctx->NewState & _NEW_PIXEL)
       gl_update_state(ctx);
 
-   if (ctx->_ImageTransferState || !ctx->Driver.CopyTexImage1D 
+   if (ctx->_ImageTransferState || !ctx->Driver.CopyTexImage1D
        || !(*ctx->Driver.CopyTexImage1D)(ctx, target, level,
                          internalFormat, x, y, width, border)) {
       struct gl_pixelstore_attrib unpackSave;
@@ -2754,7 +2754,7 @@ _mesa_CopyTexSubImage1D( GLenum target, GLint level,
          gl_error( ctx, GL_OUT_OF_MEMORY, "glCopyTexSubImage2D" );
          return;
       }
-      
+
       /* now call glTexSubImage1D to do the real work */
       unpackSave = ctx->Unpack;
       ctx->Unpack = _mesa_native_packing;
@@ -2808,7 +2808,7 @@ _mesa_CopyTexSubImage2D( GLenum target, GLint level,
       _mesa_TexSubImage2D(target, level, xoffset, yoffset, width, height,
                           GL_RGBA, GL_UNSIGNED_BYTE, image);
       ctx->Unpack = unpackSave;
-      
+
       FREE(image);
    }
 }
@@ -2855,7 +2855,7 @@ _mesa_CopyTexSubImage3D( GLenum target, GLint level,
       _mesa_TexSubImage3D(target, level, xoffset, yoffset, zoffset,
                           width, height, 1, GL_RGBA, GL_UNSIGNED_BYTE, image);
       ctx->Unpack = unpackSave;
-      
+
       FREE(image);
    }
 }
diff --git a/src/mesa/main/teximage.h b/src/mesa/main/teximage.h
index 585c95f0020..a3baa5f3044 100644
--- a/src/mesa/main/teximage.h
+++ b/src/mesa/main/teximage.h
@@ -1,21 +1,21 @@
-/* $Id: teximage.h,v 1.14 2000/10/16 23:43:12 brianp Exp $ */
+/* $Id: teximage.h,v 1.15 2000/11/22 07:32:17 joukj Exp $ */
 
 /*
  * Mesa 3-D graphics library
  * Version:  3.5
- * 
+ *
  * Copyright (C) 1999-2000  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"),
  * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
  * and/or sell copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included
  * in all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
@@ -29,7 +29,7 @@
 #define TEXIMAGE_H
 
 
-#include "types.h"
+#include "mtypes.h"
 
 
 /*** Internal functions ***/
@@ -143,7 +143,7 @@ _mesa_CopyTexImage2D( GLenum target, GLint level,
 
 
 extern void
-_mesa_CopyTexSubImage1D( GLenum target, GLint level, GLint xoffset, 
+_mesa_CopyTexSubImage1D( GLenum target, GLint level, GLint xoffset,
                          GLint x, GLint y, GLsizei width );
 
 
@@ -153,7 +153,7 @@ _mesa_CopyTexSubImage2D( GLenum target, GLint level,
                          GLint x, GLint y, GLsizei width, GLsizei height );
 
 
-extern void 
+extern void
 _mesa_CopyTexSubImage3D( GLenum target, GLint level,
                          GLint xoffset, GLint yoffset, GLint zoffset,
                          GLint x, GLint y, GLsizei width, GLsizei height );
diff --git a/src/mesa/main/texobj.c b/src/mesa/main/texobj.c
index f0372237ca2..f090fcd734c 100644
--- a/src/mesa/main/texobj.c
+++ b/src/mesa/main/texobj.c
@@ -1,21 +1,21 @@
-/* $Id: texobj.c,v 1.34 2000/11/19 23:10:25 brianp Exp $ */
+/* $Id: texobj.c,v 1.35 2000/11/22 07:32:17 joukj Exp $ */
 
 /*
  * Mesa 3-D graphics library
  * Version:  3.5
- * 
+ *
  * Copyright (C) 1999-2000  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"),
  * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
  * and/or sell copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included
  * in all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
@@ -38,7 +38,7 @@
 #include "teximage.h"
 #include "texstate.h"
 #include "texobj.h"
-#include "types.h"
+#include "mtypes.h"
 #endif
 
 
@@ -626,7 +626,7 @@ _mesa_BindTexture( GLenum target, GLuint texName )
    ctx->NewState |= _NEW_TEXTURE;
 
    /* Pass BindTexture call to device driver */
-   if (ctx->Driver.BindTexture) 
+   if (ctx->Driver.BindTexture)
       (*ctx->Driver.BindTexture)( ctx, target, newTexObj );
 
    if (oldTexObj->Name > 0) {
@@ -680,7 +680,7 @@ _mesa_PrioritizeTextures( GLsizei n, const GLuint *texName,
 
 
 /*
- * Execute glAreTexturesResident 
+ * Execute glAreTexturesResident
  */
 GLboolean
 _mesa_AreTexturesResident(GLsizei n, const GLuint *texName,
@@ -690,7 +690,7 @@ _mesa_AreTexturesResident(GLsizei n, const GLuint *texName,
    GLboolean allResident = GL_TRUE;
    GLint i;
 
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH_WITH_RETVAL(ctx, 
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH_WITH_RETVAL(ctx,
                                             "glAreTexturesResident", GL_FALSE);
    if (n < 0) {
       gl_error(ctx, GL_INVALID_VALUE, "glAreTexturesResident(n)");
diff --git a/src/mesa/main/texobj.h b/src/mesa/main/texobj.h
index c6948398b17..b58c02fb8fa 100644
--- a/src/mesa/main/texobj.h
+++ b/src/mesa/main/texobj.h
@@ -1,21 +1,21 @@
-/* $Id: texobj.h,v 1.4 2000/11/19 23:10:25 brianp Exp $ */
+/* $Id: texobj.h,v 1.5 2000/11/22 07:32:17 joukj Exp $ */
 
 /*
  * Mesa 3-D graphics library
  * Version:  3.5
- * 
+ *
  * Copyright (C) 1999-2000  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"),
  * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
  * and/or sell copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included
  * in all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
@@ -29,7 +29,7 @@
 #define TEXTOBJ_H
 
 
-#include "types.h"
+#include "mtypes.h"
 
 
 
diff --git a/src/mesa/main/texstate.c b/src/mesa/main/texstate.c
index a99325672c4..e481bedf24f 100644
--- a/src/mesa/main/texstate.c
+++ b/src/mesa/main/texstate.c
@@ -1,21 +1,21 @@
-/* $Id: texstate.c,v 1.23 2000/11/19 23:10:25 brianp Exp $ */
+/* $Id: texstate.c,v 1.24 2000/11/22 07:32:17 joukj Exp $ */
 
 /*
  * Mesa 3-D graphics library
  * Version:  3.5
- * 
+ *
  * Copyright (C) 1999-2000  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"),
  * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
  * and/or sell copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included
  * in all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
@@ -38,7 +38,7 @@
 #include "teximage.h"
 #include "texstate.h"
 #include "texture.h"
-#include "types.h"
+#include "mtypes.h"
 #include "math/m_xform.h"
 #include "math/m_matrix.h"
 #include "swrast/swrast.h"
@@ -343,7 +343,7 @@ _mesa_TexEnvfv( GLenum target, GLenum pname, const GLfloat *param )
    }
 
    if (MESA_VERBOSE&(VERBOSE_API|VERBOSE_TEXTURE))
-      fprintf(stderr, "glTexEnv %s %s %.1f(%s) ...\n",  
+      fprintf(stderr, "glTexEnv %s %s %.1f(%s) ...\n",
 	      gl_lookup_enum_by_nr(target),
 	      gl_lookup_enum_by_nr(pname),
 	      *param,
@@ -608,7 +608,7 @@ _mesa_TexParameterfv( GLenum target, GLenum pname, const GLfloat *params )
    ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glTexParameterfv");
 
    if (MESA_VERBOSE&(VERBOSE_API|VERBOSE_TEXTURE))
-      fprintf(stderr, "texPARAM %s %s %d...\n", 
+      fprintf(stderr, "texPARAM %s %s %d...\n",
 	      gl_lookup_enum_by_nr(target),
 	      gl_lookup_enum_by_nr(pname),
 	      eparam);
@@ -1072,7 +1072,7 @@ _mesa_TexGenfv( GLenum coord, GLenum pname, const GLfloat *params )
    ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glTexGenfv");
 
    if (MESA_VERBOSE&(VERBOSE_API|VERBOSE_TEXTURE))
-      fprintf(stderr, "texGEN %s %s %x...\n", 
+      fprintf(stderr, "texGEN %s %s %x...\n",
 	      gl_lookup_enum_by_nr(coord),
 	      gl_lookup_enum_by_nr(pname),
 	      *(int *)params);
@@ -1222,7 +1222,7 @@ _mesa_TexGenfv( GLenum coord, GLenum pname, const GLfloat *params )
          if (pname==GL_TEXTURE_GEN_MODE) {
 	    GLenum mode = (GLenum) (GLint) *params;
 	    switch (mode) {
-	    case GL_OBJECT_LINEAR: 
+	    case GL_OBJECT_LINEAR:
 	       texUnit->GenModeQ = GL_OBJECT_LINEAR;
 	       texUnit->_GenBitQ = TEXGEN_OBJ_LINEAR;
 	       break;
@@ -1577,7 +1577,7 @@ _mesa_ActiveTextureARB( GLenum target )
    ASSERT_OUTSIDE_BEGIN_END( ctx, "glActiveTextureARB" );
 
    if (MESA_VERBOSE & (VERBOSE_API|VERBOSE_TEXTURE))
-      fprintf(stderr, "glActiveTexture %s\n", 
+      fprintf(stderr, "glActiveTexture %s\n",
 	      gl_lookup_enum_by_nr(target));
 
    if (target >= GL_TEXTURE0_ARB && target < GL_TEXTURE0_ARB + maxUnits) {
diff --git a/src/mesa/main/texstate.h b/src/mesa/main/texstate.h
index d9dd060abd2..088fddcc913 100644
--- a/src/mesa/main/texstate.h
+++ b/src/mesa/main/texstate.h
@@ -1,21 +1,21 @@
-/* $Id: texstate.h,v 1.4 2000/11/19 23:10:25 brianp Exp $ */
+/* $Id: texstate.h,v 1.5 2000/11/22 07:32:17 joukj Exp $ */
 
 /*
  * Mesa 3-D graphics library
  * Version:  3.1
- * 
+ *
  * Copyright (C) 1999  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"),
  * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
  * and/or sell copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included
  * in all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
@@ -32,7 +32,7 @@
 #define TEXSTATE_H
 
 
-#include "types.h"
+#include "mtypes.h"
 
 
 /*** Called from API ***/
diff --git a/src/mesa/main/texutil.c b/src/mesa/main/texutil.c
index 1d0da731c96..6ccc2f215a6 100644
--- a/src/mesa/main/texutil.c
+++ b/src/mesa/main/texutil.c
@@ -1,21 +1,21 @@
-/* $Id: texutil.c,v 1.9 2000/11/09 22:41:25 brianp Exp $ */
+/* $Id: texutil.c,v 1.10 2000/11/22 07:32:17 joukj Exp $ */
 
 /*
  * Mesa 3-D graphics library
  * Version:  3.4
- * 
+ *
  * Copyright (C) 1999-2000  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"),
  * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
  * and/or sell copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included
  * in all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
@@ -33,7 +33,7 @@
 #include "image.h"
 #include "mem.h"
 #include "texutil.h"
-#include "types.h"
+#include "mtypes.h"
 #endif
 
 
@@ -802,7 +802,7 @@ _mesa_convert_texsubimage(MesaIntTexFormat dstFormat,
    dstYoffset *= hScale;
 
    /* XXX hscale != 1 and wscale != 1 not tested!!!! */
-   
+
    switch (dstFormat) {
       case MESA_I8:
       case MESA_L8:
diff --git a/src/mesa/main/texutil.h b/src/mesa/main/texutil.h
index 23c2840bbce..6790d9b3354 100644
--- a/src/mesa/main/texutil.h
+++ b/src/mesa/main/texutil.h
@@ -1,21 +1,21 @@
-/* $Id: texutil.h,v 1.5 2000/10/29 18:12:15 brianp Exp $ */
+/* $Id: texutil.h,v 1.6 2000/11/22 07:32:17 joukj Exp $ */
 
 /*
  * Mesa 3-D graphics library
  * Version:  3.5
- * 
+ *
  * Copyright (C) 1999-2000  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"),
  * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
  * and/or sell copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included
  * in all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
@@ -29,7 +29,7 @@
 #define TEXUTIL_H
 
 
-#include "types.h"
+#include "mtypes.h"
 
 
 
diff --git a/src/mesa/main/varray.c b/src/mesa/main/varray.c
index 3cd368779c0..d03f0b79ff0 100644
--- a/src/mesa/main/varray.c
+++ b/src/mesa/main/varray.c
@@ -1,21 +1,21 @@
-/* $Id: varray.c,v 1.31 2000/11/16 21:05:35 keithw Exp $ */
+/* $Id: varray.c,v 1.32 2000/11/22 07:32:17 joukj Exp $ */
 
 /*
  * Mesa 3-D graphics library
  * Version:  3.5
- * 
+ *
  * Copyright (C) 1999-2000  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"),
  * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
  * and/or sell copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included
  * in all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
@@ -37,7 +37,7 @@
 #include "mmath.h"
 #include "state.h"
 #include "texstate.h"
-#include "types.h"
+#include "mtypes.h"
 #include "varray.h"
 #include "math/m_translate.h"
 #endif
@@ -48,7 +48,7 @@ void
 _mesa_VertexPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *ptr)
 {
    GET_CURRENT_CONTEXT(ctx);
-   
+
    if (size<2 || size>4) {
       gl_error( ctx, GL_INVALID_VALUE, "glVertexPointer(size)" );
       return;
@@ -57,9 +57,9 @@ _mesa_VertexPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *ptr)
       gl_error( ctx, GL_INVALID_VALUE, "glVertexPointer(stride)" );
       return;
    }
-   
+
    if (MESA_VERBOSE&(VERBOSE_VARRAY|VERBOSE_API))
-      fprintf(stderr, "glVertexPointer( sz %d type %s stride %d )\n", size, 
+      fprintf(stderr, "glVertexPointer( sz %d type %s stride %d )\n", size,
 	      gl_lookup_enum_by_nr( type ),
 	      stride);
 
@@ -101,14 +101,14 @@ void
 _mesa_NormalPointer(GLenum type, GLsizei stride, const GLvoid *ptr )
 {
    GET_CURRENT_CONTEXT(ctx);
-   
+
    if (stride<0) {
       gl_error( ctx, GL_INVALID_VALUE, "glNormalPointer(stride)" );
       return;
    }
 
    if (MESA_VERBOSE&(VERBOSE_VARRAY|VERBOSE_API))
-      fprintf(stderr, "glNormalPointer( type %s stride %d )\n", 
+      fprintf(stderr, "glNormalPointer( type %s stride %d )\n",
 	      gl_lookup_enum_by_nr( type ),
 	      stride);
 
@@ -162,7 +162,7 @@ _mesa_ColorPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *ptr)
    }
 
    if (MESA_VERBOSE&(VERBOSE_VARRAY|VERBOSE_API))
-      fprintf(stderr, "glColorPointer( sz %d type %s stride %d )\n", size, 
+      fprintf(stderr, "glColorPointer( sz %d type %s stride %d )\n", size,
 	  gl_lookup_enum_by_nr( type ),
 	  stride);
 
@@ -215,7 +215,7 @@ void
 _mesa_FogCoordPointerEXT(GLenum type, GLsizei stride, const GLvoid *ptr)
 {
    GET_CURRENT_CONTEXT(ctx);
-   
+
    if (stride<0) {
       gl_error( ctx, GL_INVALID_VALUE, "glFogCoordPointer(stride)" );
       return;
@@ -250,7 +250,7 @@ void
 _mesa_IndexPointer(GLenum type, GLsizei stride, const GLvoid *ptr)
 {
    GET_CURRENT_CONTEXT(ctx);
-   
+
    if (stride<0) {
       gl_error( ctx, GL_INVALID_VALUE, "glIndexPointer(stride)" );
       return;
@@ -291,7 +291,7 @@ _mesa_IndexPointer(GLenum type, GLsizei stride, const GLvoid *ptr)
 
 
 void
-_mesa_SecondaryColorPointerEXT(GLint size, GLenum type, 
+_mesa_SecondaryColorPointerEXT(GLint size, GLenum type,
 			       GLsizei stride, const GLvoid *ptr)
 {
    GET_CURRENT_CONTEXT(ctx);
@@ -306,7 +306,7 @@ _mesa_SecondaryColorPointerEXT(GLint size, GLenum type,
    }
 
    if (MESA_VERBOSE&(VERBOSE_VARRAY|VERBOSE_API))
-      fprintf(stderr, "glColorPointer( sz %d type %s stride %d )\n", size, 
+      fprintf(stderr, "glColorPointer( sz %d type %s stride %d )\n", size,
 	  gl_lookup_enum_by_nr( type ),
 	  stride);
 
@@ -360,7 +360,7 @@ _mesa_TexCoordPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *ptr
 {
    GET_CURRENT_CONTEXT(ctx);
    GLuint texUnit;
-   
+
    texUnit = ctx->Array.ActiveTexture;
 
    if (size<1 || size>4) {
@@ -373,9 +373,9 @@ _mesa_TexCoordPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *ptr
    }
 
    if (MESA_VERBOSE&(VERBOSE_VARRAY|VERBOSE_API))
-      fprintf(stderr, "glTexCoordPointer( unit %u sz %d type %s stride %d )\n", 
+      fprintf(stderr, "glTexCoordPointer( unit %u sz %d type %s stride %d )\n",
 	  texUnit,
-	  size, 
+	  size,
 	  gl_lookup_enum_by_nr( type ),
 	  stride);
 
@@ -510,7 +510,7 @@ _mesa_InterleavedArrays(GLenum format, GLsizei stride, const GLvoid *pointer)
    GLint defstride;                /* default stride */
    GLint c, f;
    GLint coordUnitSave;
-   
+
    f = sizeof(GLfloat);
    c = f * ((4*sizeof(GLubyte) + (f-1)) / f);
 
diff --git a/src/mesa/main/varray.h b/src/mesa/main/varray.h
index bc5a679094b..3e30cf5bf1f 100644
--- a/src/mesa/main/varray.h
+++ b/src/mesa/main/varray.h
@@ -1,21 +1,21 @@
-/* $Id: varray.h,v 1.9 2000/11/16 21:05:35 keithw Exp $ */
+/* $Id: varray.h,v 1.10 2000/11/22 07:32:17 joukj Exp $ */
 
 /*
  * Mesa 3-D graphics library
  * Version:  3.3
- * 
+ *
  * Copyright (C) 1999-2000  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"),
  * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
  * and/or sell copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included
  * in all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
@@ -29,7 +29,7 @@
 #define VARRAY_H
 
 
-#include "types.h"
+#include "mtypes.h"
 
 
 extern void
@@ -91,7 +91,7 @@ extern void
 _mesa_FogCoordPointerEXT(GLenum type, GLsizei stride, const GLvoid *ptr);
 
 extern void
-_mesa_SecondaryColorPointerEXT(GLint size, GLenum type, 
+_mesa_SecondaryColorPointerEXT(GLint size, GLenum type,
 			       GLsizei stride, const GLvoid *ptr);