xserver/hw/kdrive/mach64 mach64draw.c,1.16,1.17

[Keith Packard]

Committed by: keithp

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

Modified Files:
	mach64draw.c 
Log Message:
2004-05-19  Keith Packard  <keithp at keithp.com>

	* hw/kdrive/mach64/mach64draw.c: (mach64Setup), (mach64DoneSolid),
	(mach64DoneCopy):
	Fix SYNC_ALWAYS (debugging) code to use mach64WaitIdle instead of
	KdCheckSync -- the boolean used in the latter won't be set yet.
	
	* hw/kdrive/src/kaa.c: (kaaCreatePixmap):
	Oops.  == instead of =.
	
	* hw/kdrive/src/kdrive.h:
	* hw/kdrive/src/kpict.c: (KdCheckRasterizeTrapezoid),
	(KdPictureInitAsync):
	Must sync hardware before rasterizing trapezoids in case the
	mask is in off-screen memory and has just been erased.  Yes,
	it is silly to place masks in off-screen memory.  That's a separate
	issue.


Index: mach64draw.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/kdrive/mach64/mach64draw.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- a/mach64draw.c	15 Jan 2004 09:13:01 -0000	1.16
+++ b/mach64draw.c	20 May 2004 05:27:03 -0000	1.17
@@ -65,9 +65,6 @@
 #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;
