[cairo-commit] Branch '1.14' - src/cairo-xcb-surface-render.c

[Uli Schlachter]

 src/cairo-xcb-surface-render.c |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 4d9cee1a506c74e052095758ce700ab05e9b38bb
Author: Uli Schlachter <psychon at znc.in>
Date:   Sat Jun 20 10:59:52 2015 +0200

    XCB: Don't attach uploaded surfaces as snapshots
    
    When you draw (part of) a surface to an XCB surface, the XCB backend will safe
    the uploaded part as a snapshot to the input surface. This allows to re-use this
    picture in case the same surface is later used again as a source.
    
    However, other backends do not do this and this has caused and/or highlighted
    numerous bugs. Just skipping the snapshot fixes or hides these bugs.
    
    Papers-over: https://bugs.freedesktop.org/show_bug.cgi?id=67505
    Signed-off-by: Uli Schlachter <psychon at znc.in>

diff --git a/src/cairo-xcb-surface-render.c b/src/cairo-xcb-surface-render.c
index 21a89cc..b35bf4d 100644
--- a/src/cairo-xcb-surface-render.c
+++ b/src/cairo-xcb-surface-render.c
@@ -1292,9 +1292,12 @@ _cairo_xcb_surface_picture (cairo_xcb_surface_t *target,
 	    return picture;
     }
 
+    /* XXX: This causes too many problems and bugs, let's skip it for now. */
+#if 0
     _cairo_surface_attach_snapshot (source,
 				    &picture->base,
 				    NULL);
+#endif
 
     _cairo_xcb_surface_setup_surface_picture (picture, pattern, extents);
     return picture;