From f75075eef91c42aa38e24e03f93cd1d598b0ee5f Mon Sep 17 00:00:00 2001 From: Uli Schlachter Date: Sun, 17 Jul 2016 15:08:51 +0200 Subject: [PATCH] cairo-xcb: Remove a wrong optimisation When doing a "complicated" mask operation, we draw the clip to a surface and use this as a mask in later operations. The code assumes that this operation draws to the whole target surface and thus a deferred clear may be skipped. However, this requires that the extents of the trapezoids that will be drawn and the extents of the surface are the same. This assumption is wrong, as can be seen e.g. by the bug report that this commit fixes. The fix is just not to skip the deferred clear. Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=84330 Signed-off-by: Uli Schlachter --- src/cairo-xcb-surface-render.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/cairo-xcb-surface-render.c b/src/cairo-xcb-surface-render.c index 044339bce..139dcda82 100644 --- a/src/cairo-xcb-surface-render.c +++ b/src/cairo-xcb-surface-render.c @@ -3399,8 +3399,6 @@ _composite_mask_clip (void *closure, } } - dst->deferred_clear = FALSE; /* assert(trap extents == extents); */ - status = _composite_traps (&info, dst, CAIRO_OPERATOR_SOURCE, mask_pattern, dst_x, dst_y,