[cairo-commit] 2 commits - src/test-base-compositor-surface.c test/reference

[Chris Wilson]

 src/test-base-compositor-surface.c                |   60 +++++++++++++++++++---
 test/reference/random-clip.base.argb32.ref.png    |binary
 test/reference/random-clip.base.rgb24.ref.png     |binary
 test/reference/tighten-bounds.base.argb32.ref.png |binary
 test/reference/tighten-bounds.base.rgb24.ref.png  |binary
 5 files changed, 52 insertions(+), 8 deletions(-)

New commits:
commit 26e8fa03cb411d5d6d1df32c7a5435eaaa15ffd2
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Fri Sep 16 15:02:37 2011 +0100

    base: Make sure we have fuzzy clip boxes!
    
    _cairo_clip_get_surface() expects the caller to handle unaligned clip
    boxes in order to avoid recursion. The baseline renderer ignored this
    basic tenet and so ended up with only sharp clip regions.
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/test-base-compositor-surface.c b/src/test-base-compositor-surface.c
index d2212c3..21032b0 100644
--- a/src/test-base-compositor-surface.c
+++ b/src/test-base-compositor-surface.c
@@ -190,6 +190,51 @@ combine_in_boxes (cairo_image_surface_t *dst,
 }
 
 static cairo_image_surface_t *
+get_clip_surface (cairo_image_surface_t	*dst,
+		  const cairo_composite_rectangles_t *extents,
+		  int *clip_x,
+		  int *clip_y)
+{
+    cairo_image_surface_t *surface;
+    cairo_int_status_t status;
+
+    surface = (cairo_image_surface_t *)
+	_cairo_surface_create_similar_solid (&dst->base,
+					     CAIRO_CONTENT_ALPHA,
+					     extents->unbounded.width,
+					     extents->unbounded.height,
+					     CAIRO_COLOR_WHITE);
+    if (unlikely (surface->base.status))
+	return surface;
+
+    if (extents->clip->boxes) {
+	status = combine_in_boxes (surface,
+				   extents->clip->boxes,
+				   extents->clip->num_boxes,
+				   &extents->unbounded);
+	if (unlikely (status))
+	    goto error;
+    }
+
+    if (extents->clip->path) {
+	status = _cairo_clip_combine_with_surface (extents->clip,
+						   &surface->base,
+						   extents->unbounded.x,
+						   extents->unbounded.y);
+	if (unlikely (status))
+	    goto error;
+    }
+
+    *clip_x = extents->unbounded.x;
+    *clip_y = extents->unbounded.y;
+    return surface;
+
+error:
+    cairo_surface_destroy (&surface->base);
+    return (cairo_image_surface_t *)_cairo_surface_create_in_error (status);
+}
+
+static cairo_image_surface_t *
 create_composite_mask (cairo_image_surface_t	*dst,
 		       void			*draw_closure,
 		       draw_func_t		 draw_func,
@@ -317,7 +362,7 @@ clip_and_composite_combine (const cairo_composite_rectangles_t*extents,
 	goto error;
 
     clip = (cairo_image_surface_t *)
-	_cairo_clip_get_surface (extents->clip, &dst->base, &clip_x, &clip_y);
+	get_clip_surface (dst, extents, &clip_x, &clip_y);
     if (unlikely (clip->base.status))
 	goto error;
 
@@ -399,15 +444,14 @@ fixup_unbounded (const cairo_composite_rectangles_t *extents)
     int mask_x, mask_y;
 
     if (! _cairo_clip_is_region (extents->clip)) {
-	cairo_surface_t *clip;
+	cairo_image_surface_t *clip;
 
-	clip = _cairo_clip_get_surface (extents->clip, &dst->base,
-					&mask_x, &mask_y);
-	if (unlikely (clip->status))
-	    return clip->status;
+	clip = get_clip_surface (dst, extents, &mask_x, &mask_y);
+	if (unlikely (clip->base.status))
+	    return clip->base.status;
 
-	mask = pixman_image_ref (((cairo_image_surface_t *)clip)->pixman_image);
-	cairo_surface_destroy (clip);
+	mask = pixman_image_ref (clip->pixman_image);
+	cairo_surface_destroy (&clip->base);
     } else {
 	mask_x = mask_y = 0;
 	mask = _pixman_image_for_color (CAIRO_COLOR_WHITE);
commit c5295981c65dcd548bc391f7194e1e378e288e21
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Fri Sep 16 15:01:11 2011 +0100

    test: Update reference images for test-base
    
    Uli Schlachter spotted that I had create reference images with sharp
    edges for his tighten-bounds test case, exactly as if I had ignored
    unaligned clip boxes...
    
    Turns out I had removed the code to handle them...

diff --git a/test/reference/random-clip.base.argb32.ref.png b/test/reference/random-clip.base.argb32.ref.png
index dd1389e..43a49ce 100644
Binary files a/test/reference/random-clip.base.argb32.ref.png and b/test/reference/random-clip.base.argb32.ref.png differ
diff --git a/test/reference/random-clip.base.rgb24.ref.png b/test/reference/random-clip.base.rgb24.ref.png
index dd1389e..43a49ce 100644
Binary files a/test/reference/random-clip.base.rgb24.ref.png and b/test/reference/random-clip.base.rgb24.ref.png differ
diff --git a/test/reference/tighten-bounds.base.argb32.ref.png b/test/reference/tighten-bounds.base.argb32.ref.png
index ebbd4bc..291a841 100644
Binary files a/test/reference/tighten-bounds.base.argb32.ref.png and b/test/reference/tighten-bounds.base.argb32.ref.png differ
diff --git a/test/reference/tighten-bounds.base.rgb24.ref.png b/test/reference/tighten-bounds.base.rgb24.ref.png
index b99d7db..f31c17c 100644
Binary files a/test/reference/tighten-bounds.base.rgb24.ref.png and b/test/reference/tighten-bounds.base.rgb24.ref.png differ