diff options
| -rw-r--r-- | perf/Makefile.am | 2 | ||||
| -rw-r--r-- | perf/cairo-perf.c | 8 | ||||
| -rw-r--r-- | perf/cairo-perf.h | 5 | ||||
| -rw-r--r-- | perf/fill.c | 49 | ||||
| -rw-r--r-- | perf/stroke.c | 51 |
5 files changed, 109 insertions, 6 deletions
diff --git a/perf/Makefile.am b/perf/Makefile.am index ccc95ddd3..a0f0f42c4 100644 --- a/perf/Makefile.am +++ b/perf/Makefile.am @@ -18,7 +18,9 @@ cairo_perf_SOURCES = \ cairo-perf.c \ cairo-perf.h \ cairo-perf-cover.c \ + fill.c \ paint.c \ + stroke.c \ tessellate.c if CAIRO_HAS_WIN32_SURFACE diff --git a/perf/cairo-perf.c b/perf/cairo-perf.c index ff72bfd95..8e630afca 100644 --- a/perf/cairo-perf.c +++ b/perf/cairo-perf.c @@ -155,13 +155,13 @@ cairo_perf_run (cairo_perf_t *perf, _compute_stats (times, .85 * perf->iterations, &stats); if (first_run) { - printf ("[ # ] %8s-%-4s %35s %9s %5s %s\n", + printf ("[ # ] %8s-%-4s %36s %9s %5s %s\n", "backend", "content", "test-size", "mean ms", "std dev.", "iterations"); first_run = FALSE; } - printf ("[%3d] %8s-%-4s %33s-%-3d ", + printf ("[%3d] %8s-%-4s %34s-%-3d ", perf->test_number, perf->target->name, _content_to_string (perf->target->content), name, perf->size); @@ -225,7 +225,9 @@ main (int argc, char *argv[]) } cairo_perf_case_t perf_cases[] = { - { paint, 64, 512}, + { paint, 64, 512}, + { fill, 64, 256}, + { stroke, 64, 256}, { tessellate, 100, 100}, { NULL } }; diff --git a/perf/cairo-perf.h b/perf/cairo-perf.h index 100072007..ec61254be 100644 --- a/perf/cairo-perf.h +++ b/perf/cairo-perf.h @@ -82,10 +82,9 @@ cairo_perf_cover_sources_and_operators (cairo_perf_t *perf, #define CAIRO_PERF_DECL(func) void (func) (cairo_perf_t *perf, cairo_t *cr, int width, int height); -/* paint.c */ +CAIRO_PERF_DECL (fill); CAIRO_PERF_DECL (paint); - -/* tessellate.c */ +CAIRO_PERF_DECL (stroke); CAIRO_PERF_DECL (tessellate); #endif diff --git a/perf/fill.c b/perf/fill.c new file mode 100644 index 000000000..2a4135580 --- /dev/null +++ b/perf/fill.c @@ -0,0 +1,49 @@ +/* + * Copyright © 2006 Red Hat, Inc. + * + * Permission to use, copy, modify, distribute, and sell this software + * and its documentation for any purpose is hereby granted without + * fee, provided that the above copyright notice appear in all copies + * and that both that copyright notice and this permission notice + * appear in supporting documentation, and that the name of + * Red Hat, Inc. not be used in advertising or publicity pertaining to + * distribution of the software without specific, written prior + * permission. Red Hat, Inc. makes no representations about the + * suitability of this software for any purpose. It is provided "as + * is" without express or implied warranty. + * + * RED HAT, INC. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS + * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS, IN NO EVENT SHALL RED HAT, INC. BE LIABLE FOR ANY SPECIAL, + * INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER + * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION + * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR + * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + * + * Author: Carl D. Worth <cworth@cworth.org> + */ + +#include "cairo-perf.h" + +static cairo_perf_ticks_t +do_fill (cairo_t *cr, int width, int height) +{ + cairo_arc (cr, + width/2.0, height/2.0, + width/3.0, + 0, 2 * M_PI); + + cairo_perf_timer_start (); + + cairo_fill (cr); + + cairo_perf_timer_stop (); + + return cairo_perf_timer_elapsed (); +} + +void +fill (cairo_perf_t *perf, cairo_t *cr, int width, int height) +{ + cairo_perf_cover_sources_and_operators (perf, "fill", do_fill); +} diff --git a/perf/stroke.c b/perf/stroke.c new file mode 100644 index 000000000..0b4ea8e66 --- /dev/null +++ b/perf/stroke.c @@ -0,0 +1,51 @@ +/* + * Copyright © 2006 Red Hat, Inc. + * + * Permission to use, copy, modify, distribute, and sell this software + * and its documentation for any purpose is hereby granted without + * fee, provided that the above copyright notice appear in all copies + * and that both that copyright notice and this permission notice + * appear in supporting documentation, and that the name of + * Red Hat, Inc. not be used in advertising or publicity pertaining to + * distribution of the software without specific, written prior + * permission. Red Hat, Inc. makes no representations about the + * suitability of this software for any purpose. It is provided "as + * is" without express or implied warranty. + * + * RED HAT, INC. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS + * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS, IN NO EVENT SHALL RED HAT, INC. BE LIABLE FOR ANY SPECIAL, + * INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER + * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION + * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR + * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + * + * Author: Carl D. Worth <cworth@cworth.org> + */ + +#include "cairo-perf.h" + +static cairo_perf_ticks_t +do_stroke (cairo_t *cr, int width, int height) +{ + cairo_arc (cr, + width/2.0, height/2.0, + width/3.0, + 0, 2 * M_PI); + cairo_close_path (cr); + + cairo_perf_timer_start (); + + cairo_set_line_width (cr, width/5.0); + cairo_stroke (cr); + + cairo_perf_timer_stop (); + + return cairo_perf_timer_elapsed (); +} + +void +stroke (cairo_perf_t *perf, cairo_t *cr, int width, int height) +{ + cairo_perf_cover_sources_and_operators (perf, "stroke", do_stroke); +} |