Port a few forgotten fbSolidFillmmx()'es to fbFillmmx(). Use pixman_blt() instead of fbBltmmx()

in fbCopyNToN().

fb/fbcopy.c

@@ -60,11 +60,11 @@ fbCopyNtoN (DrawablePtr	pSrcDrawable,
 
     while (nbox--)
     {
-#ifdef USE_MMX
+#ifndef FB_ACCESS_WRAPPER /* pixman_blt() doesn't support accessors yet */
 	if (pm == FB_ALLONES && alu == GXcopy && !reverse &&
-	    !upsidedown && fbHaveMMX())
+	    !upsidedown)
 	{
-	    if (!fbBltmmx (src, dst, srcStride, dstStride, srcBpp, dstBpp,
+	    if (!pixman_blt ((uint32_t *)src, (uint32_t *)dst, srcStride, dstStride, srcBpp, dstBpp,
 			     (pbox->x1 + dx + srcXoff),
 			     (pbox->y1 + dy + srcYoff),
 			     (pbox->x1 + srcXoff),
@@ -94,7 +94,7 @@ fbCopyNtoN (DrawablePtr	pSrcDrawable,
 	       
 	       reverse,
 	       upsidedown);
-#ifdef USE_MMX
+#ifndef FB_ACCESS_WRAPPER
     next:
 #endif
 	pbox++;

fb/fbfill.c

@@ -221,10 +221,10 @@ fbSolidBoxClipped (DrawablePtr	pDrawable,
 #ifdef USE_MMX
 	if (!and && fbHaveMMX())
 	{
-		if (fbSolidFillmmx (pDrawable,
-		                    partX1, partY1,
-				    (partX2 - partX1), (partY2 - partY1),
-				    xor)) {
+	    if (fbFillmmx (dst, dstStride, dstBpp,
+			   partX1 + dstXoff, partX2 + dstYoff, (partX2 - partX1), (partY2 - partY1),
+			   xor))
+	    {
 		fbFinishAccess (pDrawable);
 		return;
 	    }

fb/fbwindow.c

@@ -233,11 +233,12 @@ fbFillRegionSolid (DrawablePtr	pDrawable,
     while (n--)
     {
 #ifdef USE_MMX
-        if (!has_mmx || !fbSolidFillmmx (pDrawable,
-	                                pbox->x1,
-					pbox->y1,
+	if (!has_mmx || !fbFillmmx (dst, dstStride, dstBpp,
+				    pbox->x1 + dstXoff, pbox->y1 + dstYoff,
 				    (pbox->x2 - pbox->x1),
-					(pbox->y2 - pbox->y1), xor)) {
+				    (pbox->y2 - pbox->y1),
+				    xor))
+	{
 #endif
 	    fbSolid (dst + (pbox->y1 + dstYoff) * dstStride,
 		     dstStride,