[xserver-commit] xserver/hw/kdrive/mach64 mach64draw.c,1.14.2.1,1.14.2.2

Keith Packard xserver-commit@pdx.freedesktop.org
Wed, 22 Oct 2003 14:23:47 -0700


Committed by: keithp

Update of /cvs/xserver/xserver/hw/kdrive/mach64
In directory pdx:/tmp/cvs-serv16883/hw/kdrive/mach64

Modified Files:
      Tag: xfixes_2_branch
	mach64draw.c 
Log Message:
	* hw/kdrive/mach64/mach64draw.c: (mach64Setup), (mach64DoneSolid),
	(mach64DoneCopy):
	Added SYNC_ALWAYS for debugging (sync after each operation)
	* mi/misprite.c: (miSpriteReportDamage), (miSpriteCopyWindow):
	Add SPRITE_DEBUG_ENABLE to help debug cursor problems
	* miext/damage/damage.c: (damageDamageRegion), (damageDamageBox),
	(damageDamageRect), (damageValidateGC):
	Leave all GCs redirected through Damage GC ops so that adding
	damage doesn't require revalidating all GCs (that would require
	walking the window tree and resetting all serial numbers).
	Add DAMAGE_DEBUG_ENABLE to help debug damage problems


Index: mach64draw.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/kdrive/mach64/mach64draw.c,v
retrieving revision 1.14.2.1
retrieving revision 1.14.2.2
diff -u -d -r1.14.2.1 -r1.14.2.2
--- mach64draw.c	22 Oct 2003 06:00:49 -0000	1.14.2.1
+++ mach64draw.c	22 Oct 2003 21:23:44 -0000	1.14.2.2
@@ -64,6 +64,10 @@
 #define MACH64_DRAW_COMBO_SOLID	0x1
 #define MACH64_DRAW_COMBO_COPY	0x8
 
+#define SYNC_ALWAYS 0
+#if SYNC_ALWAYS
+static ScreenPtr    mach64Screen;
+#endif
 static Reg	*reg;
 static CARD32	avail;
 static CARD32	triple;
@@ -102,6 +106,9 @@
 
     reg = mach64c->reg;
     triple = mach64s->bpp24;
+#if SYNC_ALWAYS
+    mach64Screen = pScreen;
+#endif
     if (!reg)
 	return FALSE;
     
@@ -179,6 +186,9 @@
 void
 mach64DoneSolid (void)
 {
+#if SYNC_ALWAYS
+    KdCheckSync (mach64Screen);
+#endif
 }
 
 static int copyDx;
@@ -263,6 +273,9 @@
 void
 mach64DoneCopy (void)
 {
+#if SYNC_ALWAYS
+    KdCheckSync (mach64Screen);
+#endif
 }
 
 KaaScreenInfoRec    mach64Kaa = {