xf86-video-intel: src/sna/sna_composite.c
Chris Wilson
ickle at kemper.freedesktop.org
Wed Mar 7 05:19:59 PST 2012
src/sna/sna_composite.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
New commits:
commit 46c79e4d59ec4f90a1fa97b24a3e7058fdbfa6ba
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Wed Mar 7 13:17:21 2012 +0000
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 at chris-wilson.co.uk>
diff --git a/src/sna/sna_composite.c b/src/sna/sna_composite.c
index 7f1d096..225008f 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;
}
More information about the xorg-commit
mailing list