second (final?) part of XFree86 4.0.99.3 resyncX_4_0_99_3-20010502-merge

19 files changed, 35 insertions, 96 deletions

diff --git a/xc/extras/ogl-sample/main/doc/man/manglu/standard/beginpolygon.gl b/xc/extras/ogl-sample/main/doc/man/manglu/standard/beginpolygon.gl
index 05ee80683..74c7ac6c2 100755
--- a/xc/extras/ogl-sample/main/doc/man/manglu/standard/beginpolygon.gl
+++ b/xc/extras/ogl-sample/main/doc/man/manglu/standard/beginpolygon.gl
@@ -30,7 +30,6 @@ _C_ was created using the OpenGL(R) version 1.2.1 Sample Implementation
 _C_ published by SGI, but has not been independently verified as being
 _C_ compliant with the OpenGL(R) version 1.2.1 Specification.
 _C_
-_C_ $Date: 2001/04/05 22:16:10 $ $Revision: 1.2 $
 _C_ The first character in this file must be an '_'!
 _C_ Anything on a line after _C_ is ignored
 _define(_filters,eqn)_C_
diff --git a/xc/extras/ogl-sample/main/doc/man/manglw/Distfile b/xc/extras/ogl-sample/main/doc/man/manglw/Distfile
index a66ef4718..6bf42c0e1 100755
--- a/xc/extras/ogl-sample/main/doc/man/manglw/Distfile
+++ b/xc/extras/ogl-sample/main/doc/man/manglw/Distfile
@@ -1,6 +1,4 @@
 #
-# $Date: 2001/01/08 16:21:35 $ $Revision: 1.3 $
-# $Header: /home/ajax/dri-backup/xc/xc/extras/ogl-sample/main/doc/man/manglw/Attic/Distfile,v 1.3 2001/01/08 16:21:35 nathanh Exp $
 #
 
 DISTDIR_SI = /xc/doc/man/GL/glw
diff --git a/xc/extras/ogl-sample/main/doc/man/manglw/GNUmakefile b/xc/extras/ogl-sample/main/doc/man/manglw/GNUmakefile
index a976daa42..d87aa5187 100755
--- a/xc/extras/ogl-sample/main/doc/man/manglw/GNUmakefile
+++ b/xc/extras/ogl-sample/main/doc/man/manglw/GNUmakefile
@@ -32,8 +32,6 @@
 # published by SGI, but has not been independently verified as being
 # compliant with the OpenGL(R) version 1.2.1 Specification.
 #
-# $Date: 2001/01/08 16:21:35 $ $Revision: 1.3 $
-# $Header: /home/ajax/dri-backup/xc/xc/extras/ogl-sample/main/doc/man/manglw/Attic/GNUmakefile,v 1.3 2001/01/08 16:21:35 nathanh Exp $
 
 COMMONPREF = standard
 include $(ROOT)/usr/include/make/commondefs
diff --git a/xc/extras/ogl-sample/main/gfx/lib/glw/Distfile b/xc/extras/ogl-sample/main/gfx/lib/glw/Distfile
index 8e48861fa..3270654bf 100755
--- a/xc/extras/ogl-sample/main/gfx/lib/glw/Distfile
+++ b/xc/extras/ogl-sample/main/gfx/lib/glw/Distfile
@@ -1,6 +1,4 @@
 #
-# $Date: 2001/01/08 16:21:35 $ $Revision: 1.3 $
-# $Header: /home/ajax/dri-backup/xc/xc/extras/ogl-sample/main/gfx/lib/glw/Attic/Distfile,v 1.3 2001/01/08 16:21:35 nathanh Exp $
 #
 
 DISTFILES_SI = \
