summaryrefslogtreecommitdiff
path: root/src/sna/sna_composite.c
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2012-03-07 13:17:21 +0000
committerChris Wilson <chris@chris-wilson.co.uk>2012-03-07 13:17:21 +0000
commit46c79e4d59ec4f90a1fa97b24a3e7058fdbfa6ba (patch)
treef9f6c4d82fba229d53137ff8e06525528b1cdbe0 /src/sna/sna_composite.c
parent9944f1834a9c53091e4415f928f917e9247f17c5 (diff)
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 <chris@chris-wilson.co.uk>
Diffstat (limited to 'src/sna/sna_composite.c')
-rw-r--r--src/sna/sna_composite.c6
1 files 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;
}