Remove unused combineMaskU functions

diff --git a/pixman/combine.inc b/pixman/combine.inc
index c1624ac..ff18732 100644 (file)
--- a/pixman/combine.inc
+++ b/pixman/combine.inc
@@ -18,21 +18,6 @@
 
 
 /*
- * Combine src and mask
- */
-FASTCALL static void
-pixman_fbCombineMaskU (comp4_t *src, const comp4_t *mask, int width)
-{
-    int i;
-    for (i = 0; i < width; ++i) {
-        comp4_t a = *(mask + i) >> A_SHIFT;
-        comp4_t s = *(src + i);
-        FbByteMul(s, a);
-        *(src + i) = s;
-    }
-}
-
-/*
  * All of the composing functions
  */
 
@@ -1291,6 +1276,5 @@ static CombineFunc pixman_fbCombineFuncC[] = {
 
 FbComposeFunctions pixman_composeFunctions = {
     pixman_fbCombineFuncU,
-    pixman_fbCombineFuncC,
-    pixman_fbCombineMaskU
+    pixman_fbCombineFuncC, 
 };

diff --git a/pixman/pixman-image.c b/pixman/pixman-image.c
index 4bc47dc..2030ddd 100644 (file)
--- a/pixman/pixman-image.c
+++ b/pixman/pixman-image.c
@@ -274,6 +274,8 @@ _pixman_image_get_fetcher (pixman_image_t *image,
     }
 }
 
+
+
 #define WRITE_ACCESS(f) ((image->common.write_func)? f##_accessors : f)
 
 static void

diff --git a/pixman/pixman-mmx.c b/pixman/pixman-mmx.c
index f8a2af8..1c9b538 100644 (file)
--- a/pixman/pixman-mmx.c
+++ b/pixman/pixman-mmx.c
@@ -422,28 +422,6 @@ pix_add_mul (__m64 x, __m64 a, __m64 y, __m64 b)
 
 /* --------------- MMX code patch for fbcompose.c --------------------- */
 
-static FASTCALL void
-mmxCombineMaskU (uint32_t *src, const uint32_t *mask, int width)
-{
-    const uint32_t *end = mask + width;
-    while (mask < end) {
-        uint32_t mmask = *mask;
-       uint32_t maska = mmask >> 24;
-       if (maska == 0) {
-           *src = 0;
-       } else if (maska != 0xff) {
-           __m64 a = load8888(mmask);
-           __m64 s = load8888(*src);
-           a = expand_alpha(a);
-           s = pix_multiply(s, a);
-           *src = store8888(s);
-       }
-       ++src;
-       ++mask;
-    }
-    _mm_empty();
-}
-
 static force_inline uint32_t
 combine (const uint32_t *src, const uint32_t *mask)
 {
@@ -955,8 +933,6 @@ fbComposeSetupMMX(void)
         pixman_composeFunctions.combineC[PIXMAN_OP_ATOP_REVERSE] = mmxCombineAtopReverseC;
         pixman_composeFunctions.combineC[PIXMAN_OP_XOR] = mmxCombineXorC;
         pixman_composeFunctions.combineC[PIXMAN_OP_ADD] = mmxCombineAddC;
-
-        pixman_composeFunctions.combineMaskU = mmxCombineMaskU;
     }
 
     initialized = TRUE;

diff --git a/pixman/pixman-private.h b/pixman/pixman-private.h
index db57467..072b0d2 100644 (file)
--- a/pixman/pixman-private.h
+++ b/pixman/pixman-private.h
@@ -152,7 +152,6 @@ typedef struct point point_t;
  */
 
 #define FASTCALL
-typedef FASTCALL void (*CombineMask32) (uint32_t *src, const uint32_t *mask, int width);
 typedef FASTCALL void (*CombineFunc32) (uint32_t *dest, const uint32_t *src, const uint32_t *mask, int width);
 typedef FASTCALL void (*fetchProc32)(bits_image_t *pict, int x, int y, int width,
                                      uint32_t *buffer);
@@ -188,7 +187,6 @@ typedef struct _FbComposeData {
 typedef struct _FbComposeFunctions32 {
     CombineFunc32 *combineU;
     CombineFunc32 *combineC;
-    CombineMask32 combineMaskU;
 } FbComposeFunctions32;
 
 typedef struct _FbComposeFunctions64 {

diff --git a/pixman/pixman-sse2.c b/pixman/pixman-sse2.c
index d815bfc..995c714 100644 (file)
--- a/pixman/pixman-sse2.c
+++ b/pixman/pixman-sse2.c
@@ -2310,13 +2310,6 @@ createMask_2x32_128 (uint32_t mask0, uint32_t mask1)
 /* SSE2 code patch for fbcompose.c */
 
 static FASTCALL void
-sse2CombineMaskU (uint32_t *dst, const uint32_t *src, int width)
-{
-    coreCombineReverseInUsse2 (dst, src, NULL, width);
-    _mm_empty();
-}
-
-static FASTCALL void
 sse2CombineOverU (uint32_t *dst, const uint32_t *src, const uint32_t *mask, int width)
 {
     coreCombineOverUsse2 (dst, src, mask, width);
@@ -2533,8 +2526,6 @@ fbComposeSetupSSE2(void)
         pixman_composeFunctions.combineC[PIXMAN_OP_XOR] = sse2CombineXorC;
         pixman_composeFunctions.combineC[PIXMAN_OP_ADD] = sse2CombineAddC;
 
-        pixman_composeFunctions.combineMaskU = sse2CombineMaskU;
-
        _mm_empty();
     }
 

diff --git a/pixman/pixman-vmx.c b/pixman/pixman-vmx.c
index 129cab7..6478b90 100644 (file)
--- a/pixman/pixman-vmx.c
+++ b/pixman/pixman-vmx.c
@@ -209,37 +209,6 @@ over (vector unsigned int src, vector unsigned int srca,
         vec_st ((vector unsigned int) tmp1, 0, dest );
 
 static FASTCALL void
-vmxCombineMaskU (uint32_t *src, const uint32_t *msk, int width)
-{
-    int i;
-    vector unsigned int  vsrc, vmsk;
-    vector unsigned char tmp1, tmp2, tmp3, tmp4, edges,
-                         src_mask, msk_mask, store_mask;
-
-    COMPUTE_SHIFT_MASKS(src, msk)
-
-    /* printf ("%s\n",__PRETTY_FUNCTION__); */
-    for (i = width/4; i > 0; i--) {
-
-        LOAD_VECTORS(src, msk)
-
-        vsrc = pix_multiply (vsrc, splat_alpha (vmsk));
-
-        STORE_VECTOR(src)
-
-        msk+=4;
-        src+=4;
-    }
-
-    for (i = width%4; --i >= 0;) {
-        uint32_t a = msk[i] >> 24;
-        uint32_t s = src[i];
-        FbByteMul (s, a);
-        src[i] = s;
-    }
-}
-
-static FASTCALL void
 vmxCombineOverU (uint32_t *dest, const uint32_t *src, int width)
 {
     int i;
@@ -1060,7 +1029,5 @@ void fbComposeSetupVMX (void)
         pixman_composeFunctions.combineC[PIXMAN_OP_ATOP_REVERSE] = vmxCombineAtopReverseC;
         pixman_composeFunctions.combineC[PIXMAN_OP_XOR] = vmxCombineXorC;
         pixman_composeFunctions.combineC[PIXMAN_OP_ADD] = vmxCombineAddC;
-
-        pixman_composeFunctions.combineMaskU = vmxCombineMaskU;
     }
 }