diff options
| -rw-r--r-- | perf/cairo-perf-micro.c | 1 | ||||
| -rw-r--r-- | perf/cairo-perf.h | 1 | ||||
| -rw-r--r-- | perf/micro/Makefile.sources | 1 | ||||
| -rw-r--r-- | perf/micro/disjoint.c | 95 | ||||
| -rw-r--r-- | test/Makefile.sources | 1 | ||||
| -rw-r--r-- | test/clip-disjoint-hatching.c | 104 |
6 files changed, 203 insertions, 0 deletions
diff --git a/perf/cairo-perf-micro.c b/perf/cairo-perf-micro.c index 30b0102e..19374403 100644 --- a/perf/cairo-perf-micro.c +++ b/perf/cairo-perf-micro.c @@ -535,6 +535,7 @@ const cairo_perf_case_t perf_cases[] = { { text, 64, 512}, { glyphs, 64, 512}, { mask, 64, 512}, + { disjoint, 64, 512}, { hatching, 64, 512}, { tessellate, 100, 100}, { subimage_copy, 16, 512}, diff --git a/perf/cairo-perf.h b/perf/cairo-perf.h index cc9bbb60..59a0d226 100644 --- a/perf/cairo-perf.h +++ b/perf/cairo-perf.h @@ -188,6 +188,7 @@ CAIRO_PERF_DECL (paint_with_alpha); CAIRO_PERF_DECL (mask); CAIRO_PERF_DECL (stroke); CAIRO_PERF_DECL (subimage_copy); +CAIRO_PERF_DECL (disjoint); CAIRO_PERF_DECL (hatching); CAIRO_PERF_DECL (tessellate); CAIRO_PERF_DECL (text); diff --git a/perf/micro/Makefile.sources b/perf/micro/Makefile.sources index 84e02f64..aae9e213 100644 --- a/perf/micro/Makefile.sources +++ b/perf/micro/Makefile.sources @@ -2,6 +2,7 @@ libcairo_perf_micro_sources = \ cairo-perf-cover.c \ box-outline.c \ composite-checker.c \ + disjoint.c \ fill.c \ hatching.c \ long-lines.c \ diff --git a/perf/micro/disjoint.c b/perf/micro/disjoint.c new file mode 100644 index 00000000..98b9e8e6 --- /dev/null +++ b/perf/micro/disjoint.c @@ -0,0 +1,95 @@ +/* -*- Mode: c; tab-width: 8; c-basic-offset: 4; indent-tabs-mode: t; -*- */ +/* cairo - a vector graphics library with display and print output + * + * Copyright (c) 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. + */ +#include <assert.h> +#include "cairo-perf.h" + +#define STEP 5 + +static void path (cairo_t *cr, int width, int height) +{ + int i; + + cairo_rectangle (cr, 0, 0, width, height); + cairo_clip (cr); + + cairo_translate (cr, width/2, height/2); + cairo_rotate (cr, M_PI/4); + cairo_translate (cr, -width/2, -height/2); + + for (i = 0; i < width; i += STEP) { + cairo_rectangle (cr, i, -2, 1, height+4); + cairo_rectangle (cr, -2, i, width+4, 1); + } +} + +static void clip (cairo_t *cr, int width, int height) +{ + int i, j; + + for (j = 0; j < height; j += 2*STEP) { + for (i = 0; i < width; i += 2*STEP) + cairo_rectangle (cr, i, j, STEP, STEP); + + j += 2*STEP; + for (i = 0; i < width; i += 2*STEP) + cairo_rectangle (cr, i+STEP/2, j, STEP, STEP); + } + + cairo_clip (cr); +} + +static cairo_perf_ticks_t +draw (cairo_t *cr, int width, int height, int loops) +{ + cairo_save (cr); + cairo_set_source_rgb (cr, 1, 1, 1); + cairo_paint (cr); + cairo_set_source_rgb (cr, 1, 0, 0); + + cairo_perf_timer_start (); + while (loops--) { + cairo_save (cr); + clip (cr, width, height); + path (cr, width, height); + cairo_fill (cr); + cairo_restore (cr); + } + cairo_perf_timer_stop (); + + cairo_restore (cr); + + return cairo_perf_timer_elapsed (); +} + +void +disjoint (cairo_perf_t *perf, cairo_t *cr, int width, int height) +{ + if (! cairo_perf_can_run (perf, "disjoint", NULL)) + return; + + cairo_perf_run (perf, "disjoint", draw, NULL); +} diff --git a/test/Makefile.sources b/test/Makefile.sources index bb907bfd..e9c69aeb 100644 --- a/test/Makefile.sources +++ b/test/Makefile.sources @@ -30,6 +30,7 @@ test_sources = \ clip-contexts.c \ clip-complex-shape.c \ clip-disjoint.c \ + clip-disjoint-hatching.c \ clip-device-offset.c \ clip-draw-unbounded.c \ clip-empty.c \ diff --git a/test/clip-disjoint-hatching.c b/test/clip-disjoint-hatching.c new file mode 100644 index 00000000..8626e80d --- /dev/null +++ b/test/clip-disjoint-hatching.c @@ -0,0 +1,104 @@ +/* + * 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@chris-wilson.co.uk> + */ + +#include "cairo-test.h" + +#define STEP 5 +#define WIDTH 100 +#define HEIGHT 100 + +static void hatching (cairo_t *cr) +{ + int i; + + cairo_rectangle (cr, 0, 0, WIDTH, HEIGHT); + cairo_clip (cr); + + cairo_translate (cr, WIDTH/2, HEIGHT/2); + cairo_rotate (cr, M_PI/4); + cairo_translate (cr, -WIDTH/2, -HEIGHT/2); + + for (i = 0; i < WIDTH; i += STEP) { + cairo_rectangle (cr, i, -2, 1, HEIGHT+4); + cairo_rectangle (cr, -2, i, WIDTH+4, 1); + } +} + +static void background (cairo_t *cr) +{ + cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE); + cairo_set_source_rgb (cr, 1,1,1); + cairo_paint (cr); +} + +static void clip_to_grid (cairo_t *cr) +{ + int i, j; + + for (j = 0; j < HEIGHT; j += 2*STEP) { + for (i = 0; i < WIDTH; i += 2*STEP) + cairo_rectangle (cr, i, j, STEP, STEP); + + j += 2*STEP; + for (i = 0; i < WIDTH; i += 2*STEP) + cairo_rectangle (cr, i+STEP/2, j, STEP, STEP); + } + + cairo_clip (cr); +} + +static cairo_test_status_t +draw (cairo_t *cr, int width, int height) +{ + background (cr); + + cairo_set_operator (cr, CAIRO_OPERATOR_OVER); + + cairo_save (cr); { + clip_to_grid (cr); + hatching (cr); + cairo_set_source_rgb (cr, 1, 0, 0); + cairo_fill (cr); + } cairo_restore (cr); + + cairo_translate (cr, 0.25, HEIGHT+.25); + + cairo_save (cr); { + clip_to_grid (cr); + hatching (cr); + cairo_set_source_rgb (cr, 0, 0, 1); + cairo_fill (cr); + } cairo_restore (cr); + + return CAIRO_TEST_SUCCESS; +} + +CAIRO_TEST (clip_disjoint_hatching, + "Test drawing through through an array of clips", + "clip", /* keywords */ + "target=raster", /* requirements */ + WIDTH, 2*HEIGHT, + NULL, draw) |