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, 34 insertions, 78 deletions

diff --git a/src/cairo-surface-fallback-private.h b/src/cairo-surface-fallback-private.h
index ffb6f9199..ecf7b0edf 100644
--- a/src/cairo-surface-fallback-private.h
+++ b/src/cairo-surface-fallback-private.h
@@ -3,6 +3,7 @@
  *
  * Copyright © 2002 University of Southern California
  * Copyright © 2005 Red Hat, Inc.
+ * Copyright © 2011 Intel Corporation
  *
  * This library is free software; you can redistribute it and/or
  * modify it either under the terms of the GNU Lesser General Public
@@ -34,6 +35,8 @@
  *
  * Contributor(s):
  *	Carl D. Worth <cworth@cworth.org>
+ *      Joonas Pihlaja <jpihlaja@cc.helsinki.fi>
+ *	Chris Wilson <chris@chris-wilson.co.uk>
  */
 
 #ifndef CAIRO_SURFACE_FALLBACK_PRIVATE_H
@@ -41,99 +44,52 @@
 
 #include "cairoint.h"
 
-cairo_private cairo_status_t
-_cairo_surface_fallback_paint (cairo_surface_t		*surface,
+CAIRO_BEGIN_DECLS
+
+cairo_private cairo_int_status_t
+_cairo_surface_fallback_paint (void			*abstract_surface,
 			       cairo_operator_t		 op,
 			       const cairo_pattern_t	*source,
 			       const cairo_clip_t	*clip);
 
-cairo_private cairo_status_t
-_cairo_surface_fallback_mask (cairo_surface_t		*surface,
+cairo_private cairo_int_status_t
+_cairo_surface_fallback_mask (void			*abstract_surface,
 			      cairo_operator_t		 op,
 			      const cairo_pattern_t	*source,
 			      const cairo_pattern_t	*mask,
 			      const cairo_clip_t	*clip);
 
-cairo_private cairo_status_t
-_cairo_surface_fallback_stroke (cairo_surface_t		*surface,
-				cairo_operator_t	 op,
+cairo_private cairo_int_status_t
+_cairo_surface_fallback_stroke (void			*abstract_surface,
+				cairo_operator_t		 op,
 				const cairo_pattern_t	*source,
 				const cairo_path_fixed_t	*path,
-				const cairo_stroke_style_t	*stroke_style,
-				const cairo_matrix_t		*ctm,
-				const cairo_matrix_t		*ctm_inverse,
+				const cairo_stroke_style_t*style,
+				const cairo_matrix_t	*ctm,
+				const cairo_matrix_t	*ctm_inverse,
 				double			 tolerance,
 				cairo_antialias_t	 antialias,
 				const cairo_clip_t	*clip);
 
-cairo_private cairo_status_t
-_cairo_surface_fallback_fill (cairo_surface_t		*surface,
-			      cairo_operator_t		 op,
-			      const cairo_pattern_t	*source,
-			      const cairo_path_fixed_t	*path,
-			      cairo_fill_rule_t		 fill_rule,
-			      double			 tolerance,
-			      cairo_antialias_t		 antialias,
-			      const cairo_clip_t	*clip);
-
-cairo_private cairo_status_t
-_cairo_surface_fallback_show_glyphs (cairo_surface_t		*surface,
-				     cairo_operator_t		 op,
-				     const cairo_pattern_t	*source,
-				     cairo_glyph_t		*glyphs,
-				     int			 num_glyphs,
-				     cairo_scaled_font_t	*scaled_font,
-				     const cairo_clip_t		*clip);
+cairo_private cairo_int_status_t
+_cairo_surface_fallback_fill (void			*abstract_surface,
+			     cairo_operator_t		 op,
+			     const cairo_pattern_t	*source,
+			     const cairo_path_fixed_t	*path,
+			     cairo_fill_rule_t		 fill_rule,
+			     double			 tolerance,
+			     cairo_antialias_t		 antialias,
+			     const cairo_clip_t		*clip);
 
-cairo_private cairo_surface_t *
-_cairo_surface_fallback_snapshot (cairo_surface_t *surface);
-
-cairo_private cairo_status_t
-_cairo_surface_fallback_composite (cairo_operator_t		 op,
-				   const cairo_pattern_t	*src,
-				   const cairo_pattern_t	*mask,
-				   cairo_surface_t		*dst,
-				   int				 src_x,
-				   int				 src_y,
-				   int				 mask_x,
-				   int				 mask_y,
-				   int				 dst_x,
-				   int				 dst_y,
-				   unsigned int			 width,
-				   unsigned int			 height,
-				   cairo_region_t		*clip_region);
-
-cairo_private cairo_status_t
-_cairo_surface_fallback_fill_rectangles (cairo_surface_t         *surface,
-					 cairo_operator_t	 op,
-					 const cairo_color_t	 *color,
-					 cairo_rectangle_int_t   *rects,
-					 int			 num_rects);
-
-cairo_private cairo_status_t
-_cairo_surface_fallback_composite_trapezoids (cairo_operator_t		op,
-					      const cairo_pattern_t    *pattern,
-					      cairo_surface_t	       *dst,
-					      cairo_antialias_t		antialias,
-					      int			src_x,
-					      int			src_y,
-					      int			dst_x,
-					      int			dst_y,
-					      unsigned int		width,
-					      unsigned int		height,
-					      cairo_trapezoid_t	       *traps,
-					      int			num_traps,
-					      cairo_region_t		*clip_region);
+cairo_private cairo_int_status_t
+_cairo_surface_fallback_glyphs (void			*abstract_surface,
+				cairo_operator_t		 op,
+				const cairo_pattern_t	*source,
+				cairo_glyph_t		*glyphs,
+				int			 num_glyphs,
+				cairo_scaled_font_t	*scaled_font,
+				const cairo_clip_t	*clip);
 
-cairo_private cairo_status_t
-_cairo_surface_fallback_clone_similar (cairo_surface_t  *surface,
-				       cairo_surface_t  *src,
-				       int               src_x,
-				       int               src_y,
-				       int               width,
-				       int               height,
-				       int              *clone_offset_x,
-				       int              *clone_offset_y,
-				       cairo_surface_t **clone_out);
+CAIRO_END_DECLS
 
-#endif
+#endif /* CAIRO_SURFACE_FALLBACK_PRIVATE_H */