diff --git a/xc/extras/ogl-sample/main/gfx/lib/glw/GLwDAUtil.c b/xc/extras/ogl-sample/main/gfx/lib/glw/GLwDAUtil.c
index 3c4565df3..d38ea2c07 100755
--- a/xc/extras/ogl-sample/main/gfx/lib/glw/GLwDAUtil.c
+++ b/xc/extras/ogl-sample/main/gfx/lib/glw/GLwDAUtil.c
@@ -31,13 +31,11 @@
 ** published by SGI, but has not been independently verified as being
 ** compliant with the OpenGL(R) version 1.2.1 Specification.
 **
-** $Date: 2001/01/08 16:21:35 $ $Revision: 1.3 $
 */
 /* utility routines for GLX.
  * Since these routines are used both in the Motif and X versions of
  * the widget, they cannot peek directly into the structure
  *
- * $Header: /home/ajax/dri-backup/xc/xc/extras/ogl-sample/main/gfx/lib/glw/Attic/GLwDAUtil.c,v 1.3 2001/01/08 16:21:35 nathanh Exp $
  */
 
 /* $XFree86: xc/extras/ogl-sample/main/gfx/lib/glw/GLwDAUtil.c,v 1.2 2000/11/02 20:39:06 dawes Exp $ */
diff --git a/xc/extras/ogl-sample/main/gfx/lib/glw/GLwDrawA.c b/xc/extras/ogl-sample/main/gfx/lib/glw/GLwDrawA.c
index 1b8150366..8eee9fc23 100755
--- a/xc/extras/ogl-sample/main/gfx/lib/glw/GLwDrawA.c
+++ b/xc/extras/ogl-sample/main/gfx/lib/glw/GLwDrawA.c
@@ -31,10 +31,6 @@
 ** published by SGI, but has not been independently verified as being
 ** compliant with the OpenGL(R) version 1.2.1 Specification.
 **
-** $Date: 2001/01/08 16:21:35 $ $Revision: 1.3 $
-*/
-/*
-** $Header: /home/ajax/dri-backup/xc/xc/extras/ogl-sample/main/gfx/lib/glw/Attic/GLwDrawA.c,v 1.3 2001/01/08 16:21:35 nathanh Exp $
 */
 
 #include <stdio.h>
diff --git a/xc/extras/ogl-sample/main/gfx/lib/glw/GLwDrawA.h b/xc/extras/ogl-sample/main/gfx/lib/glw/GLwDrawA.h
index 28da64bfd..4f0aa8ffb 100755
--- a/xc/extras/ogl-sample/main/gfx/lib/glw/GLwDrawA.h
+++ b/xc/extras/ogl-sample/main/gfx/lib/glw/GLwDrawA.h
@@ -31,10 +31,6 @@
 ** published by SGI, but has not been independently verified as being
 ** compliant with the OpenGL(R) version 1.2.1 Specification.
 **
-** $Date: 2001/01/08 16:21:35 $ $Revision: 1.3 $
-*/
-/*
-** $Header: /home/ajax/dri-backup/xc/xc/extras/ogl-sample/main/gfx/lib/glw/Attic/GLwDrawA.h,v 1.3 2001/01/08 16:21:35 nathanh Exp $
 */
 
 /*
diff --git a/xc/extras/ogl-sample/main/gfx/lib/glw/GLwDrawAP.h b/xc/extras/ogl-sample/main/gfx/lib/glw/GLwDrawAP.h
index 61b905e48..a02ce642b 100755
--- a/xc/extras/ogl-sample/main/gfx/lib/glw/GLwDrawAP.h
+++ b/xc/extras/ogl-sample/main/gfx/lib/glw/GLwDrawAP.h
@@ -31,10 +31,6 @@
 ** published by SGI, but has not been independently verified as being
 ** compliant with the OpenGL(R) version 1.2.1 Specification.
 **
-** $Date: 2001/01/08 16:21:35 $ $Revision: 1.3 $
-*/
-/*
-** $Header: /home/ajax/dri-backup/xc/xc/extras/ogl-sample/main/gfx/lib/glw/Attic/GLwDrawAP.h,v 1.3 2001/01/08 16:21:35 nathanh Exp $
 */
 
 /*
diff --git a/xc/extras/ogl-sample/main/gfx/lib/glw/GLwMDrawA.c b/xc/extras/ogl-sample/main/gfx/lib/glw/GLwMDrawA.c
index 49d1c594f..35c34aabb 100755
--- a/xc/extras/ogl-sample/main/gfx/lib/glw/GLwMDrawA.c
+++ b/xc/extras/ogl-sample/main/gfx/lib/glw/GLwMDrawA.c
@@ -31,10 +31,6 @@
 ** published by SGI, but has not been independently verified as being
 ** compliant with the OpenGL(R) version 1.2.1 Specification.
 **
-** $Date: 2001/01/08 16:21:35 $ $Revision: 1.3 $
-*/
-/*
-** $Header: /home/ajax/dri-backup/xc/xc/extras/ogl-sample/main/gfx/lib/glw/Attic/GLwMDrawA.c,v 1.3 2001/01/08 16:21:35 nathanh Exp $
 */
 
 #ifndef __GLX_MOTIF
