[xserver-commit] xserver/hw/kdrive/src kaapict.c,1.4,1.5

[Eric Anholt]

Committed by: anholt

Update of /cvs/xserver/xserver/hw/kdrive/src
In directory pdx:/home/anholt/xserver/hw/kdrive/src

Modified Files:
	kaapict.c 
Log Message:
- Call appropriate Done function for Composite.
- Don't allow src transforms for Copy acceleration.
- Minor whitespace fixes.


Index: kaapict.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/kdrive/src/kaapict.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- kaapict.c	3 Jan 2004 11:25:27 -0000	1.4
+++ kaapict.c	3 Jan 2004 21:52:14 -0000	1.5
@@ -104,9 +104,9 @@
     kaaCompositeFallbackPictDesc(pDst, dstdesc, 40);
 
     ErrorF("Composite fallback: op %s, \n"
-           "                    src  %s, \n"
-           "                    mask %s, \n"
-           "                    dst  %s, \n", 
+	   "                    src  %s, \n"
+	   "                    mask %s, \n"
+	   "                    dst  %s, \n", 
 	   sop, srcdesc, maskdesc, dstdesc);
 }
 #endif
@@ -447,7 +447,7 @@
 	pbox++;
     }
 
-    (*pKaaScr->info->DoneBlend) ();
+    (*pKaaScr->info->DoneComposite) ();
     KdMarkSync(pDst->pDrawable->pScreen);
     return 1;
 }
@@ -483,7 +483,8 @@
 		if (ret == 1)
 		    return;
 	    }
-	    else if (!pSrc->repeat && pSrc->format == pDst->format)
+	    else if (!pSrc->repeat && !pSrc->transform &&
+		     pSrc->format == pDst->format)
 	    {
 		RegionRec	region;
 
@@ -509,10 +510,10 @@
 	if (pScreenPriv->enabled && pKaaScr->info->PrepareBlend &&
 	    !pSrc->alphaMap && !pDst->alphaMap)
 	{
-	ret = kaaTryDriverBlend(op, pSrc, pDst, xSrc, ySrc, xDst, yDst, width,
-				height);
-	if (ret == 1)
-	    return;
+	    ret = kaaTryDriverBlend(op, pSrc, pDst, xSrc, ySrc, xDst, yDst,
+				    width, height);
+	    if (ret == 1)
+		return;
 	}
     }