@@ -114,7 +111,7 @@
     { 1, 1,
 	/* DP_PIX_WIDTH */
 	((PIX_FORMAT_MONO << 0) |	/* DP_DST_PIX_WIDTH */
-	 (PIX_FORMAT_TRUE_8888 << 4) |	/* COMPOSITE_PIX_WIDTH */
+	 (PIX_FORMAT_MONO << 4) |	/* COMPOSITE_PIX_WIDTH */
 	 (PIX_FORMAT_MONO << 8) |	/* DP_SRC_PIX_WIDTH */
 	 (0 << 13) |			/* DP_HOST_TRIPLE_EN */
 	 (0 << 14) |			/* DP_PALETTE_TYPE */
@@ -124,7 +121,7 @@
 	 (0 << 25) |			/* DP_CONVERSION_TEMP */
 	 (0 << 26) |			/* DP_C14_RGB_LOW_NIBBLE */
 	 (0 << 27) |			/* DP_C14_RGB_HIGH_NIBBLE */
-	 (PIX_FORMAT_TRUE_8888 << 28) |	/* DP_SCALE_PIX_WIDTH */
+	 (PIX_FORMAT_MONO << 28) |	/* DP_SCALE_PIX_WIDTH */
 	 0),
 	/* DP_SET_GUI_ENGINE */
 	((PIX_FORMAT_MONO << 3) |
@@ -146,7 +143,7 @@
     { 8, 8,
 	/* DP_PIX_WIDTH */
 	((PIX_FORMAT_PSEUDO_8 << 0) |	/* DP_DST_PIX_WIDTH */
-	 (PIX_FORMAT_TRUE_8888 << 4) |	/* COMPOSITE_PIX_WIDTH */
+	 (PIX_FORMAT_PSEUDO_8 << 4) |	/* COMPOSITE_PIX_WIDTH */
 	 (PIX_FORMAT_PSEUDO_8 << 8) |	/* DP_SRC_PIX_WIDTH */
 	 (0 << 13) |			/* DP_HOST_TRIPLE_EN */
 	 (0 << 14) |			/* DP_PALETTE_TYPE */
@@ -156,7 +153,7 @@
 	 (0 << 25) |			/* DP_CONVERSION_TEMP */
 	 (0 << 26) |			/* DP_C14_RGB_LOW_NIBBLE */
 	 (0 << 27) |			/* DP_C14_RGB_HIGH_NIBBLE */
-	 (PIX_FORMAT_TRUE_8888 << 28) |	/* DP_SCALE_PIX_WIDTH */
+	 (PIX_FORMAT_PSEUDO_8 << 28) |	/* DP_SCALE_PIX_WIDTH */
 	 0),
 	/* DP_SET_GUI_ENGINE */
 	((PIX_FORMAT_PSEUDO_8 << 3) |
@@ -178,7 +175,7 @@
     { 15, 16,
 	/* DP_PIX_WIDTH */
 	((PIX_FORMAT_TRUE_1555 << 0) |	/* DP_DST_PIX_WIDTH */
-	 (PIX_FORMAT_TRUE_8888 << 4) |	/* COMPOSITE_PIX_WIDTH */
+	 (PIX_FORMAT_TRUE_1555 << 4) |	/* COMPOSITE_PIX_WIDTH */
 	 (PIX_FORMAT_TRUE_1555 << 8) |	/* DP_SRC_PIX_WIDTH */
 	 (0 << 13) |			/* DP_HOST_TRIPLE_EN */
 	 (0 << 14) |			/* DP_PALETTE_TYPE */
@@ -188,7 +185,7 @@
 	 (0 << 25) |			/* DP_CONVERSION_TEMP */
 	 (0 << 26) |			/* DP_C14_RGB_LOW_NIBBLE */
 	 (0 << 27) |			/* DP_C14_RGB_HIGH_NIBBLE */
-	 (PIX_FORMAT_TRUE_8888 << 28) |	/* DP_SCALE_PIX_WIDTH */
+	 (PIX_FORMAT_TRUE_1555 << 28) |	/* DP_SCALE_PIX_WIDTH */
 	 0),
 	/* DP_SET_GUI_ENGINE */
 	((PIX_FORMAT_TRUE_1555 << 3) |
@@ -210,7 +207,7 @@
     { 16, 16,
 	/* DP_PIX_WIDTH */
 	((PIX_FORMAT_TRUE_565 << 0) |	/* DP_DST_PIX_WIDTH */
-	 (PIX_FORMAT_TRUE_8888 << 4) |	/* COMPOSITE_PIX_WIDTH */
+	 (PIX_FORMAT_TRUE_565 << 4) |	/* COMPOSITE_PIX_WIDTH */
 	 (PIX_FORMAT_TRUE_565 << 8) |	/* DP_SRC_PIX_WIDTH */
 	 (0 << 13) |			/* DP_HOST_TRIPLE_EN */
 	 (0 << 14) |			/* DP_PALETTE_TYPE */
@@ -220,7 +217,7 @@
 	 (0 << 25) |			/* DP_CONVERSION_TEMP */
 	 (0 << 26) |			/* DP_C14_RGB_LOW_NIBBLE */
 	 (0 << 27) |			/* DP_C14_RGB_HIGH_NIBBLE */
-	 (PIX_FORMAT_TRUE_8888 << 28) |	/* DP_SCALE_PIX_WIDTH */
+	 (PIX_FORMAT_TRUE_565 << 28) |	/* DP_SCALE_PIX_WIDTH */
 	 0),
 	/* DP_SET_GUI_ENGINE */
 	((PIX_FORMAT_TRUE_565 << 3) |
@@ -252,7 +249,7 @@
 	 (0 << 25) |			    /* DP_CONVERSION_TEMP */
 	 (0 << 26) |			    /* DP_C14_RGB_LOW_NIBBLE */
 	 (0 << 27) |			    /* DP_C14_RGB_HIGH_NIBBLE */
-	 (PIX_FORMAT_TRUE_8888 << 28) |  /* DP_SCALE_PIX_WIDTH */
+	 (PIX_FORMAT_PSEUDO_8 << 28) |  /* DP_SCALE_PIX_WIDTH */
 	 0),
 	/* DP_SET_GUI_ENGINE */
 	((PIX_FORMAT_PSEUDO_8 << 3) |
@@ -353,6 +350,7 @@
     CARD32  DP_SET_GUI_ENGINE;
     int	    i;
 
+    KdCheckSync (pScreen);
     for (i = 0; i < NACCELREG; i++)
 	if (mach64AccelReg[i].depth == pDst->drawable.depth &&
 	    mach64AccelReg[i].bitsPerPixel == pDst->drawable.bitsPerPixel)
@@ -364,9 +362,6 @@
 
     reg = mach64c->reg;
     triple = (pDst->drawable.bitsPerPixel == 24);
-#if SYNC_ALWAYS
-    mach64Screen = pScreen;
-#endif
     if (!reg)
 	return FALSE;
     
@@ -439,7 +434,7 @@
 mach64DoneSolid (void)
 {
 #if SYNC_ALWAYS
-    KdCheckSync (mach64Screen);
+    mach64WaitIdle (reg);
 #endif
 }
 
@@ -526,7 +521,7 @@
 mach64DoneCopy (void)
 {
 #if SYNC_ALWAYS
-    KdCheckSync (mach64Screen);
+    mach64WaitIdle (reg);
 #endif
 }