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.

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

6 files changed, 99 insertions, 99 deletions

diff --git a/src/mesa/drivers/x11/fakeglx.c b/src/mesa/drivers/x11/fakeglx.c
index ae481755b5f..dfd9bafdf41 100644
--- a/src/mesa/drivers/x11/fakeglx.c
+++ b/src/mesa/drivers/x11/fakeglx.c
@@ -1,21 +1,21 @@
-/* $Id: fakeglx.c,v 1.39 2000/11/10 17:23:03 brianp Exp $ */
+/* $Id: fakeglx.c,v 1.40 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
@@ -49,7 +49,7 @@
 #include "config.h"
 #include "macros.h"
 #include "mmath.h"
-#include "types.h"
+#include "mtypes.h"
 #include "xfonts.h"
 #include "xmesaP.h"
 
@@ -987,7 +987,7 @@ Fake_glXChooseVisual( Display *dpy, int screen, int *list )
 	    parselist++;
 	    parselist++;
 	    break;
-         
+
          /*
           * GLX_EXT_visual_info extension
           */
diff --git a/src/mesa/drivers/x11/xm_api.c b/src/mesa/drivers/x11/xm_api.c
index 412d1eed966..be03832b7dc 100644
--- a/src/mesa/drivers/x11/xm_api.c
+++ b/src/mesa/drivers/x11/xm_api.c
@@ -1,21 +1,21 @@
-/* $Id: xm_api.c,v 1.9 2000/11/17 21:01:48 brianp Exp $ */
+/* $Id: xm_api.c,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
@@ -71,7 +71,7 @@
 #include "glthread.h"
 #include "matrix.h"
 #include "mem.h"
-#include "types.h"
+#include "mtypes.h"
 #ifdef HAVE_CONFIG_H
 #include "conf.h"
 #endif
@@ -149,7 +149,7 @@ static short hpcr_rgbTbl[3][256] = {
 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191,
 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207,
 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223
-} 
+}
 };
 
 
@@ -783,7 +783,7 @@ noFaultXAllocColor( int client,
       subColor.pixel = (unsigned long) bestmatch;
       subColor.red   = ctable[bestmatch].red;
       subColor.green = ctable[bestmatch].green;
-      subColor.blue  = ctable[bestmatch].blue;   
+      subColor.blue  = ctable[bestmatch].blue;
       subColor.flags = DoRed | DoGreen | DoBlue;
       *alloced = 0;
    }
@@ -821,7 +821,7 @@ static GLboolean setup_grayscale( int client, XMesaVisual v,
 
       prevBuffer = find_xmesa_buffer(v->display, cmap, buffer);
       if (prevBuffer &&
-          (buffer->xm_visual->gl_visual->RGBAflag == 
+          (buffer->xm_visual->gl_visual->RGBAflag ==
            prevBuffer->xm_visual->gl_visual->RGBAflag)) {
          /* Copy colormap stuff from previous XMesaBuffer which uses same
           * X colormap.  Do this to avoid time spent in noFaultXAllocColor.
@@ -909,7 +909,7 @@ static GLboolean setup_dithered_color( int client, XMesaVisual v,
 
       prevBuffer = find_xmesa_buffer(v->display, cmap, buffer);
       if (prevBuffer &&
-          (buffer->xm_visual->gl_visual->RGBAflag == 
+          (buffer->xm_visual->gl_visual->RGBAflag ==
            prevBuffer->xm_visual->gl_visual->RGBAflag)) {
          /* Copy colormap stuff from previous, matching XMesaBuffer.
           * Do this to avoid time spent in noFaultXAllocColor.
@@ -982,8 +982,8 @@ static void setup_8bit_hpcr( XMesaVisual v )
    int i;
    double g;
 
-   g = 1.0 / v->RedGamma; 
-   for (i=0; i<256; i++) { 
+   g = 1.0 / v->RedGamma;
+   for (i=0; i<256; i++) {
       GLint red = (GLint) (255.0 * pow( hpcr_rgbTbl[0][i]/255.0, g ) + 0.5);
       v->hpcr_rgbTbl[0][i] = CLAMP( red, 16, 239 );
    }
@@ -1670,7 +1670,7 @@ XMesaContext XMesaCreateContext( XMesaVisual v, XMesaContext share_list )
 
    xmesa_register_swrast_functions( ctx );
 
-   /* Run the config file 
+   /* Run the config file
     */
    _mesa_context_initialize( ctx );
 
