? cscope.out
? fix.sed
? fix.sh
Index: mach64_context.c
===================================================================
RCS file: /cvsroot/dri/xc/xc/lib/GL/mesa/src/drv/mach64/Attic/mach64_context.c,v
retrieving revision 1.1.6.6
diff -u -r1.1.6.6 mach64_context.c
--- mach64_context.c	1 Mar 2002 17:05:33 -0000	1.1.6.6
+++ mach64_context.c	1 Mar 2002 18:38:07 -0000
@@ -60,7 +60,7 @@
 		    | DEBUG_VERBOSE_MSG
 		    | DEBUG_VERBOSE_LRU
 		    | DEBUG_VERBOSE_DRI
-		    | DEBUG_VERBOSE_IOCTL
+/*		    | DEBUG_VERBOSE_IOCTL */
 		    | DEBUG_VERBOSE_2D 
    );
 #endif
Index: mach64_ioctl.c
===================================================================
RCS file: /cvsroot/dri/xc/xc/lib/GL/mesa/src/drv/mach64/Attic/mach64_ioctl.c,v
retrieving revision 1.1.6.4
diff -u -r1.1.6.4 mach64_ioctl.c
--- mach64_ioctl.c	1 Mar 2002 06:23:35 -0000	1.1.6.4
+++ mach64_ioctl.c	1 Mar 2002 18:38:08 -0000
@@ -141,7 +141,7 @@
       }
       mmesa->sarea->nbox = n;
 
-      ret = drmMach64SwapBuffers( mmesa->driFd );
+      ret = 0 /*drmMach64SwapBuffers( mmesa->driFd )*/;
 
       if ( ret ) {
 	 fprintf( stderr, "drmMach64SwapBuffers: return = %d\n", ret );
@@ -150,7 +150,7 @@
    }
 
    if ( MACH64_DEBUG & DEBUG_ALWAYS_SYNC ) {
-      drmMach64WaitForIdle( mmesa->driFd );
+      /*drmMach64WaitForIdle( mmesa->driFd )*/;
    }
 
    UNLOCK_HARDWARE( mmesa );
@@ -258,9 +258,9 @@
    		  mmesa->sarea->nbox );
          }
    
-         ret = drmMach64Clear( mmesa->driFd, flags,
+         ret = 0 /*drmMach64Clear( mmesa->driFd, flags,
    			    cx, cy, cw, ch,
-   			    mmesa->ClearColor, mmesa->ClearDepth );
+   			    mmesa->ClearColor, mmesa->ClearDepth )*/;
    
          if ( ret ) {
    	 fprintf( stderr, "drmMach64Clear: return = %d\n", ret );
@@ -286,7 +286,7 @@
    int to = 0;
    int ret;
 
-   ret = drmMach64WaitForIdle( fd );
+   ret = 0 /*drmMach64WaitForIdle( fd )*/;
 
    if ( ret < 0 ) {
       fprintf( stderr, "drmMach64WaitForIdle: return = %d\n", ret );
Index: mach64_lock.c
===================================================================
RCS file: /cvsroot/dri/xc/xc/lib/GL/mesa/src/drv/mach64/Attic/mach64_lock.c,v
retrieving revision 1.1.6.3
diff -u -r1.1.6.3 mach64_lock.c
--- mach64_lock.c	1 Mar 2002 06:23:35 -0000	1.1.6.3
+++ mach64_lock.c	1 Mar 2002 18:38:08 -0000
@@ -54,7 +54,7 @@
    int stamp = dPriv->lastStamp;
    int i;
 
-   drmGetLock( mmesa->driFd, mmesa->hHWContext, flags );
+   /* drmGetLock( mmesa->driFd, mmesa->hHWContext, flags ) */;
 
    /* The window might have moved, so we might need to get new clip
     * rects.
@@ -64,7 +64,7 @@
     * Since the hardware state depends on having the latest drawable
     * clip rects, all state checking must be done _after_ this call.
     */
-   DRI_VALIDATE_DRAWABLE_INFO( mmesa->display, sPriv, dPriv );
+   /* DRI_VALIDATE_DRAWABLE_INFO( mmesa->display, sPriv, dPriv ); */
 
    if ( stamp != dPriv->lastStamp ) {
       mmesa->new_state |= MACH64_NEW_WINDOW | MACH64_NEW_CLIP;
Index: mach64_lock.h
===================================================================
RCS file: /cvsroot/dri/xc/xc/lib/GL/mesa/src/drv/mach64/Attic/mach64_lock.h,v
retrieving revision 1.1.6.2
diff -u -r1.1.6.2 mach64_lock.h
--- mach64_lock.h	1 Mar 2002 17:05:33 -0000	1.1.6.2
+++ mach64_lock.h	1 Mar 2002 18:38:09 -0000
@@ -82,8 +82,21 @@
  */
 
 #if 1
-#define LOCK_HARDWARE( mmesa )
-#define UNLOCK_HARDWARE( mmesa )
+/* Lock the hardware and validate our state.
+ */
+#define LOCK_HARDWARE( mmesa )						\
+   do {									\
+      DEBUG_CHECK_LOCK();						\
+	 mach64GetLock( mmesa, 0 );					\
+      DEBUG_LOCK();							\
+   } while (0)
+
+/* Unlock the hardware.
+ */
+#define UNLOCK_HARDWARE( mmesa )					\
+   do {									\
+      DEBUG_RESET();							\
+   } while (0)
 #else
 /* Lock the hardware and validate our state.
  */