xf86-video-intel: 2 commits - uxa/uxa-render.c

[Chris Wilson]

 uxa/uxa-render.c |   18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 21b5fd427f5ed6c99276349a7ae128eea580dd72
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Sun May 16 13:51:41 2010 +0100

    uxa: Tidy uxa_solid_rects()
    
    Move the operator reduction after a few fallbacks, closer to its use.
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/uxa/uxa-render.c b/uxa/uxa-render.c
index e062001..4c552ca 100644
--- a/uxa/uxa-render.c
+++ b/uxa/uxa-render.c
@@ -943,11 +943,6 @@ uxa_solid_rects (CARD8		op,
 	if (!pixman_region_not_empty(dst->pCompositeClip))
 		return;
 
-	if (op == PictOpClear)
-		color->red = color->green = color->blue = color->alpha = 0;
-	if (color->alpha >= 0xff00 && op == PictOpOver)
-		op = PictOpSrc;
-
 	if (dst->alphaMap)
 		goto fallback;
 
@@ -966,6 +961,11 @@ uxa_solid_rects (CARD8		op,
 	pixman_region_translate(&region, dst_x, dst_y);
 	boxes = pixman_region_rectangles(&region, &num_boxes);
 
+	if (op == PictOpClear)
+		color->red = color->green = color->blue = color->alpha = 0;
+	if (color->alpha >= 0xff00 && op == PictOpOver)
+		op = PictOpSrc;
+
 	/* Using GEM, the relocation costs outweigh the advantages of the blitter */
 	if (num_boxes == 1 && (op == PictOpSrc || op == PictOpClear)) {
 		CARD32 pixel;
commit 61835701fd411d3bb550ceee3365e30639e46861
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Sun May 16 13:26:07 2010 +0100

    uxa: Patterns are acquired at 0,0
    
    Set the correct offset for the gradients patterns after rendering to a
    local Picture.
    
    Fixes cairo/test/huge-radial and friends
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/uxa/uxa-render.c b/uxa/uxa-render.c
index d2c11a3..e062001 100644
--- a/uxa/uxa-render.c
+++ b/uxa/uxa-render.c
@@ -838,8 +838,8 @@ uxa_acquire_picture(ScreenPtr screen,
 			*out_x = x + src->pDrawable->x;
 			*out_y = y + src->pDrawable->y;
 		} else {
-			*out_x = x;
-			*out_y = y;
+			*out_x = 0;
+			*out_y = 0;
 		}
 		return src;
 	}
@@ -860,8 +860,8 @@ uxa_acquire_picture(ScreenPtr screen,
 		return dst;
 	}
 
-	*out_x = x;
-	*out_y = y;
+	*out_x = 0;
+	*out_y = 0;
 	return uxa_acquire_pattern(screen, src,
 				   format, x, y, width, height);
 }