@@ -1852,7 +1852,7 @@ XMesaBuffer XMesaCreateWindowBuffer2( XMesaVisual v, XMesaWindow w,
          attribs[numAttribs++] = (int) c->gl_ctx;
        }
        attribs[numAttribs++] = FXMESA_NONE;
-       
+
        if ((hw = fxQueryHardware())==GR_SSTTYPE_VOODOO) {
          b->FXctx = fxMesaCreateBestContext(0, b->width, b->height, attribs);
          if ((v->undithered_pf!=PF_INDEX) && (b->backimage)) {
@@ -2280,7 +2280,7 @@ static void FXgetImage( XMesaBuffer b )
          /* read row from 3Dfx frame buffer */
          grLfbReadRegion( GR_BUFFER_FRONTBUFFER,
                           0, xmesa->xm_buffer->FXctx->height-(b->height-y),
-                          b->width, 1, 
+                          b->width, 1,
                           0,
                           pixbuf );
 
@@ -2299,7 +2299,7 @@ static void FXgetImage( XMesaBuffer b )
          /* read row from 3Dfx frame buffer */
          grLfbReadRegion( GR_BUFFER_FRONTBUFFER,
                           0, xmesa->xm_buffer->FXctx->height-(b->height-y),
-                          b->width, 1, 
+                          b->width, 1,
                           0,
                           pixbuf );
 
diff --git a/src/mesa/drivers/x11/xm_dd.c b/src/mesa/drivers/x11/xm_dd.c
index 21c984d310c..d03790be0b3 100644
--- a/src/mesa/drivers/x11/xm_dd.c
+++ b/src/mesa/drivers/x11/xm_dd.c
@@ -1,21 +1,21 @@
-/* $Id: xm_dd.c,v 1.6 2000/11/16 21:05:40 keithw Exp $ */
+/* $Id: xm_dd.c,v 1.7 2000/11/22 07:32:18 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
@@ -32,7 +32,7 @@
 #include "state.h"
 #include "depth.h"
 #include "macros.h"
-#include "types.h"
+#include "mtypes.h"
 #include "xmesaP.h"
 #include "extensions.h"
 #include "swrast/swrast.h"
@@ -434,14 +434,14 @@ clear_16bit_ximage( GLcontext *ctx, GLboolean all,
       }
       else {
          pixel = pixel | (pixel<<16);
-         n = xmesa->xm_buffer->backimage->bytes_per_line 
+         n = xmesa->xm_buffer->backimage->bytes_per_line
             * xmesa->xm_buffer->height / 4;
          do {
             *ptr4++ = pixel;
                n--;
          } while (n!=0);
-         
-         if ((xmesa->xm_buffer->backimage->bytes_per_line * 
+
+         if ((xmesa->xm_buffer->backimage->bytes_per_line *
               xmesa->xm_buffer->height) & 0x2)
             *(GLushort *)ptr4 = pixel & 0xffff;
       }
@@ -905,7 +905,7 @@ void xmesa_update_state( GLcontext *ctx )
       break;
    }
 
-   xmesa_update_span_funcs(ctx); 
+   xmesa_update_span_funcs(ctx);
 }
 
 
@@ -919,7 +919,7 @@ void xmesa_init_pointers( GLcontext *ctx )
    ctx->Driver.GetBufferSize = get_buffer_size;
    ctx->Driver.Flush = flush;
    ctx->Driver.Finish = finish;
-   
+
    ctx->Driver.RenderStart = 0;
    ctx->Driver.RenderFinish = _swrast_flush;
 
diff --git a/src/mesa/drivers/x11/xm_line.c b/src/mesa/drivers/x11/xm_line.c
index 328ba65cee0..881e219713f 100644
--- a/src/mesa/drivers/x11/xm_line.c
+++ b/src/mesa/drivers/x11/xm_line.c
@@ -1,21 +1,21 @@
-/* $Id: xm_line.c,v 1.11 2000/11/19 23:10:26 brianp Exp $ */
+/* $Id: xm_line.c,v 1.12 2000/11/22 07:32:18 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 "glxheader.h"
 #include "depth.h"
 #include "macros.h"
-#include "types.h"
+#include "mtypes.h"
 #include "xmesaP.h"
 
 /* Internal swrast includes:
@@ -65,8 +65,8 @@ static void draw_points_ANY_pixmap( GLcontext *ctx, const SWvertex *vert )
       register int x, y;
       const GLubyte *color = vert->color;
       unsigned long pixel = xmesa_color_to_pixel( xmesa,
-						  color[0], color[1], 
-						  color[2], color[3], 
+						  color[0], color[1],
+						  color[2], color[3],
 						  xmesa->pixelformat);
       XMesaSetForeground( dpy, gc, pixel );
       x =                         (GLint) vert->win[0];
@@ -95,13 +95,13 @@ void xmesa_choose_point( GLcontext *ctx )
    SWcontext *swrast = SWRAST_CONTEXT(ctx);
 
    if (ctx->RenderMode == GL_RENDER
-       && ctx->Point.Size == 1.0F && !ctx->Point.SmoothFlag 
+       && ctx->Point.Size == 1.0F && !ctx->Point.SmoothFlag
        && swrast->_RasterMask == 0
        && !ctx->Texture._ReallyEnabled
        && xmesa->xm_buffer->buffer != XIMAGE) {
       swrast->Point = draw_points_ANY_pixmap;
    }
-   else { 
+   else {
       _swrast_choose_point( ctx );
    }
 }
@@ -615,7 +615,7 @@ static swrast_line_func get_line_func( GLcontext *ctx )
 
 /* Override for the swrast line-selection function.  Try to use one
  * of our internal line functions, otherwise fall back to the
- * standard swrast functions.  
+ * standard swrast functions.
  */
 void xmesa_choose_line( GLcontext *ctx )
 {
@@ -645,17 +645,17 @@ void xmesa_choose_line( GLcontext *ctx )
                             _SWRAST_NEW_RASTERMASK)
 
 
-/* Extend the software rasterizer with our line/point/triangle 
+/* Extend the software rasterizer with our line/point/triangle
  * functions.
  */
 void xmesa_register_swrast_functions( GLcontext *ctx )
 {
    SWcontext *swrast = SWRAST_CONTEXT( ctx );
-   
+
    swrast->choose_point = xmesa_choose_point;
    swrast->choose_line = xmesa_choose_line;
    swrast->choose_triangle = xmesa_choose_triangle;
-   
+
    swrast->invalidate_point |= XMESA_NEW_POINT;
    swrast->invalidate_line |= XMESA_NEW_LINE;
    swrast->invalidate_triangle |= XMESA_NEW_TRIANGLE;
diff --git a/src/mesa/drivers/x11/xm_span.c b/src/mesa/drivers/x11/xm_span.c
index 0d4eaab1c6d..eb91fb329d4 100644
--- a/src/mesa/drivers/x11/xm_span.c
+++ b/src/mesa/drivers/x11/xm_span.c
@@ -1,21 +1,21 @@
-/* $Id: xm_span.c,v 1.3 2000/11/16 21:05:40 keithw Exp $ */
+/* $Id: xm_span.c,v 1.4 2000/11/22 07:32:18 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
@@ -32,7 +32,7 @@
 #include "state.h"
 #include "depth.h"
 #include "macros.h"
-#include "types.h"
+#include "mtypes.h"
 #include "xmesaP.h"
 #include "extensions.h"
 
@@ -4190,7 +4190,7 @@ clear_color_HPCR_pixmap( GLcontext *ctx,
    xmesa->clearcolor[2] = b;
    xmesa->clearcolor[3] = a;
 
- 
+
    if (0x0==r && 0x0==g && 0x0==b) {
       /* black is black */
       for (i=0; i<16; i++) {
@@ -4205,9 +4205,9 @@ clear_color_HPCR_pixmap( GLcontext *ctx,
       }
    }
    /* change tile pixmap content */
-   XMesaPutImage(xmesa->display, 
-		 (XMesaDrawable)xmesa->xm_visual->hpcr_clear_pixmap, 
-		 xmesa->xm_buffer->cleargc, 
+   XMesaPutImage(xmesa->display,
+		 (XMesaDrawable)xmesa->xm_visual->hpcr_clear_pixmap,
+		 xmesa->xm_buffer->cleargc,
 		 xmesa->xm_visual->hpcr_clear_ximage, 0, 0, 0, 0, 16, 2);
 }
 
diff --git a/src/mesa/drivers/x11/xm_tri.c b/src/mesa/drivers/x11/xm_tri.c
index c2b15034ada..1ffe277ecc7 100644
--- a/src/mesa/drivers/x11/xm_tri.c
+++ b/src/mesa/drivers/x11/xm_tri.c
@@ -1,21 +1,21 @@
-/* $Id: xm_tri.c,v 1.11 2000/11/19 23:10:26 brianp Exp $ */
+/* $Id: xm_tri.c,v 1.12 2000/11/22 07:32:18 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 "glxheader.h"
 #include "depth.h"
 #include "macros.h"
-#include "types.h"
+#include "mtypes.h"
 #include "xmesaP.h"
 
 /* Internal swrast includes:
@@ -368,7 +368,7 @@ static void smooth_DITHER_z_triangle( GLcontext *ctx,
 /*
  * XImage, smooth, depth-buffered, 8-bit PF_LOOKUP triangle.
  */
-static void smooth_LOOKUP8_z_triangle( GLcontext *ctx, 
+static void smooth_LOOKUP8_z_triangle( GLcontext *ctx,
 				       const SWvertex *v0,
 				       const SWvertex *v1,
 				       const SWvertex *v2 )
@@ -404,7 +404,7 @@ static void smooth_LOOKUP8_z_triangle( GLcontext *ctx,
 /*
  * XImage, smooth, depth-buffered, 8-bit PF_HPCR triangle.
  */
-static void smooth_HPCR_z_triangle( GLcontext *ctx, 
+static void smooth_HPCR_z_triangle( GLcontext *ctx,
 				    const SWvertex *v0,
 				    const SWvertex *v1,
 				    const SWvertex *v2 )
@@ -471,7 +471,7 @@ static void flat_TRUECOLOR_z_triangle( GLcontext *ctx,
 /*
  * XImage, flat, depth-buffered, PF_8A8B8G8R triangle.
  */
-static void flat_8A8B8G8R_z_triangle( GLcontext *ctx, 
+static void flat_8A8B8G8R_z_triangle( GLcontext *ctx,
 				      const SWvertex *v0,
 				      const SWvertex *v1,
 				      const SWvertex *v2 )
@@ -505,7 +505,7 @@ static void flat_8A8B8G8R_z_triangle( GLcontext *ctx,
 /*
  * XImage, flat, depth-buffered, PF_8R8G8B triangle.
  */
-static void flat_8R8G8B_z_triangle( GLcontext *ctx, 
+static void flat_8R8G8B_z_triangle( GLcontext *ctx,
 				    const SWvertex *v0,
 				    const SWvertex *v1,
 				    const SWvertex *v2 )
@@ -539,7 +539,7 @@ static void flat_8R8G8B_z_triangle( GLcontext *ctx,
 /*
  * XImage, flat, depth-buffered, PF_8R8G8B24 triangle.
  */
-static void flat_8R8G8B24_z_triangle( GLcontext *ctx, 
+static void flat_8R8G8B24_z_triangle( GLcontext *ctx,
 				      const SWvertex *v0,
 				      const SWvertex *v1,
 				      const SWvertex *v2 )
@@ -574,7 +574,7 @@ static void flat_8R8G8B24_z_triangle( GLcontext *ctx,
 /*
  * XImage, flat, depth-buffered, PF_TRUEDITHER triangle.
  */
-static void flat_TRUEDITHER_z_triangle( GLcontext *ctx, 
+static void flat_TRUEDITHER_z_triangle( GLcontext *ctx,
 					const SWvertex *v0,
 					const SWvertex *v1,
 					const SWvertex *v2 )
@@ -606,7 +606,7 @@ static void flat_TRUEDITHER_z_triangle( GLcontext *ctx,
 /*
  * XImage, flat, depth-buffered, PF_5R6G5B triangle.
  */
-static void flat_5R6G5B_z_triangle( GLcontext *ctx, 
+static void flat_5R6G5B_z_triangle( GLcontext *ctx,
 				    const SWvertex *v0,
 				    const SWvertex *v1,
 				    const SWvertex *v2 )
@@ -640,7 +640,7 @@ static void flat_5R6G5B_z_triangle( GLcontext *ctx,
 /*
  * XImage, flat, depth-buffered, PF_DITHER_5R6G5B triangle.
  */
-static void flat_DITHER_5R6G5B_z_triangle( GLcontext *ctx, 
+static void flat_DITHER_5R6G5B_z_triangle( GLcontext *ctx,
 					   const SWvertex *v0,
 					   const SWvertex *v1,
 					   const SWvertex *v2 )
@@ -673,7 +673,7 @@ static void flat_DITHER_5R6G5B_z_triangle( GLcontext *ctx,
 /*
  * XImage, flat, depth-buffered, 8-bit PF_DITHER triangle.
  */
-static void flat_DITHER8_z_triangle( GLcontext *ctx, 
+static void flat_DITHER8_z_triangle( GLcontext *ctx,
 				     const SWvertex *v0,
 				     const SWvertex *v1,
 				     const SWvertex *v2 )
@@ -708,7 +708,7 @@ static void flat_DITHER8_z_triangle( GLcontext *ctx,
 /*
  * XImage, flat, depth-buffered, PF_DITHER triangle.
  */
-static void flat_DITHER_z_triangle( GLcontext *ctx, 
+static void flat_DITHER_z_triangle( GLcontext *ctx,
 				    const SWvertex *v0,
 				    const SWvertex *v1,
 				    const SWvertex *v2 )
@@ -742,7 +742,7 @@ static void flat_DITHER_z_triangle( GLcontext *ctx,
 /*
  * XImage, flat, depth-buffered, 8-bit PF_HPCR triangle.
  */
-static void flat_HPCR_z_triangle( GLcontext *ctx, 
+static void flat_HPCR_z_triangle( GLcontext *ctx,
 				  const SWvertex *v0,
 				  const SWvertex *v1,
 				  const SWvertex *v2 )
@@ -777,7 +777,7 @@ static void flat_HPCR_z_triangle( GLcontext *ctx,
 /*
  * XImage, flat, depth-buffered, 8-bit PF_LOOKUP triangle.
  */
-static void flat_LOOKUP8_z_triangle( GLcontext *ctx, 
+static void flat_LOOKUP8_z_triangle( GLcontext *ctx,
 				     const SWvertex *v0,
 				     const SWvertex *v1,
 				     const SWvertex *v2 )
@@ -815,7 +815,7 @@ static void flat_LOOKUP8_z_triangle( GLcontext *ctx,
 /*
  * XImage, smooth, NON-depth-buffered, PF_TRUECOLOR triangle.
  */
-static void smooth_TRUECOLOR_triangle( GLcontext *ctx, 
+static void smooth_TRUECOLOR_triangle( GLcontext *ctx,
 				       const SWvertex *v0,
 				       const SWvertex *v1,
 				       const SWvertex *v2 )
@@ -840,7 +840,7 @@ static void smooth_TRUECOLOR_triangle( GLcontext *ctx,
 /*
  * XImage, smooth, NON-depth-buffered, PF_8A8B8G8R triangle.
  */
-static void smooth_8A8B8G8R_triangle( GLcontext *ctx, 
+static void smooth_8A8B8G8R_triangle( GLcontext *ctx,
 				      const SWvertex *v0,
 				      const SWvertex *v1,
 				      const SWvertex *v2 )
@@ -867,7 +867,7 @@ static void smooth_8A8B8G8R_triangle( GLcontext *ctx,
 /*
  * XImage, smooth, NON-depth-buffered, PF_8R8G8B triangle.
  */
-static void smooth_8R8G8B_triangle( GLcontext *ctx, 
+static void smooth_8R8G8B_triangle( GLcontext *ctx,
 				    const SWvertex *v0,
 				    const SWvertex *v1,
 				    const SWvertex *v2 )
@@ -894,7 +894,7 @@ static void smooth_8R8G8B_triangle( GLcontext *ctx,
 /*
  * XImage, smooth, NON-depth-buffered, PF_8R8G8B triangle.
  */
-static void smooth_8R8G8B24_triangle( GLcontext *ctx, 
+static void smooth_8R8G8B24_triangle( GLcontext *ctx,
 				      const SWvertex *v0,
 				      const SWvertex *v1,
 				      const SWvertex *v2 )
@@ -923,7 +923,7 @@ static void smooth_8R8G8B24_triangle( GLcontext *ctx,
 /*
  * XImage, smooth, NON-depth-buffered, PF_TRUEDITHER triangle.
  */
-static void smooth_TRUEDITHER_triangle( GLcontext *ctx, 
+static void smooth_TRUEDITHER_triangle( GLcontext *ctx,
 					const SWvertex *v0,
 					const SWvertex *v1,
 					const SWvertex *v2 )
@@ -949,7 +949,7 @@ static void smooth_TRUEDITHER_triangle( GLcontext *ctx,
 /*
  * XImage, smooth, NON-depth-buffered, PF_5R6G5B triangle.
  */
-static void smooth_5R6G5B_triangle( GLcontext *ctx, 
+static void smooth_5R6G5B_triangle( GLcontext *ctx,
 				    const SWvertex *v0,
 				    const SWvertex *v1,
 				    const SWvertex *v2 )
@@ -976,7 +976,7 @@ static void smooth_5R6G5B_triangle( GLcontext *ctx,
 /*
  * XImage, smooth, NON-depth-buffered, PF_DITHER_5R6G5B triangle.
  */
-static void smooth_DITHER_5R6G5B_triangle( GLcontext *ctx, 
+static void smooth_DITHER_5R6G5B_triangle( GLcontext *ctx,
 					   const SWvertex *v0,
 					   const SWvertex *v1,
 					   const SWvertex *v2 )
@@ -1003,7 +1003,7 @@ static void smooth_DITHER_5R6G5B_triangle( GLcontext *ctx,
 /*
  * XImage, smooth, NON-depth-buffered, 8-bit PF_DITHER triangle.
  */
-static void smooth_DITHER8_triangle( GLcontext *ctx, 
+static void smooth_DITHER8_triangle( GLcontext *ctx,
 				     const SWvertex *v0,
 				     const SWvertex *v1,
 				     const SWvertex *v2 )
@@ -1031,7 +1031,7 @@ static void smooth_DITHER8_triangle( GLcontext *ctx,
 /*
  * XImage, smooth, NON-depth-buffered, PF_DITHER triangle.
  */
-static void smooth_DITHER_triangle( GLcontext *ctx, 
+static void smooth_DITHER_triangle( GLcontext *ctx,
 				    const SWvertex *v0,
 				    const SWvertex *v1,
 				    const SWvertex *v2 )
@@ -1058,7 +1058,7 @@ static void smooth_DITHER_triangle( GLcontext *ctx,
 /*
  * XImage, smooth, NON-depth-buffered, 8-bit PF_LOOKUP triangle.
  */
-static void smooth_LOOKUP8_triangle( GLcontext *ctx, 
+static void smooth_LOOKUP8_triangle( GLcontext *ctx,
 				     const SWvertex *v0,
 				     const SWvertex *v1,
 				     const SWvertex *v2 )
@@ -1088,7 +1088,7 @@ static void smooth_LOOKUP8_triangle( GLcontext *ctx,
 /*
  * XImage, smooth, NON-depth-buffered, 8-bit PF_HPCR triangle.
  */
-static void smooth_HPCR_triangle( GLcontext *ctx, 
+static void smooth_HPCR_triangle( GLcontext *ctx,
 				  const SWvertex *v0,
 				  const SWvertex *v1,
 				  const SWvertex *v2 )
@@ -1116,7 +1116,7 @@ static void smooth_HPCR_triangle( GLcontext *ctx,
 /*
  * XImage, flat, NON-depth-buffered, PF_TRUECOLOR triangle.
  */
-static void flat_TRUECOLOR_triangle( GLcontext *ctx, 
+static void flat_TRUECOLOR_triangle( GLcontext *ctx,
 				     const SWvertex *v0,
 				     const SWvertex *v1,
 				     const SWvertex *v2 )
@@ -1141,7 +1141,7 @@ static void flat_TRUECOLOR_triangle( GLcontext *ctx,
 /*
  * XImage, flat, NON-depth-buffered, PF_8A8B8G8R triangle.
  */
-static void flat_8A8B8G8R_triangle( GLcontext *ctx, 
+static void flat_8A8B8G8R_triangle( GLcontext *ctx,
 				    const SWvertex *v0,
 				    const SWvertex *v1,
 				    const SWvertex *v2 )
@@ -1168,7 +1168,7 @@ static void flat_8A8B8G8R_triangle( GLcontext *ctx,
 /*
  * XImage, flat, NON-depth-buffered, PF_8R8G8B triangle.
  */
-static void flat_8R8G8B_triangle( GLcontext *ctx, 
+static void flat_8R8G8B_triangle( GLcontext *ctx,
 				  const SWvertex *v0,
 				  const SWvertex *v1,
 				  const SWvertex *v2 )
@@ -1195,7 +1195,7 @@ static void flat_8R8G8B_triangle( GLcontext *ctx,
 /*
  * XImage, flat, NON-depth-buffered, PF_8R8G8B24 triangle.
  */
-static void flat_8R8G8B24_triangle( GLcontext *ctx, 
+static void flat_8R8G8B24_triangle( GLcontext *ctx,
 				    const SWvertex *v0,
 				    const SWvertex *v1,
 				    const SWvertex *v2 )
@@ -1222,7 +1222,7 @@ static void flat_8R8G8B24_triangle( GLcontext *ctx,
 /*
  * XImage, flat, NON-depth-buffered, PF_TRUEDITHER triangle.
  */
-static void flat_TRUEDITHER_triangle( GLcontext *ctx, 
+static void flat_TRUEDITHER_triangle( GLcontext *ctx,
 				      const SWvertex *v0,
 				      const SWvertex *v1,
 				      const SWvertex *v2 )
@@ -1247,7 +1247,7 @@ static void flat_TRUEDITHER_triangle( GLcontext *ctx,
 /*
  * XImage, flat, NON-depth-buffered, PF_5R6G5B triangle.
  */
-static void flat_5R6G5B_triangle( GLcontext *ctx, 
+static void flat_5R6G5B_triangle( GLcontext *ctx,
 				  const SWvertex *v0,
 				  const SWvertex *v1,
 				  const SWvertex *v2 )
@@ -1274,7 +1274,7 @@ static void flat_5R6G5B_triangle( GLcontext *ctx,
 /*
  * XImage, flat, NON-depth-buffered, PF_DITHER_5R6G5B triangle.
  */
-static void flat_DITHER_5R6G5B_triangle( GLcontext *ctx, 
+static void flat_DITHER_5R6G5B_triangle( GLcontext *ctx,
 					 const SWvertex *v0,
 					 const SWvertex *v1,
 					 const SWvertex *v2 )
@@ -1300,7 +1300,7 @@ static void flat_DITHER_5R6G5B_triangle( GLcontext *ctx,
 /*
  * XImage, flat, NON-depth-buffered, 8-bit PF_DITHER triangle.
  */
-static void flat_DITHER8_triangle( GLcontext *ctx, 
+static void flat_DITHER8_triangle( GLcontext *ctx,
 				   const SWvertex *v0,
 				   const SWvertex *v1,
 				   const SWvertex *v2 )
@@ -1328,7 +1328,7 @@ static void flat_DITHER8_triangle( GLcontext *ctx,
 /*
  * XImage, flat, NON-depth-buffered, PF_DITHER triangle.
  */
-static void flat_DITHER_triangle( GLcontext *ctx, 
+static void flat_DITHER_triangle( GLcontext *ctx,
 				  const SWvertex *v0,
 				  const SWvertex *v1,
 				  const SWvertex *v2 )
@@ -1354,7 +1354,7 @@ static void flat_DITHER_triangle( GLcontext *ctx,
 /*
  * XImage, flat, NON-depth-buffered, 8-bit PF_HPCR triangle.
  */
-static void flat_HPCR_triangle( GLcontext *ctx, 
+static void flat_HPCR_triangle( GLcontext *ctx,
 				const SWvertex *v0,
 				const SWvertex *v1,
 				const SWvertex *v2 )
@@ -1382,7 +1382,7 @@ static void flat_HPCR_triangle( GLcontext *ctx,
 /*
  * XImage, flat, NON-depth-buffered, 8-bit PF_LOOKUP triangle.
  */
-static void flat_LOOKUP8_triangle( GLcontext *ctx, 
+static void flat_LOOKUP8_triangle( GLcontext *ctx,
 				   const SWvertex *v0,
 				   const SWvertex *v1,
 				   const SWvertex *v2 )
@@ -1648,7 +1648,7 @@ static swrast_tri_func get_triangle_func( GLcontext *ctx )
 
 /* Override for the swrast tri-selection function.  Try to use one
  * of our internal tri functions, otherwise fall back to the
- * standard swrast functions.  
+ * standard swrast functions.
  */
 void xmesa_choose_triangle( GLcontext *ctx )
 {