From 46c79e4d59ec4f90a1fa97b24a3e7058fdbfa6ba Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Wed, 7 Mar 2012 13:17:21 +0000 Subject: [PATCH] sna: Restore checking for all-clipped-out for CompositeRectangles In the refactoring to avoid repeatedly applying the singular pCompositeClip, the check for the all-clipped state was lost. Signed-off-by: Chris Wilson --- src/sna/sna_composite.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/sna/sna_composite.c b/src/sna/sna_composite.c index 7f1d0960..225008fb 100644 --- a/src/sna/sna_composite.c +++ b/src/sna/sna_composite.c @@ -596,11 +596,9 @@ _pixman_region_init_clipped_rectangles(pixman_region16_t *region, j++; } - ret = TRUE; + ret = FALSE; if (j) ret = pixman_region_init_rects(region, boxes, j); - else - pixman_region_init(region); if (boxes != stack_boxes) free(boxes); @@ -609,7 +607,7 @@ _pixman_region_init_clipped_rectangles(pixman_region16_t *region, __FUNCTION__, num_rects, region->extents.x1, region->extents.y1, region->extents.x2, region->extents.y2, - pixman_region_n_rects(region))); + j)); return ret; }