[cairo-commit] 2 commits - src/cairo-bentley-ottmann.c test/half-coverage.c test/Makefile.sources
Chris Wilson
ickle at kemper.freedesktop.org
Wed Jun 9 02:34:32 PDT 2010
src/cairo-bentley-ottmann.c | 10 ++-
test/Makefile.sources | 1
test/half-coverage.c | 129 ++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 137 insertions(+), 3 deletions(-)
New commits:
commit 85af0ec37456b4eb47c39326b24370a9ccc43092
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Wed Jun 9 10:33:29 2010 +0100
test: Add half-coverage to exercise the rasteriser with subpixel geometry.
diff --git a/test/Makefile.sources b/test/Makefile.sources
index 7e4745c..9bc00af 100644
--- a/test/Makefile.sources
+++ b/test/Makefile.sources
@@ -116,6 +116,7 @@ test_sources = \
group-clip.c \
group-paint.c \
group-unaligned.c \
+ half-coverage.c \
huge-linear.c \
huge-radial.c \
image-surface-source.c \
diff --git a/test/half-coverage.c b/test/half-coverage.c
new file mode 100644
index 0000000..e7880ec
--- /dev/null
+++ b/test/half-coverage.c
@@ -0,0 +1,129 @@
+/*
+ * Copyright 2010 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"
+
+/* Test the fidelity of the rasterisation, because Cairo is my favourite
+ * driver test suite.
+ */
+
+#define SIZE 256
+#define WIDTH 2
+#define HEIGHT 10
+
+static cairo_test_status_t
+rectangles (cairo_t *cr, int width, int height)
+{
+ int i;
+
+ cairo_set_source_rgb (cr, 1.0, 0.0, 0.0);
+ cairo_paint (cr);
+
+ for (i = 1; i <= SIZE; i++) {
+ int x, y;
+
+ cairo_save (cr);
+ cairo_rectangle (cr, 0, 0, WIDTH, HEIGHT);
+ cairo_clip (cr);
+
+ cairo_scale (cr, 1./SIZE, 1./SIZE);
+ for (x = -i; x < SIZE*WIDTH; x += 2*i) {
+ for (y = -i; y < SIZE*HEIGHT; y += 2*i) {
+ cairo_rectangle (cr, x, y, i, i);
+ cairo_rectangle (cr, x+i, y+i, i, i);
+ }
+ }
+ cairo_fill (cr);
+ cairo_restore (cr);
+
+ cairo_translate (cr, WIDTH, 0);
+ }
+
+ return CAIRO_TEST_SUCCESS;
+}
+
+static cairo_test_status_t
+triangles (cairo_t *cr, int width, int height)
+{
+ int i;
+
+ cairo_set_source_rgb (cr, 1.0, 0.0, 0.0);
+ cairo_paint (cr);
+
+ for (i = 1; i <= SIZE; i++) {
+ int x, y;
+
+ cairo_save (cr);
+ cairo_rectangle (cr, 0, 0, WIDTH, HEIGHT);
+ cairo_clip (cr);
+
+ cairo_scale (cr, 1./SIZE, 1./SIZE);
+ for (x = -i; x < SIZE*WIDTH; x += 2*i) {
+ for (y = -i; y < SIZE*HEIGHT; y += 2*i) {
+ /* add internal edges just for fun */
+ cairo_move_to (cr, x, y);
+ cairo_line_to (cr, x+i, y+i);
+ cairo_line_to (cr, x+i, y);
+ cairo_close_path (cr);
+
+ cairo_move_to (cr, x+i, y);
+ cairo_line_to (cr, x+2*i, y);
+ cairo_line_to (cr, x+i, y+i);
+ cairo_close_path (cr);
+
+ cairo_move_to (cr, x+i, y+i);
+ cairo_line_to (cr, x, y+2*i);
+ cairo_line_to (cr, x+i, y+2*i);
+ cairo_close_path (cr);
+
+ cairo_move_to (cr, x+i, y+i);
+ cairo_line_to (cr, x+i, y+2*i);
+ cairo_line_to (cr, x+2*i, y+2*i);
+ cairo_close_path (cr);
+ }
+ }
+ cairo_fill (cr);
+ cairo_restore (cr);
+
+ cairo_translate (cr, WIDTH, 0);
+ }
+
+ return CAIRO_TEST_SUCCESS;
+}
+
+CAIRO_TEST (half_coverage_rectangles,
+ "Check the fidelity of the rasterisation.",
+ NULL, /* keywords */
+ "raster", /* requirements */
+ WIDTH * SIZE, HEIGHT,
+ NULL, rectangles)
+
+CAIRO_TEST (half_coverage_triangles,
+ "Check the fidelity of the rasterisation.",
+ NULL, /* keywords */
+ "raster", /* requirements */
+ WIDTH * SIZE, HEIGHT,
+ NULL, triangles)
commit 56c081bdc6d29df932e6993109586ff275d8de12
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Wed Jun 9 10:33:01 2010 +0100
bo: Fix debugging for changes in internal traps api.
diff --git a/src/cairo-bentley-ottmann.c b/src/cairo-bentley-ottmann.c
index 5550e01..2ead960 100644
--- a/src/cairo-bentley-ottmann.c
+++ b/src/cairo-bentley-ottmann.c
@@ -44,7 +44,7 @@
#define DEBUG_PRINT_STATE 0
#define DEBUG_EVENTS 0
-#define DEBUG_TRAPS 0
+#define DEBUG_TRAPS 1
typedef cairo_point_t cairo_bo_point32_t;
@@ -130,21 +130,25 @@ static void
dump_traps (cairo_traps_t *traps, const char *filename)
{
FILE *file;
+ cairo_box_t extents;
int n;
if (getenv ("CAIRO_DEBUG_TRAPS") == NULL)
return;
+#if 0
if (traps->has_limits) {
printf ("%s: limits=(%d, %d, %d, %d)\n",
filename,
traps->limits.p1.x, traps->limits.p1.y,
traps->limits.p2.x, traps->limits.p2.y);
}
+#endif
+ _cairo_traps_extents (traps, &extents);
printf ("%s: extents=(%d, %d, %d, %d)\n",
filename,
- traps->extents.p1.x, traps->extents.p1.y,
- traps->extents.p2.x, traps->extents.p2.y);
+ extents.p1.x, extents.p1.y,
+ extents.p2.x, extents.p2.y);
file = fopen (filename, "a");
if (file != NULL) {
More information about the cairo-commit
mailing list