[xserver-commit] xserver/hw/kdrive/src kaa.c,1.14,1.14.2.1 koffscreen.c,1.8,1.8.2.1

[Keith Packard]

Committed by: keithp

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

Modified Files:
      Tag: xfixes_2_branch
	kaa.c koffscreen.c 
Log Message:
	* hw/kdrive/src/kaa.c: (kaaDestroyPixmap):
	* hw/kdrive/src/koffscreen.c: (KdOffscreenKickOut),
	(KdOffscreenSwapOut):
	Minor cleanups -- remove a couple of bogus KdCheckSync calls,
	restructure KdOffscreenSwapOut to avoid unneeded 'continue'


Index: kaa.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/kdrive/src/kaa.c,v
retrieving revision 1.14
retrieving revision 1.14.2.1
diff -u -d -r1.14 -r1.14.2.1
--- kaa.c	15 Oct 2003 05:34:54 -0000	1.14
+++ kaa.c	19 Oct 2003 20:48:16 -0000	1.14.2.1
@@ -262,7 +262,6 @@
 			 pPixmap->drawable.width,
 			 pPixmap->drawable.height));
 	    /* Free the offscreen area */
-	    KdCheckSync (pScreen);
 	    KdOffscreenFree (pKaaPixmap->area);
 	    pPixmap->devPrivate = pKaaPixmap->devPrivate;
 	    pPixmap->devKind = pKaaPixmap->devKind;

Index: koffscreen.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/kdrive/src/koffscreen.c,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -u -d -r1.8 -r1.8.2.1
--- koffscreen.c	16 Oct 2003 08:03:25 -0000	1.8
+++ koffscreen.c	19 Oct 2003 20:48:16 -0000	1.8.2.1
@@ -71,7 +71,6 @@
 KdOffscreenKickOut (KdOffscreenArea *area)
 {
     RealOffscreenArea *real_area = (RealOffscreenArea *) area;
-    KdCheckSync (area->screen);
     if (real_area->save)
 	(*real_area->save) (area);
     KdOffscreenFree (area);
@@ -209,14 +208,12 @@
 	
 	if (!area)
 	    break;
-	if (area->area.screen)
+	if (!area->area.screen)
 	{
-	    KdOffscreenKickOut (&area->area);
-	    continue;
+	    area = area->next;
+	    if (!area)
+		break;
 	}
-	area = area->next;
-	if (!area)
-	    break;
 	assert (area->area.screen);
 	KdOffscreenKickOut (&area->area);
 	KdOffscreenValidate (pScreen);