diff --git a/xc/extras/ogl-sample/main/gfx/lib/glw/GLwMDrawA.h b/xc/extras/ogl-sample/main/gfx/lib/glw/GLwMDrawA.h
index 9d32d4043..95e210adc 100755
--- a/xc/extras/ogl-sample/main/gfx/lib/glw/GLwMDrawA.h
+++ b/xc/extras/ogl-sample/main/gfx/lib/glw/GLwMDrawA.h
@@ -31,10 +31,6 @@
 ** published by SGI, but has not been independently verified as being
 ** compliant with the OpenGL(R) version 1.2.1 Specification.
 **
-** $Date: 2001/01/08 16:21:35 $ $Revision: 1.3 $
-*/
-/*
-** $Header: /home/ajax/dri-backup/xc/xc/extras/ogl-sample/main/gfx/lib/glw/Attic/GLwMDrawA.h,v 1.3 2001/01/08 16:21:35 nathanh Exp $
 */
 
 /*
diff --git a/xc/extras/ogl-sample/main/gfx/lib/glw/GLwMDrawAP.h b/xc/extras/ogl-sample/main/gfx/lib/glw/GLwMDrawAP.h
index e565e4a69..2ee3eed5a 100755
--- a/xc/extras/ogl-sample/main/gfx/lib/glw/GLwMDrawAP.h
+++ b/xc/extras/ogl-sample/main/gfx/lib/glw/GLwMDrawAP.h
@@ -31,10 +31,6 @@
 ** published by SGI, but has not been independently verified as being
 ** compliant with the OpenGL(R) version 1.2.1 Specification.
 **
-** $Date: 2001/01/08 16:21:35 $ $Revision: 1.3 $
-*/
-/*
-** $Header: /home/ajax/dri-backup/xc/xc/extras/ogl-sample/main/gfx/lib/glw/Attic/GLwMDrawAP.h,v 1.3 2001/01/08 16:21:35 nathanh Exp $
 */
 
 /*
diff --git a/xc/extras/ogl-sample/main/gfx/lib/glw/GNUmakefile b/xc/extras/ogl-sample/main/gfx/lib/glw/GNUmakefile
index 46e50e442..ba2a99ee1 100755
--- a/xc/extras/ogl-sample/main/gfx/lib/glw/GNUmakefile
+++ b/xc/extras/ogl-sample/main/gfx/lib/glw/GNUmakefile
@@ -32,8 +32,6 @@
 # published by SGI, but has not been independently verified as being
 # compliant with the OpenGL(R) version 1.2.1 Specification.
 #
-# $Date: 2001/01/08 16:21:35 $ $Revision: 1.3 $
-# $Header: /home/ajax/dri-backup/xc/xc/extras/ogl-sample/main/gfx/lib/glw/Attic/GNUmakefile,v 1.3 2001/01/08 16:21:35 nathanh Exp $
 
 include $(ROOT)/usr/include/make/commondefs
 
diff --git a/xc/programs/Xserver/hw/xfree86/doc/README.DRI b/xc/programs/Xserver/hw/xfree86/doc/README.DRI
index 5822acb51..5509f502b 100644
--- a/xc/programs/Xserver/hw/xfree86/doc/README.DRI
+++ b/xc/programs/Xserver/hw/xfree86/doc/README.DRI
@@ -875,23 +875,8 @@ Software rendering will be used under any of the following conditions:
 
    o Using the accumulation buffer.
 
-Compaq has funded the implementation of AGP acclerated ReadPixels and
-DrawPixels in this driver.  With this implementation, on a G400
-drawing directly from AGP memory (exported to the client), throughput
-of up to 1 GB/sec has been measured.
-
-Additionally their funding has produced several new extensions in
-Mesa, including one (packed_depth_stencil_MESA) which enables
-Read/DrawPixels functionality to operate directly on the packed 24/8
-depth/stencil buffers of this hardware.
-
-In order to access this functionality, the application must ensure
-that all pixel processing operations are disabled.  There are in
-addition a fairly complex set of rules regarding which
-packing/unpacking modes must be used, and which data formats are
-supported.  See the files in lib/GL/mesa/src/drv/mga/DOCS for a
-summary of these.  The extension definitions are included in the Mesa
-3.4 source distribution.
+The AGP mode may be set to 1, 2, or 4.  One is used by default.  Higher AGP
+speeds may result in unreliable performance depending on your motherboard.
 
 Compaq has funded the implementation of AGP acclerated ReadPixels and Draw-
 Pixels in this driver.  With this implementation, on a G400 drawing directly
diff --git a/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon.h b/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon.h
index fd9e87b2a..4a51516f4 100644
--- a/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon.h
+++ b/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon.h
@@ -417,19 +417,19 @@ extern void        RADEONCPReleaseIndirect(ScrnInfoPtr pScrn);
 
 #define RADEONCP_START(pScrn, info)					\
 do {									\
-    int ret = drmRadeonStartCP(info->drmFD);				\
-    if (ret) {								\
+    int _ret = drmRadeonStartCP(info->drmFD);				\
+    if (_ret) {								\
 	xf86DrvMsg(pScrn->scrnIndex, X_ERROR,				\
-		   "%s: CP start %d\n", __FUNCTION__, ret);		\
+		   "%s: CP start %d\n", __FUNCTION__, _ret);		\
     }									\
 } while (0)
 
 #define RADEONCP_STOP(pScrn, info)					\
 do {									\
-    int ret = drmRadeonStopCP(info->drmFD);				\
-    if (ret) {								\
+    int _ret = drmRadeonStopCP(info->drmFD);				\
+    if (_ret) {								\
 	xf86DrvMsg(pScrn->scrnIndex, X_ERROR,				\
-		   "%s: CP stop %d\n", __FUNCTION__, ret);		\
+		   "%s: CP stop %d\n", __FUNCTION__, _ret);		\
     }									\
     RADEONEngineRestore(pScrn);						\
 } while (0)
@@ -437,10 +437,10 @@ do {									\
 #define RADEONCP_RESET(pScrn, info)					\
 do {									\
     if (RADEONCP_USE_RING_BUFFER(info->CPMode)) {			\
-	int ret = drmRadeonResetCP(info->drmFD);			\
-	if (ret) {							\
+	int _ret = drmRadeonResetCP(info->drmFD);			\
+	if (_ret) {							\
 	    xf86DrvMsg(pScrn->scrnIndex, X_ERROR,			\
-		       "%s: CP reset %d\n", __FUNCTION__, ret);		\
+		       "%s: CP reset %d\n", __FUNCTION__, _ret);	\
 	}								\
     }									\
 } while (0)
diff --git a/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_dri.c b/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_dri.c
index cbbde4be0..aa8155f48 100644
--- a/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_dri.c
+++ b/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_dri.c
@@ -632,12 +632,10 @@ static void RADEONDRIMoveBuffers(WindowPtr pParent, DDXPointRec ptOldOrg,
 	    pboxNew2 = (BoxPtr)ALLOCATE_LOCAL(sizeof(BoxRec)*nbox);
 	    pptNew2  = (DDXPointPtr)ALLOCATE_LOCAL(sizeof(DDXPointRec)*nbox);
 	    if (!pboxNew2 || !pptNew2) {
-		if (pptNew2) DEALLOCATE_LOCAL(pptNew2);
-		if (pboxNew2) DEALLOCATE_LOCAL(pboxNew2);
-		if (pboxNew1) {
-		    DEALLOCATE_LOCAL(pptNew1);
-		    DEALLOCATE_LOCAL(pboxNew1);
-		}
+		DEALLOCATE_LOCAL(pptNew2);
+		DEALLOCATE_LOCAL(pboxNew2);
+		DEALLOCATE_LOCAL(pptNew1);
+		DEALLOCATE_LOCAL(pboxNew1);
 		return;
 	    }
 	    pboxBase = pboxNext = pbox;
@@ -667,15 +665,15 @@ static void RADEONDRIMoveBuffers(WindowPtr pParent, DDXPointRec ptOldOrg,
 					       (CARD32)(-1), -1);
 
     for (; nbox-- ; pbox++) {
-	int x1    = pbox->x1;
-	int y1    = pbox->y1;
-	int destx = x1 + dx;
-	int desty = y1 + dy;
-	int w     = pbox->x2 - x1 + 1;
-	int h     = pbox->y2 - y1 + 1;
-
-	if (destx < 0)                x1 -= destx, w += destx, destx = 0;
-	if (desty < 0)                y1 -= desty, h += desty, desty = 0;
+	int xa    = pbox->x1;
+	int ya    = pbox->y1;
+	int destx = xa + dx;
+	int desty = ya + dy;
+	int w     = pbox->x2 - xa + 1;
+	int h     = pbox->y2 - ya + 1;
+
+	if (destx < 0)                xa -= destx, w += destx, destx = 0;
+	if (desty < 0)                ya -= desty, h += desty, desty = 0;
 	if (destx + w > screenwidth)  w = screenwidth  - destx;
 	if (desty + h > screenheight) h = screenheight - desty;
 
@@ -684,28 +682,24 @@ static void RADEONDRIMoveBuffers(WindowPtr pParent, DDXPointRec ptOldOrg,
 
 	RADEONSelectBuffer(pScrn, RADEON_BACK);
 	(*info->accel->SubsequentScreenToScreenCopy)(pScrn,
-						     x1, y1,
+						     xa, ya,
 						     destx, desty,
 						     w, h);
 	RADEONSelectBuffer(pScrn, RADEON_DEPTH);
 
 	if (info->depthMoves)
 	    RADEONScreenToScreenCopyDepth(pScrn,
-					  x1, y1,
+					  xa, ya,
 					  destx, desty,
 					  w, h);
     }
 
     RADEONSelectBuffer(pScrn, RADEON_FRONT);
 
-    if (pboxNew2) {
-	DEALLOCATE_LOCAL(pptNew2);
-	DEALLOCATE_LOCAL(pboxNew2);
-    }
-    if (pboxNew1) {
-	DEALLOCATE_LOCAL(pptNew1);
-	DEALLOCATE_LOCAL(pboxNew1);
-    }
+    DEALLOCATE_LOCAL(pptNew2);
+    DEALLOCATE_LOCAL(pboxNew2);
+    DEALLOCATE_LOCAL(pptNew1);
+    DEALLOCATE_LOCAL(pboxNew1);
 
     info->accel->NeedToSync = TRUE;
 }
diff --git a/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c b/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c
index 8d06b036a..399bc2126 100644
--- a/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c
+++ b/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c
@@ -1737,9 +1737,6 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
 	y2        = (info->FbMapSize
 		     / (pScrn->displayWidth *
 			info->CurrentLayout.pixel_bytes));
-	if (y2 >= 32768) y2 = 32767; /* because MemBox.y2 is signed short */
-	MemBox.y2 = y2;
-
 				/* The acceleration engine uses 14 bit
 				   signed coordinates, so we can't have any
 				   drawable caches beyond this region. */
