[cairo-commit] test/copy-disjoint.c test/fill-disjoint.c test/Makefile.sources test/reference
Chris Wilson
ickle at kemper.freedesktop.org
Tue Dec 6 11:06:51 PST 2011
test/Makefile.sources | 2
test/copy-disjoint.c | 87 +++++++++++++++++++++++++++++++++++
test/fill-disjoint.c | 63 +++++++++++++++++++++++++
test/reference/copy-disjoint.ref.png |binary
test/reference/fill-disjoint.ref.png |binary
5 files changed, 152 insertions(+)
New commits:
commit c7565eeda0bde4f388745c3c235053054059c1fa
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Tue Dec 6 19:00:26 2011 +0000
test: Exercise copy/filling unsorted rectangles
Exercise the bug Keith found in the xlib backend, which claimed the
output from the rectangular tessellator would always be sorted.
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
diff --git a/test/Makefile.sources b/test/Makefile.sources
index 2d35666..76cdb4c 100644
--- a/test/Makefile.sources
+++ b/test/Makefile.sources
@@ -75,6 +75,7 @@ test_sources = \
composite-integer-translate-source.c \
composite-integer-translate-over.c \
composite-integer-translate-over-repeat.c \
+ copy-disjoint.c \
copy-path.c \
coverage.c \
create-for-stream.c \
@@ -120,6 +121,7 @@ test_sources = \
fill-and-stroke-alpha.c \
fill-and-stroke-alpha-add.c \
fill-degenerate-sort-order.c \
+ fill-disjoint.c \
fill-empty.c \
fill-image.c \
fill-missed-stop.c \
diff --git a/test/copy-disjoint.c b/test/copy-disjoint.c
new file mode 100644
index 0000000..1ddfd5a
--- /dev/null
+++ b/test/copy-disjoint.c
@@ -0,0 +1,87 @@
+/*
+ * Copyright © 2011 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use, copy,
+ * modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * Author: Chris Wilson <chris at chris-wilson.co.uk>
+ */
+
+#include "cairo-test.h"
+
+/* The goal is exercise a bug that existed in the xlib backend, where
+ * it assumed the rectangles generated by rectangular tessallator had
+ * any sorting guarantees.
+ */
+
+#define WIDTH 300
+#define HEIGHT 300
+
+static cairo_surface_t *
+create_source (cairo_surface_t *target)
+{
+ cairo_surface_t *surface;
+ cairo_t *cr;
+
+ surface = cairo_surface_create_similar (target,
+ CAIRO_CONTENT_COLOR,
+ WIDTH, HEIGHT);
+ cr = cairo_create (surface);
+ cairo_surface_destroy (surface);
+
+ cairo_set_source_rgb (cr, 1, 1, 1);
+ cairo_paint (cr);
+
+ surface = cairo_surface_reference (cairo_get_target (cr));
+ cairo_destroy (cr);
+
+ return surface;
+}
+
+static cairo_test_status_t
+draw (cairo_t *cr, int width, int height)
+{
+ cairo_surface_t *white;
+ int x;
+
+ /* black background */
+ cairo_set_source_rgb (cr, 0, 0, 0);
+ cairo_paint (cr);
+
+ /* white rectangles */
+ white = create_source (cairo_get_target (cr));
+ cairo_set_source_surface (cr, white, 0, 0);
+ cairo_surface_destroy (white);
+
+ /* blit a set of rectangles that the rectangular tessellator
+ * will not emit sorted. */
+ for (x = 0; x < WIDTH - 10; x += 15)
+ cairo_rectangle (cr, x, x, 10, HEIGHT - 2*x);
+ cairo_fill (cr);
+
+ return CAIRO_TEST_SUCCESS;
+}
+
+CAIRO_TEST (copy_disjoint,
+ "Tests copying unsorted rectangles.",
+ "fill", /* keywords */
+ NULL, /* requirements */
+ WIDTH, HEIGHT,
+ NULL, draw)
diff --git a/test/fill-disjoint.c b/test/fill-disjoint.c
new file mode 100644
index 0000000..ea2c14f
--- /dev/null
+++ b/test/fill-disjoint.c
@@ -0,0 +1,63 @@
+/*
+ * Copyright © 2011 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use, copy,
+ * modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * Author: Chris Wilson <chris at chris-wilson.co.uk>
+ */
+
+#include "cairo-test.h"
+
+/* The goal is exercise a bug that existed in the xlib backend, where
+ * it assumed the rectangles generated by rectangular tessallator had
+ * any sorting guarantees.
+ */
+
+#define WIDTH 300
+#define HEIGHT 300
+
+static cairo_test_status_t
+draw (cairo_t *cr, int width, int height)
+{
+ int x;
+
+ /* black background */
+ cairo_set_source_rgb (cr, 0, 0, 0);
+ cairo_paint (cr);
+
+ /* white rectangles */
+ cairo_set_source_rgb (cr, 1, 1, 1);
+
+ /* fill with a set of rectangles that the rectangular tessellator
+ * will not emit sorted. */
+ for (x = 0; x < WIDTH - 10; x += 15)
+ cairo_rectangle (cr, x, x, 10, HEIGHT - 2*x);
+ cairo_fill (cr);
+
+ return CAIRO_TEST_SUCCESS;
+}
+
+CAIRO_TEST (fill_disjoint,
+ "Tests filling unsorted rectangles.",
+ "fill", /* keywords */
+ NULL, /* requirements */
+ WIDTH, HEIGHT,
+ NULL, draw)
diff --git a/test/reference/copy-disjoint.ref.png b/test/reference/copy-disjoint.ref.png
new file mode 100644
index 0000000..da9a3b1
Binary files /dev/null and b/test/reference/copy-disjoint.ref.png differ
diff --git a/test/reference/fill-disjoint.ref.png b/test/reference/fill-disjoint.ref.png
new file mode 100644
index 0000000..da9a3b1
Binary files /dev/null and b/test/reference/fill-disjoint.ref.png differ
More information about the cairo-commit
mailing list