From b94135c14200cab73ec1d9cfdd5093f28bd365fa Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Sat, 15 May 2010 00:50:42 +0100
Subject: uxa: Fix order of conditionals to only run fill_region for SRC or
 opaque

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
(cherry picked from commit 95654cffa8643f61f153218f27e800df75b9bdee)

Signed-off-by: Owain G. Ainsworth <oga@openbsd.org>
---
 uxa/uxa-render.c | 128 +++++++++++++++++++++++++++----------------------------
 1 file changed, 64 insertions(+), 64 deletions(-)

(limited to 'uxa')

diff --git a/uxa/uxa-render.c b/uxa/uxa-render.c
index 29d15a24..172b40a5 100644
--- a/uxa/uxa-render.c
+++ b/uxa/uxa-render.c
@@ -1393,79 +1393,79 @@ uxa_composite(CARD8 op,
 			if (ret == 1)
 				goto done;
 		} else if (compatible_formats (op, pDst, pSrc) &&
-			   !pSrc->repeat &&
-			   transform_is_integer_translation(pSrc->transform, &tx, &ty) &&
-			   drawable_contains(pSrc->pDrawable,
+			   transform_is_integer_translation(pSrc->transform, &tx, &ty)) {
+			if (!pSrc->repeat &&
+			    drawable_contains(pSrc->pDrawable,
 					     xSrc + tx, ySrc + ty,
 					     width, height)) {
-			xDst += pDst->pDrawable->x;
-			yDst += pDst->pDrawable->y;
-			xSrc += pSrc->pDrawable->x + tx;
-			ySrc += pSrc->pDrawable->y + ty;
-
-			if (!miComputeCompositeRegion
-			    (&region, pSrc, pMask, pDst, xSrc, ySrc,
-			     xMask, yMask, xDst, yDst, width, height))
-				goto done;
-
-			uxa_copy_n_to_n(pSrc->pDrawable,
-					pDst->pDrawable, NULL,
-					REGION_RECTS(&region),
-					REGION_NUM_RECTS(&region),
-					xSrc - xDst, ySrc - yDst, FALSE,
-					FALSE, 0, NULL);
-			REGION_UNINIT(pDst->pDrawable->pScreen,
-				      &region);
-			goto done;
-		} else if (pSrc->pDrawable->type == DRAWABLE_PIXMAP &&
-			   pSrc->repeatType == RepeatNormal &&
-			   transform_is_integer_translation(pSrc->transform, &tx, &ty)) {
-			DDXPointRec patOrg;
-
-			/* Let's see if the driver can do the repeat
-			 * in one go
-			 */
-			if (uxa_screen->info->prepare_composite) {
-				ret = uxa_try_driver_composite(op, pSrc,
-							       pMask, pDst,
-							       xSrc, ySrc,
-							       xMask, yMask,
-							       xDst, yDst,
-							       width, height);
-				if (ret == 1)
+				xDst += pDst->pDrawable->x;
+				yDst += pDst->pDrawable->y;
+				xSrc += pSrc->pDrawable->x + tx;
+				ySrc += pSrc->pDrawable->y + ty;
+
+				if (!miComputeCompositeRegion
+				    (&region, pSrc, pMask, pDst, xSrc, ySrc,
+				     xMask, yMask, xDst, yDst, width, height))
 					goto done;
-			}
 
-			/* Now see if we can use
-			 * uxa_fill_region_tiled()
-			 */
-			xDst += pDst->pDrawable->x;
-			yDst += pDst->pDrawable->y;
-			xSrc += pSrc->pDrawable->x + tx;
-			ySrc += pSrc->pDrawable->y + ty;
-
-			if (!miComputeCompositeRegion
-			    (&region, pSrc, pMask, pDst, xSrc, ySrc,
-			     xMask, yMask, xDst, yDst, width, height))
+				uxa_copy_n_to_n(pSrc->pDrawable,
+						pDst->pDrawable, NULL,
+						REGION_RECTS(&region),
+						REGION_NUM_RECTS(&region),
+						xSrc - xDst, ySrc - yDst, FALSE,
+						FALSE, 0, NULL);
+				REGION_UNINIT(pDst->pDrawable->pScreen,
+					      &region);
 				goto done;
+			} else if (pSrc->repeat && pSrc->repeatType == RepeatNormal &&
+				   pSrc->pDrawable->type == DRAWABLE_PIXMAP) {
+				DDXPointRec patOrg;
+
+				/* Let's see if the driver can do the repeat
+				 * in one go
+				 */
+				if (uxa_screen->info->prepare_composite) {
+					ret = uxa_try_driver_composite(op, pSrc,
+								       pMask, pDst,
+								       xSrc, ySrc,
+								       xMask, yMask,
+								       xDst, yDst,
+								       width, height);
+					if (ret == 1)
+						goto done;
+				}
 
-			/* pattern origin is the point in the
-			 * destination drawable
-			 * corresponding to (0,0) in the source */
-			patOrg.x = xDst - xSrc;
-			patOrg.y = yDst - ySrc;
+				/* Now see if we can use
+				 * uxa_fill_region_tiled()
+				 */
+				xDst += pDst->pDrawable->x;
+				yDst += pDst->pDrawable->y;
+				xSrc += pSrc->pDrawable->x + tx;
+				ySrc += pSrc->pDrawable->y + ty;
+
+				if (!miComputeCompositeRegion
+				    (&region, pSrc, pMask, pDst, xSrc, ySrc,
+				     xMask, yMask, xDst, yDst, width, height))
+					goto done;
 
-			ret = uxa_fill_region_tiled(pDst->pDrawable,
-						    &region,
-						    (PixmapPtr) pSrc->
-						    pDrawable, &patOrg,
-						    FB_ALLONES, GXcopy);
+				/* pattern origin is the point in the
+				 * destination drawable
+				 * corresponding to (0,0) in the source */
+				patOrg.x = xDst - xSrc;
+				patOrg.y = yDst - ySrc;
 
-			REGION_UNINIT(pDst->pDrawable->pScreen,
-				      &region);
+				ret = uxa_fill_region_tiled(pDst->pDrawable,
+							    &region,
+							    (PixmapPtr) pSrc->
+							    pDrawable, &patOrg,
+							    FB_ALLONES, GXcopy);
 
-			if (ret)
-				goto done;
+				REGION_UNINIT(pDst->pDrawable->pScreen,
+					      &region);
+
+				if (ret)
+					goto done;
+			}
 		}
 	}
 
-- 
cgit v1.2.3