From dc0a9dd65ab2622646d1220adf3e5ea70dcae951 Mon Sep 17 00:00:00 2001
From: =?utf8?q?S=C3=B8ren=20Sandmann=20Pedersen?= <sandmann@redhat.com>
Date: Tue, 2 Jun 2009 22:04:47 -0400
Subject: [PATCH] Remove all the srcRepeat/srcTransform stuff from the general
 implementation.

---
 pixman/pixman-general.c | 50 +------------------------------------------------
 1 file changed, 1 insertion(+), 49 deletions(-)

diff --git a/pixman/pixman-general.c b/pixman/pixman-general.c
index be512d5..4039144 100644
--- a/pixman/pixman-general.c
+++ b/pixman/pixman-general.c
@@ -259,57 +259,9 @@ general_composite (pixman_implementation_t *	imp,
 		   int32_t			width,
 		   int32_t			height)
 {
-    pixman_bool_t srcRepeat = src->type == BITS && src->common.repeat == PIXMAN_REPEAT_NORMAL;
-    pixman_bool_t maskRepeat = FALSE;
-    pixman_bool_t srcTransform = src->common.transform != NULL;
-    pixman_bool_t maskTransform = FALSE;
-    
-    if (srcRepeat && srcTransform &&
-	src->bits.width == 1 &&
-	src->bits.height == 1)
-    {
-	srcTransform = FALSE;
-    }
-    
-    if (mask && mask->type == BITS)
-    {
-	maskRepeat = mask->common.repeat == PIXMAN_REPEAT_NORMAL;
-	
-	maskTransform = mask->common.transform != 0;
-	if (mask->common.filter == PIXMAN_FILTER_CONVOLUTION)
-	    maskTransform = TRUE;
-	
-	if (maskRepeat && maskTransform &&
-	    mask->bits.width == 1 &&
-	    mask->bits.height == 1)
-	{
-	    maskTransform = FALSE;
-	}
-    }
-    
-    /* CompositeGeneral optimizes 1x1 repeating images itself */
-    if (src->type == BITS &&
-	src->bits.width == 1 && src->bits.height == 1)
-    {
-	srcRepeat = FALSE;
-    }
-    
-    if (mask && mask->type == BITS &&
-	mask->bits.width == 1 && mask->bits.height == 1)
-    {
-	maskRepeat = FALSE;
-    }
-    
-    /* if we are transforming, repeats are handled in fbFetchTransformed */
-    if (srcTransform)
-	srcRepeat = FALSE;
-    
-    if (maskTransform)
-	maskRepeat = FALSE;
-    
     _pixman_walk_composite_region (imp, op, src, mask, dest, src_x, src_y,
 				   mask_x, mask_y, dest_x, dest_y, width, height,
-				   srcRepeat, maskRepeat, general_composite_rect);
+				   FALSE, FALSE, general_composite_rect);
 }
 
 static pixman_bool_t
-- 
2.7.4