From 9f1a92cd092e87f774ce4ed99d4b3e15f905d4f7 Mon Sep 17 00:00:00 2001
From: Eric Anholt <anholt@freebsd.org>
Date: Sat, 3 Jan 2004 21:52:14 +0000
Subject: - Call appropriate Done function for Composite. - Don't allow src
 transforms for Copy acceleration. - Minor whitespace fixes.

---
 hw/kdrive/src/kaapict.c | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

(limited to 'hw')

diff --git a/hw/kdrive/src/kaapict.c b/hw/kdrive/src/kaapict.c
index f10fb4c03..9f8595e78 100644
--- a/hw/kdrive/src/kaapict.c
+++ b/hw/kdrive/src/kaapict.c
@@ -104,9 +104,9 @@ kaaPrintCompositeFallback(CARD8 op,
     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 @@ kaaTryDriverComposite(CARD8		op,
 	pbox++;
     }
 
-    (*pKaaScr->info->DoneBlend) ();
+    (*pKaaScr->info->DoneComposite) ();
     KdMarkSync(pDst->pDrawable->pScreen);
     return 1;
 }
@@ -483,7 +483,8 @@ kaaComposite(CARD8	op,
 		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 @@ kaaComposite(CARD8	op,
 	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;
 	}
     }
 
-- 
cgit v1.2.3