Make use of pixman_fill_mmx() in various places. Delete #if0'ed code

diff --git a/pixman/pixman-mmx.c b/pixman/pixman-mmx.c
index 84f440d..ba2b873 100644 (file)
--- a/pixman/pixman-mmx.c
+++ b/pixman/pixman-mmx.c
@@ -1768,144 +1768,6 @@ pixman_fill_mmx (uint32_t *bits,
     return TRUE;
 }
 
-#if 0
-/* FIXME */
-
-Bool
-fbSolidFillmmx (DrawablePtr    pDraw,
-               int             x,
-               int             y,
-               int             width,
-               int             height,
-               uint32_t                xor)
-{ 
-    int        stride;
-    int                bpp;
-    ullong     fill;
-    __m64      vfill;
-    uint32_t   byte_width;
-    uint8_t    *byte_line;
-    uint32_t      *bits;
-    int                xoff, yoff;
-#ifdef __GNUC__
-    __m64      v1, v2, v3, v4, v5, v6, v7;
-#endif
-    
-    CHECKPOINT();
-    
-    fbGetDrawable(pDraw, bits, stride, bpp, xoff, yoff);
-    
-    if (bpp == 16 && (xor >> 16 != (xor & 0xffff)))
-       return FALSE;
-    
-    if (bpp != 16 && bpp != 32)
-       return FALSE;
-    
-    if (bpp == 16)
-    {
-       stride = stride * sizeof (uint32_t) / 2;
-       byte_line = (uint8_t *)(((uint16_t *)bits) + stride * (y + yoff) + (x + xoff));
-       byte_width = 2 * width;
-       stride *= 2;
-    }
-    else
-    {
-       stride = stride * sizeof (uint32_t) / 4;
-       byte_line = (uint8_t *)(((uint32_t *)bits) + stride * (y + yoff) + (x + xoff));
-       byte_width = 4 * width;
-       stride *= 4;
-    }
-    
-    fill = ((ullong)xor << 32) | xor;
-    vfill = (__m64)fill;
-    
-#ifdef __GNUC__
-    __asm__ (
-       "movq           %7,     %0\n"
-       "movq           %7,     %1\n"
-       "movq           %7,     %2\n"
-       "movq           %7,     %3\n"
-       "movq           %7,     %4\n"
-       "movq           %7,     %5\n"
-       "movq           %7,     %6\n"
-       : "=y" (v1), "=y" (v2), "=y" (v3),
-         "=y" (v4), "=y" (v5), "=y" (v6), "=y" (v7)
-       : "y" (vfill));
-#endif
-    
-    while (height--)
-    {
-       int w;
-       uint8_t *d = byte_line;
-       byte_line += stride;
-       w = byte_width;
-       
-       while (w >= 2 && ((unsigned long)d & 3))
-       {
-           *(uint16_t *)d = xor;
-           w -= 2;
-           d += 2;
-       }
-       
-       while (w >= 4 && ((unsigned long)d & 7))
-       {
-           *(uint32_t *)d = xor;
-           
-           w -= 4;
-           d += 4;
-       }
-
-       while (w >= 64)
-       {
-#ifdef __GNUC__
-           __asm__ (
-               "movq   %1,       (%0)\n"
-               "movq   %2,      8(%0)\n"
-               "movq   %3,     16(%0)\n"
-               "movq   %4,     24(%0)\n"
-               "movq   %5,     32(%0)\n"
-               "movq   %6,     40(%0)\n"
-               "movq   %7,     48(%0)\n"
-               "movq   %8,     56(%0)\n"
-               :
-               : "r" (d),
-                 "y" (vfill), "y" (v1), "y" (v2), "y" (v3),
-                 "y" (v4), "y" (v5), "y" (v6), "y" (v7)
-               : "memory");
-#else
-           *(__m64*) (d +  0) = vfill;
-           *(__m64*) (d +  8) = vfill;
-           *(__m64*) (d + 16) = vfill;
-           *(__m64*) (d + 24) = vfill;
-           *(__m64*) (d + 32) = vfill;
-           *(__m64*) (d + 40) = vfill;
-           *(__m64*) (d + 48) = vfill;
-           *(__m64*) (d + 56) = vfill;
-#endif    
-           w -= 64;
-           d += 64;
-       }
-       
-       while (w >= 4)
-       {
-           *(uint32_t *)d = xor;
-           
-           w -= 4;
-           d += 4;
-       }
-       if (w >= 2)
-       {
-           *(uint16_t *)d = xor;
-           w -= 2;
-           d += 2;
-       }
-    }
-    
-    _mm_empty();
-    return TRUE;
-}
-#endif
-
 void
 fbCompositeSolidMaskSrc_nx8x8888mmx (pixman_op_t op,
                                     pixman_image_t * pSrc,
@@ -1933,14 +1795,12 @@ fbCompositeSolidMaskSrc_nx8x8888mmx (pixman_op_t op,
     fbComposeGetSolid(pSrc, src, pDst->bits.format);
 
     srca = src >> 24;
-#if 0
-    /* FIXME */
     if (srca == 0)
     {
-       fbSolidFillmmx (pDst->pDrawable, xDst, yDst, width, height, 0);
+       pixman_fill_mmx (pDst->bits.bits, pDst->bits.rowstride, PIXMAN_FORMAT_BPP (pDst->bits.format),
+                        xDst, yDst, width, height, 0);
        return;
     }
-#endif
 
     srcsrc = (ullong)src << 32 | src;
 

diff --git a/pixman/pixman-mmx.h b/pixman/pixman-mmx.h
index be8af88..4b9e823 100644 (file)
--- a/pixman/pixman-mmx.h
+++ b/pixman/pixman-mmx.h
@@ -286,18 +286,6 @@ void fbCompositeSrc_8888x8x8888mmx (pixman_op_t    op,
                                    int16_t       yDst,
                                    uint16_t      width,
                                    uint16_t      height);
-#if 0
-/* FIXME */
-pixman_bool_t fbCopyAreammx (DrawablePtr       pSrc,
-                            DrawablePtr        pDst,
-                            int                src_x,
-                            int                src_y,
-                            int                dst_x,
-                            int                dst_y,
-                            int                width,
-                            int                height);
-#endif
-
 void fbCompositeCopyAreammx (pixman_op_t       op,
                             pixman_image_t *   pSrc,
                             pixman_image_t *   pMask,
@@ -310,14 +298,5 @@ void fbCompositeCopyAreammx (pixman_op_t   op,
                             int16_t      yDst,
                             uint16_t     width,
                             uint16_t     height);
-#if 0
-/* FIXME */
-pixman_bool_t fbSolidFillmmx (DrawablePtr      pDraw,
-                             int               x,
-                             int               y,
-                             int               width,
-                             int               height,
-                             FbBits            xor);
-#endif
 
 #endif /* USE_MMX */