diff options
| author | Loïc Minier <lool@dooz.org> | 2009-04-15 00:04:34 +0200 |
|---|---|---|
| committer | Loïc Minier <lool@dooz.org> | 2009-04-15 00:04:34 +0200 |
| commit | c14a30c049d9e2911dad3d7243f8cf9c69603249 (patch) | |
| tree | d2d1f68e1112c3442faef72c181f2efaca98b2ee /perf | |
| parent | 9389fe1633eba6995dc21d842f11877e9dc73d50 (diff) | |
Imported Upstream version 1.5.6
Diffstat (limited to 'perf')
| -rw-r--r-- | perf/Makefile.am | 8 | ||||
| -rw-r--r-- | perf/Makefile.in | 10 | ||||
| -rw-r--r-- | perf/cairo-perf-cover.c | 4 |
3 files changed, 12 insertions, 10 deletions
diff --git a/perf/Makefile.am b/perf/Makefile.am index 4701abf..78fdeb2 100644 --- a/perf/Makefile.am +++ b/perf/Makefile.am @@ -77,14 +77,14 @@ CAIRO_PERF_ENVIRONMENT = CAIRO_PERF_ITERATIONS="$(ITERS)" CAIRO_TEST_TARGET="$(T # Cap the maximum number of iterations during 'make check' TESTS_ENVIRONMENT = CAIRO_TEST_TARGET="$(TARGETS)" CAIRO_PERF_ITERATIONS="10" -TESTS = cairo-perf +TESTS = cairo-perf$(EXEEXT) -perf: cairo-perf - $(CAIRO_PERF_ENVIRONMENT) ./cairo-perf +perf: cairo-perf$(EXEEXT) + $(CAIRO_PERF_ENVIRONMENT) ./cairo-perf$(EXEEXT) html: index.html -index.html: cairo-perf +index.html: cairo-perf$(EXEEXT) $(CAIRO_PERF_ENVIRONMENT) ./cairo-perf-diff -h HEAD > $@ diff --git a/perf/Makefile.in b/perf/Makefile.in index 016de61..7cc977c 100644 --- a/perf/Makefile.in +++ b/perf/Makefile.in @@ -125,6 +125,8 @@ CAIRO_CAN_TEST_PS_SURFACE_FALSE = @CAIRO_CAN_TEST_PS_SURFACE_FALSE@ CAIRO_CAN_TEST_PS_SURFACE_TRUE = @CAIRO_CAN_TEST_PS_SURFACE_TRUE@ CAIRO_CAN_TEST_SVG_SURFACE_FALSE = @CAIRO_CAN_TEST_SVG_SURFACE_FALSE@ CAIRO_CAN_TEST_SVG_SURFACE_TRUE = @CAIRO_CAN_TEST_SVG_SURFACE_TRUE@ +CAIRO_CAN_TEST_WIN32_PRINTING_SURFACE_FALSE = @CAIRO_CAN_TEST_WIN32_PRINTING_SURFACE_FALSE@ +CAIRO_CAN_TEST_WIN32_PRINTING_SURFACE_TRUE = @CAIRO_CAN_TEST_WIN32_PRINTING_SURFACE_TRUE@ CAIRO_CFLAGS = @CAIRO_CFLAGS@ CAIRO_HAS_ATSUI_FONT_FALSE = @CAIRO_HAS_ATSUI_FONT_FALSE@ CAIRO_HAS_ATSUI_FONT_TRUE = @CAIRO_HAS_ATSUI_FONT_TRUE@ @@ -366,7 +368,7 @@ CAIRO_PERF_ENVIRONMENT = CAIRO_PERF_ITERATIONS="$(ITERS)" CAIRO_TEST_TARGET="$(T # Cap the maximum number of iterations during 'make check' TESTS_ENVIRONMENT = CAIRO_TEST_TARGET="$(TARGETS)" CAIRO_PERF_ITERATIONS="10" -TESTS = cairo-perf +TESTS = cairo-perf$(EXEEXT) EXTRA_VALGRIND_FLAGS = $(CAIRO_EXTRA_VALGRIND_FLAGS) VALGRIND_MEMCHECK_FLAGS = \ --tool=memcheck \ @@ -727,12 +729,12 @@ $(top_builddir)/boilerplate/libcairoboilerplate.la: $(top_builddir)/src/libcairo $(top_builddir)/src/libcairo.la: cd $(top_builddir)/src && $(MAKE) $(AM_MAKEFLAGS) libcairo.la -perf: cairo-perf - $(CAIRO_PERF_ENVIRONMENT) ./cairo-perf +perf: cairo-perf$(EXEEXT) + $(CAIRO_PERF_ENVIRONMENT) ./cairo-perf$(EXEEXT) html: index.html -index.html: cairo-perf +index.html: cairo-perf$(EXEEXT) $(CAIRO_PERF_ENVIRONMENT) ./cairo-perf-diff -h HEAD > $@ check-valgrind perf-valgrind: diff --git a/perf/cairo-perf-cover.c b/perf/cairo-perf-cover.c index 53dc7b7..bd12f07 100644 --- a/perf/cairo-perf-cover.c +++ b/perf/cairo-perf-cover.c @@ -103,7 +103,7 @@ set_source_similar_surface_rgb (cairo_t *cr, { cairo_surface_t *source; - source = cairo_surface_create_similar (cairo_get_target (cr), + source = cairo_surface_create_similar (cairo_get_group_target (cr), CAIRO_CONTENT_COLOR, width, height); init_and_set_source_surface (cr, source, width, height); @@ -118,7 +118,7 @@ set_source_similar_surface_rgba (cairo_t *cr, { cairo_surface_t *source; - source = cairo_surface_create_similar (cairo_get_target (cr), + source = cairo_surface_create_similar (cairo_get_group_target (cr), CAIRO_CONTENT_COLOR_ALPHA, width, height); init_and_set_source_surface (cr, source, width, height); |