diff --git a/xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_driver.c b/xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_driver.c
index 73125ca13..d6207994b 100644
--- a/xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_driver.c
+++ b/xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_driver.c
@@ -681,7 +681,6 @@ TDFXPreInit(ScrnInfoPtr pScrn, int flags)
 #if !defined(__powerpc__)
   if (xf86LoadSubModule(pScrn, "int10")) {
     xf86Int10InfoPtr pInt;
-#if 0
     xf86DrvMsg(pScrn->scrnIndex, X_INFO, 
                "Softbooting the board (through the int10 interface).\n");
     pInt = xf86InitInt10(pTDFX->pEnt->index);
@@ -696,7 +695,6 @@ TDFXPreInit(ScrnInfoPtr pScrn, int flags)
                  "Softbooting the board succeeded.\n");
       xf86FreeInt10(pInt);
     }
-#endif
   }
 #endif
 
diff --git a/xc/programs/Xserver/hw/xfree86/os-support/xf86drmR128.h b/xc/programs/Xserver/hw/xfree86/os-support/xf86drmR128.h
index cd0fdfaca..3bd245da8 100644
--- a/xc/programs/Xserver/hw/xfree86/os-support/xf86drmR128.h
+++ b/xc/programs/Xserver/hw/xfree86/os-support/xf86drmR128.h
@@ -90,7 +90,7 @@ extern int drmR128FlushVertexBuffer( int fd, int prim, int indx,
 extern int drmR128FlushIndices( int fd, int prim, int indx,
 				int start, int end, int discard );
 
-extern int drmR128TextureBlit( int fd, int index,
+extern int drmR128TextureBlit( int fd, int indx,
 			       int offset, int pitch, int format,
 			       int x, int y, int width, int height );
 
@@ -107,7 +107,7 @@ extern int drmR128ReadDepthPixels( int fd, int n,
 
 extern int drmR128PolygonStipple( int fd, unsigned int *mask );
 
-extern int drmR128FlushIndirectBuffer( int fd, int index,
+extern int drmR128FlushIndirectBuffer( int fd, int indx,
 				       int start, int end, int discard );
 
 #endif
diff --git a/xc/programs/Xserver/hw/xfree86/os-support/xf86drmRadeon.h b/xc/programs/Xserver/hw/xfree86/os-support/xf86drmRadeon.h
index 2c3f6e669..a9949d6bd 100644
--- a/xc/programs/Xserver/hw/xfree86/os-support/xf86drmRadeon.h
+++ b/xc/programs/Xserver/hw/xfree86/os-support/xf86drmRadeon.h
@@ -90,9 +90,9 @@ extern int drmRadeonClear( int fd, unsigned int flags,
 			   unsigned int color_mask, unsigned int depth_mask,
 			   void *boxes, int nbox );
 
-extern int drmRadeonFlushVertexBuffer( int fd, int prim, int index,
+extern int drmRadeonFlushVertexBuffer( int fd, int prim, int indx,
 				       int count, int discard );
-extern int drmRadeonFlushIndices( int fd, int prim, int index,
+extern int drmRadeonFlushIndices( int fd, int prim, int indx,
 				  int start, int end, int discard );
 
 extern int drmRadeonLoadTexture( int fd, int offset, int pitch, int format,
@@ -101,7 +101,7 @@ extern int drmRadeonLoadTexture( int fd, int offset, int pitch, int format,
 
 extern int drmRadeonPolygonStipple( int fd, unsigned int *mask );
 
-extern int drmRadeonFlushIndirectBuffer( int fd, int index,
+extern int drmRadeonFlushIndirectBuffer( int fd, int indx,
 					 int start, int end, int discard );
 
 #endif