Introduce a new compositor architecture

Having spent the last dev cycle looking at how we could specialize the
compositors for various backends, we once again look for the
commonalities in order to reduce the duplication. In part this is
motivated by the idea that spans is a good interface for both the
existent GL backend and pixman, and so they deserve a dedicated
compositor. xcb/xlib target an identical rendering system and so they
should be using the same compositor, and it should be possible to run
that same compositor locally against pixman to generate reference tests.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

P.S. This brings massive upheaval (read breakage) I've tried delaying in
order to fix as many things as possible but now this one patch does far,
far, far too much. Apologies in advance for breaking your favourite
backend, but trust me in that the end result will be much better. :)

1 files changed, 1 insertions, 70 deletions

diff --git a/src/cairo-xlib-surface-private.h b/src/cairo-xlib-surface-private.h
index b56b245c7..87db6962b 100644
--- a/src/cairo-xlib-surface-private.h
+++ b/src/cairo-xlib-surface-private.h
@@ -38,76 +38,7 @@
 #include "cairo-xlib-xrender-private.h"
 
 #include "cairo-surface-private.h"
+#include "cairo-surface-backend-private.h"
 
-typedef struct _cairo_xlib_surface cairo_xlib_surface_t;
-
-struct _cairo_xlib_surface {
-    cairo_surface_t base;
-
-    cairo_xlib_screen_t *screen;
-    cairo_xlib_hook_t close_display_hook;
-    cairo_list_t link;
-
-    Drawable drawable;
-    cairo_bool_t owns_pixmap;
-    Visual *visual;
-
-    int use_pixmap;
-
-    int render_major;
-    int render_minor;
-
-    /* TRUE if the server has a bug with repeating pictures
-     *
-     *  https://bugs.freedesktop.org/show_bug.cgi?id=3566
-     *
-     * We can't test for this because it depends on whether the
-     * picture is in video memory or not.
-     *
-     * We also use this variable as a guard against a second
-     * independent bug with transformed repeating pictures:
-     *
-     * http://lists.freedesktop.org/archives/cairo/2004-September/001839.html
-     *
-     * Both are fixed in xorg >= 6.9 and hopefully in > 6.8.2, so
-     * we can reuse the test for now.
-     */
-    unsigned int buggy_gradients : 1;
-    unsigned int buggy_pad_reflect : 1;
-    unsigned int buggy_repeat : 1;
-#define CAIRO_XLIB_SURFACE_HAS_BUGGY_GRADIENTS 1
-#define CAIRO_XLIB_SURFACE_HAS_BUGGY_PAD_REFLECT 1
-#define CAIRO_XLIB_SURFACE_HAS_BUGGY_REPEAT 1
-
-    int width;
-    int height;
-    int depth;
-
-    Picture dst_picture, src_picture;
-
-    unsigned int clip_dirty;
-    XRectangle embedded_clip_rects[8];
-    XRectangle *clip_rects;
-    int num_clip_rects;
-    cairo_region_t *clip_region;
-
-    XRenderPictFormat *xrender_format;
-    cairo_filter_t filter;
-    cairo_extend_t extend;
-    cairo_bool_t has_component_alpha;
-    int precision;
-    XTransform xtransform;
-
-    uint32_t a_mask;
-    uint32_t r_mask;
-    uint32_t g_mask;
-    uint32_t b_mask;
-};
-
-enum {
-    CAIRO_XLIB_SURFACE_CLIP_DIRTY_GC      = 0x01,
-    CAIRO_XLIB_SURFACE_CLIP_DIRTY_PICTURE = 0x02,
-    CAIRO_XLIB_SURFACE_CLIP_DIRTY_ALL     = 0x03
-};
 
 #endif /* CAIRO_XLIB_SURFACE_PRIVATE_H */