- Fix merge problemsati-4-0-1-20000518ati-4-0-1-branch

- Remove rcs keywords
- Fix lib/GL install problem
- Prepare for merge into trunk

17 files changed, 25 insertions, 35 deletions

diff --git a/xc/extras/Mesa/src/dlist.c b/xc/extras/Mesa/src/dlist.c
index c18091701..929a050db 100644
--- a/xc/extras/Mesa/src/dlist.c
+++ b/xc/extras/Mesa/src/dlist.c
@@ -4879,7 +4879,6 @@ static void print_list( GLcontext *ctx, FILE *f, GLuint list )
 	 case OPCODE_END_OF_LIST:
             fprintf(f,"END-LIST %u\n", list);
 	    done = GL_TRUE;
-	    gl_print_cassette( (struct immediate *) n[1].data );
 	    break;
          default:
             if (opcode < 0 || opcode > OPCODE_END_OF_LIST) {
diff --git a/xc/extras/Mesa/src/fog.c b/xc/extras/Mesa/src/fog.c
index e35906c8f..bac41cb1d 100644
--- a/xc/extras/Mesa/src/fog.c
+++ b/xc/extras/Mesa/src/fog.c
@@ -35,7 +35,6 @@
 #include "types.h"
 #include "xform.h"
 #endif
-#include "xform.h"
 
 
 
diff --git a/xc/extras/Mesa/src/fog.h b/xc/extras/Mesa/src/fog.h
index a85916047..28355dd44 100644
--- a/xc/extras/Mesa/src/fog.h
+++ b/xc/extras/Mesa/src/fog.h
@@ -68,6 +68,4 @@ extern void
 _mesa_init_fog( void );
 
 
-extern struct gl_pipeline_stage gl_fog_coord_stage;
-
 #endif
diff --git a/xc/extras/Mesa/src/varray.c b/xc/extras/Mesa/src/varray.c
index 786793da7..dc758594a 100644
--- a/xc/extras/Mesa/src/varray.c
+++ b/xc/extras/Mesa/src/varray.c
@@ -682,7 +682,6 @@ _mesa_DrawArrays(GLenum mode, GLint start, GLsizei count)
 	 VB->Primitive[VB->CopyStart] = mode;
 	 ctx->Array.Flag[count] |= VERT_END_VB;
 
-	 ctx->Array.Flag[count] |= VERT_END_VB;
          /* Transform and render.
 	  */
          gl_run_pipeline( VB );
diff --git a/xc/include/GL/glx.h b/xc/include/GL/glx.h
index 2a0065b16..e4712b95f 100644
--- a/xc/include/GL/glx.h
+++ b/xc/include/GL/glx.h
@@ -33,9 +33,6 @@
 ** was created using the OpenGL(R) version 1.2.1 Sample Implementation
 ** published by SGI, but has not been independently verified as being
 ** compliant with the OpenGL(R) version 1.2.1 Specification.
-**
-** $Date: 2000/05/11 15:08:39 $ $Revision: 1.5.2.2 $
-** $Header: /home/ajax/dri-backup/xc/xc/include/GL/glx.h,v 1.5.2.2 2000/05/11 15:08:39 kem Exp $
 */
 
 #include <X11/Xlib.h>
diff --git a/xc/include/GL/glxtokens.h b/xc/include/GL/glxtokens.h
index c263803de..4efa20a71 100644
--- a/xc/include/GL/glxtokens.h
+++ b/xc/include/GL/glxtokens.h
@@ -33,9 +33,6 @@
 ** was created using the OpenGL(R) version 1.2.1 Sample Implementation
 ** published by SGI, but has not been independently verified as being
 ** compliant with the OpenGL(R) version 1.2.1 Specification.
-**
-** $Date: 2000/05/11 15:08:39 $ $Revision: 1.3.6.1 $
-** $Header: /home/ajax/dri-backup/xc/xc/include/GL/glxtokens.h,v 1.3.6.1 2000/05/11 15:08:39 kem Exp $
 */
 
 #ifdef __cplusplus
diff --git a/xc/lib/GL/Imakefile b/xc/lib/GL/Imakefile
index 341188c8c..79a9c4b7d 100644
--- a/xc/lib/GL/Imakefile
+++ b/xc/lib/GL/Imakefile
@@ -253,5 +253,6 @@ DRIVERSUBDIRS = mesa/dri mesa/include/GL mesa/src
 
 MakeSubdirs($(DRIVERSUBDIRS))
 DependSubdirs($(DRIVERSUBDIRS))
+InstallSubdirs($(DRIVERSUBDIRS))
 
 #endif
diff --git a/xc/lib/GL/mesa/src/drv/mga/mgatris.c b/xc/lib/GL/mesa/src/drv/mga/mgatris.c
index b83aaf2ea..dc42c6a1c 100644
--- a/xc/lib/GL/mesa/src/drv/mga/mgatris.c
+++ b/xc/lib/GL/mesa/src/drv/mga/mgatris.c
@@ -160,7 +160,11 @@ void mgaDDChooseRenderState( GLcontext *ctx )
       if (flags & DD_STENCIL)                      shared |= MGA_FALLBACK_BIT;
 
       ind = shared;
+#if 0
       if (flags & DD_POINT_SMOOTH)                 ind |= MGA_ANTIALIAS_BIT;
+#else
+      if (flags & DD_POINT_SMOOTH)                 ind |= MGA_FALLBACK_BIT;
+#endif
 
       mmesa->renderindex = ind;
       mmesa->PointsFunc = points_tab[ind];
@@ -168,7 +172,11 @@ void mgaDDChooseRenderState( GLcontext *ctx )
 	 mmesa->IndirectTriangles |= DD_POINT_SW_RASTERIZE;
 
       ind = shared;
+#if 0
       if (flags & DD_LINE_SMOOTH)                   ind |= MGA_ANTIALIAS_BIT;
+#else
+      if (flags & DD_LINE_SMOOTH)                   ind |= MGA_FALLBACK_BIT;
+#endif
       if (flags & DD_LINE_STIPPLE)                  ind |= MGA_FALLBACK_BIT;
 
       mmesa->renderindex |= ind;
diff --git a/xc/programs/Xserver/GL/dri/dri.c b/xc/programs/Xserver/GL/dri/dri.c
index 3c523d2e4..652ecb822 100644
--- a/xc/programs/Xserver/GL/dri/dri.c
+++ b/xc/programs/Xserver/GL/dri/dri.c
@@ -115,7 +115,7 @@ DRIScreenInit(
     fd = drmOpen(pDRIInfo->drmDriverName, NULL);
     if (fd < 0) {
         /* failed to open DRM */
-        pScreen->devPrivates[DRIScreenPrivIndex].ptr = 0;
+        pScreen->devPrivates[DRIScreenPrivIndex].ptr = NULL;
         return FALSE;
     }
 
@@ -128,7 +128,7 @@ DRIScreenInit(
 
     pDRIPriv = (DRIScreenPrivPtr) xalloc(sizeof(DRIScreenPrivRec));
     if (!pDRIPriv) {
-        pScreen->devPrivates[DRIScreenPrivIndex].ptr = 0;
+        pScreen->devPrivates[DRIScreenPrivIndex].ptr = NULL;
         return FALSE;
     }
 
diff --git a/xc/programs/Xserver/hw/xfree86/doc/sgml/DRIcomp.sgml b/xc/programs/Xserver/hw/xfree86/doc/sgml/DRIcomp.sgml
index 1329625e8..21f1fb789 100644
--- a/xc/programs/Xserver/hw/xfree86/doc/sgml/DRIcomp.sgml
+++ b/xc/programs/Xserver/hw/xfree86/doc/sgml/DRIcomp.sgml
@@ -1,7 +1,6 @@
 <!doctype linuxdoc system>
 <!-- Created: Sun Mar 12 13:00:00 2000 by brian@precisioninsight.com -->
-<!-- Revised: Thu Mar 23 10:00:00 2000 by brian@precisioninsight.com -->
-<!-- $Id: DRIcomp.sgml,v 1.6.6.1 2000/04/19 04:29:19 kem Exp $ -->
+<!-- Revised: Wed May 17 22:42:18 2000 by martin@valinux.com -->
 
   <article>
 
@@ -9,7 +8,7 @@
       <author>
           <htmlurl url="http://www.precisioninsight.com/"
             name="Precision Insight, Inc.">
-      <date>$Date: 2000/04/19 04:29:19 $
+      <date>Last modified on: 17 May 2000
         
     <toc>
 
@@ -485,5 +484,3 @@
   <!-- Local Variables: -->
   <!-- fill-column: 72  -->
   <!-- End:             -->
-
-
diff --git a/xc/programs/Xserver/hw/xfree86/drivers/r128/r128.h b/xc/programs/Xserver/hw/xfree86/drivers/r128/r128.h
index 04eda29f2..acb04f96e 100644
--- a/xc/programs/Xserver/hw/xfree86/drivers/r128/r128.h
+++ b/xc/programs/Xserver/hw/xfree86/drivers/r128/r128.h
@@ -28,15 +28,15 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 /*
  * Authors:
- *   Kevin E. Martin <kevin@precisioninsight.com>
  *   Rickard E. Faith <faith@precisioninsight.com>
+ *   Kevin E. Martin <kevin@precisioninsight.com>
  *
  */
 
 #ifndef _R128_H_
 #define _R128_H_
 
-#define R128_DEBUG    1		/* Turn off debugging output                */
+#define R128_DEBUG    0		/* Turn off debugging output                */
 #define R128_TIMEOUT  2000000	/* Fall out of wait loops after this count */
 #define R128_MMIOSIZE 0x80000
 
diff --git a/xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_dri.c b/xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_dri.c
index 52e8039e1..0304d8f19 100644
--- a/xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_dri.c
+++ b/xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_dri.c
@@ -155,11 +155,11 @@ Bool TDFXDRIScreenInit(ScreenPtr pScreen)
   if (pScrn->bitsPerPixel != 16) return FALSE;
 
 #if XFree86LOADER
-  /* Check that the GLX, DRI, and DRM modules have been loaded by testing
-     for canonical symbols in each module. */
-  if (!LoaderSymbol("GlxSetVisualConfigs")) return FALSE;
-  if (!LoaderSymbol("DRIScreenInit"))       return FALSE;
-  if (!LoaderSymbol("drmAvailable"))        return FALSE;
+    /* Check that the GLX, DRI, and DRM modules have been loaded by testing
+       for canonical symbols in each module. */
+    if (!LoaderSymbol("GlxSetVisualConfigs")) return FALSE;
+    if (!LoaderSymbol("DRIScreenInit"))       return FALSE;
+    if (!LoaderSymbol("drmAvailable"))        return FALSE;
 #endif
 
   pDRIInfo = DRICreateInfoRec();
diff --git a/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drm.h b/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drm.h
index 5b53df8cf..25e4cce49 100644
--- a/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drm.h
+++ b/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drm.h
@@ -1,8 +1,7 @@
 /* drm.h -- Header for Direct Rendering Manager -*- linux-c -*-
  * Created: Mon Jan  4 10:05:05 1999 by faith@precisioninsight.com
- * Revised: Fri Apr 21 23:56:36 2000 by kevin@precisioninsight.com
  *
- * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 1999, 2000 Precision Insight, Inc., Cedar Park, Texas.
  * All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
diff --git a/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drmP.h b/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drmP.h
index 93baee13a..43670e28a 100644
--- a/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drmP.h
+++ b/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drmP.h
@@ -1,8 +1,7 @@
 /* drmP.h -- Private header for Direct Rendering Manager -*- linux-c -*-
  * Created: Mon Jan  4 10:05:05 1999 by faith@precisioninsight.com
- * Revised: Thu Apr 13 10:32:41 2000 by kevin@precisioninsight.com
  *
- * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 1999, 2000 Precision Insight, Inc., Cedar Park, Texas.
  * All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
diff --git a/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/proc.c b/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/proc.c
index 3b07eedf7..392abceb9 100644
--- a/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/proc.c
+++ b/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/proc.c
@@ -1,8 +1,7 @@
 /* proc.c -- /proc support for DRM -*- linux-c -*-
  * Created: Mon Jan 11 09:48:47 1999 by faith@precisioninsight.com
- * Revised: Mon Apr 10 23:22:15 2000 by kevin@precisioninsight.com
  *
- * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 1999, 2000 Precision Insight, Inc., Cedar Park, Texas.
  * All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
diff --git a/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/vm.c b/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/vm.c
index 6b9a8f3cb..9c2cea56a 100644
--- a/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/vm.c
+++ b/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/vm.c
@@ -1,8 +1,7 @@
 /* vm.c -- Memory mapping for DRM -*- linux-c -*-
  * Created: Mon Jan  4 08:58:31 1999 by faith@precisioninsight.com
- * Revised: Sat Apr 15 00:12:30 2000 by kevin@precisioninsight.com
  *
- * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 1999, 2000 Precision Insight, Inc., Cedar Park, Texas.
  * All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
diff --git a/xc/programs/Xserver/hw/xfree86/os-support/shared/drm/kernel/drm.h b/xc/programs/Xserver/hw/xfree86/os-support/shared/drm/kernel/drm.h
index 5b53df8cf..25e4cce49 100644
--- a/xc/programs/Xserver/hw/xfree86/os-support/shared/drm/kernel/drm.h
+++ b/xc/programs/Xserver/hw/xfree86/os-support/shared/drm/kernel/drm.h
@@ -1,8 +1,7 @@
 /* drm.h -- Header for Direct Rendering Manager -*- linux-c -*-
  * Created: Mon Jan  4 10:05:05 1999 by faith@precisioninsight.com
- * Revised: Fri Apr 21 23:56:36 2000 by kevin@precisioninsight.com
  *
- * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 1999, 2000 Precision Insight, Inc., Cedar Park, Texas.
  * All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a