pixman: Branch 'master' - 2 commits

[Søren Sandmann Pedersen]

 pixman/pixman-pict.c |   10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

New commits:
commit 48d52fadc23ab027215a3d6c07ffcdbb6d40eb3f
Author: Søren Sandmann <sandmann at redhat.com>
Date:   Sat Dec 1 22:50:05 2007 -0500

    Make the tables static; remove unused flag

diff --git a/pixman/pixman-pict.c b/pixman/pixman-pict.c
index 53208ae..b913f28 100644
--- a/pixman/pixman-pict.c
+++ b/pixman/pixman-pict.c
@@ -1394,7 +1394,6 @@ pixman_image_composite_rect  (pixman_op_t                   op,
 #define NEED_COMPONENT_ALPHA		(1 << 0)
 #define NEED_PIXBUF			(1 << 1)
 #define NEED_SOLID_MASK		        (1 << 2)
-#define NEED_SAME_SRC_DST_FORMAT        (1 << 3)
 
 typedef struct
 {
@@ -1407,7 +1406,7 @@ typedef struct
 } FastPathInfo;
 
 #ifdef USE_MMX
-const FastPathInfo mmx_fast_paths[] =
+static const FastPathInfo mmx_fast_paths[] =
 {
     { PIXMAN_OP_OVER, PIXMAN_solid,    PIXMAN_a8,       PIXMAN_r5g6b5,   fbCompositeSolidMask_nx8x0565mmx,     0 },
     { PIXMAN_OP_OVER, PIXMAN_solid,    PIXMAN_a8,       PIXMAN_b5g6r5,   fbCompositeSolidMask_nx8x0565mmx,     0 },
@@ -1493,7 +1492,7 @@ const FastPathInfo mmx_fast_paths[] =
 };
 #endif
 
-const FastPathInfo c_fast_paths[] =
+static const FastPathInfo c_fast_paths[] =
 {
     { PIXMAN_OP_OVER, PIXMAN_solid,    PIXMAN_a8,       PIXMAN_r5g6b5,   fbCompositeSolidMask_nx8x0565, 0 },
     { PIXMAN_OP_OVER, PIXMAN_solid,    PIXMAN_a8,       PIXMAN_b5g6r5,   fbCompositeSolidMask_nx8x0565, 0 },
commit 0a53c41dbc5d6476595b2ad58dd9a14a3e85295c
Author: Søren Sandmann <sandmann at redhat.com>
Date:   Sat Dec 1 21:56:25 2007 -0500

    Set maskRepeat to FALSE when the function is NEED_SOLID_MASK

diff --git a/pixman/pixman-pict.c b/pixman/pixman-pict.c
index be8f096..53208ae 100644
--- a/pixman/pixman-pict.c
+++ b/pixman/pixman-pict.c
@@ -1729,8 +1729,11 @@ pixman_image_composite (pixman_op_t      op,
 	    if (info->src_format == PIXMAN_solid)
 		srcRepeat = FALSE;
 
-	    if (info->mask_format == PIXMAN_solid)
+	    if (info->mask_format == PIXMAN_solid	||
+		info->flags & NEED_SOLID_MASK)
+	    {
 		maskRepeat = FALSE;
+	    }
 	}
     }