xserver/hw/kdrive/src kaa.c, 1.27, 1.28 kdrive.h, 1.53, 1.54 kpict.c, 1.6, 1.7

[Keith Packard]

Committed by: keithp

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

Modified Files:
	kaa.c kdrive.h kpict.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: kaa.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/kdrive/src/kaa.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- a/kaa.c	20 May 2004 02:42:19 -0000	1.27
+++ b/kaa.c	20 May 2004 05:27:03 -0000	1.28
@@ -291,7 +291,7 @@
 	return NULL;
     pKaaPixmap = KaaGetPixmapPriv(pPixmap);
     if (!w || !h)
-	pKaaPixmap->score == KAA_PIXMAP_SCORE_PINNED;
+	pKaaPixmap->score = KAA_PIXMAP_SCORE_PINNED;
     else
 	pKaaPixmap->score = KAA_PIXMAP_SCORE_INIT;
     

Index: kdrive.h
===================================================================
RCS file: /cvs/xserver/xserver/hw/kdrive/src/kdrive.h,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- a/kdrive.h	20 May 2004 02:42:19 -0000	1.53
+++ b/kdrive.h	20 May 2004 05:27:03 -0000	1.54
@@ -849,6 +849,12 @@
 		  INT16      yDst,
 		  CARD16     width,
 		  CARD16     height);
+
+void
+KdCheckRasterizeTrapezoid(PicturePtr	pMask,
+			  xTrapezoid	*trap,
+			  int		x_off,
+			  int		y_off);
 #endif
 
 /* kshadow.c */

Index: kpict.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/kdrive/src/kpict.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- a/kpict.c	14 Oct 2003 05:07:39 -0000	1.6
+++ b/kpict.c	20 May 2004 05:27:03 -0000	1.7
@@ -60,10 +60,21 @@
 }
 
 void
+KdCheckRasterizeTrapezoid(PicturePtr	pMask,
+			  xTrapezoid	*trap,
+			  int		x_off,
+			  int		y_off)
+{
+    KdCheckSync (pMask->pDrawable->pScreen);
+    fbRasterizeTrapezoid (pMask, trap, x_off, y_off);
+}
+
+void
 KdPictureInitAsync (ScreenPtr pScreen)
 {
     PictureScreenPtr    ps;
 
     ps = GetPictureScreen(pScreen);
     ps->Composite = KdCheckComposite;
+    ps->RasterizeTrapezoid = KdCheckRasterizeTrapezoid;
 }