From 3f9adb18f127318d054f30a57e3a77176e14c692 Mon Sep 17 00:00:00 2001
From: Søren Sandmann Pedersen <sandmann@redhat.com>
Date: Mon, 11 Jun 2007 15:19:27 -0400
Subject: Port a few forgotten fbSolidFillmmx()'es to fbFillmmx(). Use
 pixman_blt() instead of fbBltmmx() in fbCopyNToN().

---
 fb/fbwindow.c | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

(limited to 'fb/fbwindow.c')

diff --git a/fb/fbwindow.c b/fb/fbwindow.c
index cac662cc7..5b3f446b1 100644
--- a/fb/fbwindow.c
+++ b/fb/fbwindow.c
@@ -233,26 +233,27 @@ fbFillRegionSolid (DrawablePtr	pDrawable,
     while (n--)
     {
 #ifdef USE_MMX
-        if (!has_mmx || !fbSolidFillmmx (pDrawable,
-	                                pbox->x1,
-					pbox->y1,
-					(pbox->x2 - pbox->x1),
-					(pbox->y2 - pbox->y1), xor)) {
+	if (!has_mmx || !fbFillmmx (dst, dstStride, dstBpp,
+				    pbox->x1 + dstXoff, pbox->y1 + dstYoff,
+				    (pbox->x2 - pbox->x1),
+				    (pbox->y2 - pbox->y1),
+				    xor))
+	{
 #endif
-	fbSolid (dst + (pbox->y1 + dstYoff) * dstStride,
-		 dstStride,
-		 (pbox->x1 + dstXoff) * dstBpp,
-		 dstBpp,
-		 (pbox->x2 - pbox->x1) * dstBpp,
-		 pbox->y2 - pbox->y1,
-		 and, xor);
+	    fbSolid (dst + (pbox->y1 + dstYoff) * dstStride,
+		     dstStride,
+		     (pbox->x1 + dstXoff) * dstBpp,
+		     dstBpp,
+		     (pbox->x2 - pbox->x1) * dstBpp,
+		     pbox->y2 - pbox->y1,
+		     and, xor);
 #ifdef USE_MMX
 	}
 #endif
 	fbValidateDrawable (pDrawable);
 	pbox++;
     }
-
+    
     fbFinishAccess (pDrawable);
 }
 
-- 
cgit v1.2.3