[cairo-commit] perf/cairo-perf.h perf/cairo-perf-micro.c perf/Makefile.am perf/micro

[Chris Wilson]

 perf/Makefile.am        |    1 
 perf/cairo-perf-micro.c |    1 
 perf/cairo-perf.h       |    1 
 perf/micro/wave.c       |  112 ++++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 115 insertions(+)

New commits:
commit 52f79bfcf34c504c7baa7d996983a7283f02f51e
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Wed Jun 1 19:16:02 2011 +0100

    perf/micro: Add wave
    
    Benjamin just demonstrated this funky trick for generating pixel
    outlines, and as no good deed should go unpunished, I've added his code
    to the perf suite.
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/perf/Makefile.am b/perf/Makefile.am
index 6a1b72c..f4e4cf4 100644
--- a/perf/Makefile.am
+++ b/perf/Makefile.am
@@ -48,6 +48,7 @@ cairo_perf_micro_SOURCES =		\
 	micro/glyphs.c		\
 	micro/twin.c			\
 	micro/unaligned-clip.c	\
+	micro/wave.c			\
 	micro/world-map.c		\
 	micro/world-map.h		\
 	micro/zrusin.c		\
diff --git a/perf/cairo-perf-micro.c b/perf/cairo-perf-micro.c
index 750bac3..77c86d5 100644
--- a/perf/cairo-perf-micro.c
+++ b/perf/cairo-perf-micro.c
@@ -553,5 +553,6 @@ const cairo_perf_case_t perf_cases[] = {
     { pythagoras_tree, 768, 768 },
     { intersections, 512, 512 },
     { spiral, 512, 512 },
+    { wave, 500, 500 },
     { NULL }
 };
diff --git a/perf/cairo-perf.h b/perf/cairo-perf.h
index 0b90dda..3a3965e 100644
--- a/perf/cairo-perf.h
+++ b/perf/cairo-perf.h
@@ -207,5 +207,6 @@ CAIRO_PERF_DECL (dragon);
 CAIRO_PERF_DECL (pythagoras_tree);
 CAIRO_PERF_DECL (intersections);
 CAIRO_PERF_DECL (spiral);
+CAIRO_PERF_DECL (wave);
 
 #endif
diff --git a/perf/micro/wave.c b/perf/micro/wave.c
new file mode 100644
index 0000000..6613fc9
--- /dev/null
+++ b/perf/micro/wave.c
@@ -0,0 +1,112 @@
+/*
+ * Copyright 2011 Red Hat Inc.
+ *
+ * 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: Benjamin Otte <otte at redhat.com>
+ */
+
+#include "cairo-perf.h"
+
+static cairo_surface_t *
+generate_random_waveform(cairo_t *target, int width, int height)
+{
+    cairo_surface_t *surface;
+    cairo_t *cr;
+    int i, r;
+
+    srand (0xdeadbeef);
+
+    surface = cairo_surface_create_similar (cairo_get_target (target),
+					    CAIRO_CONTENT_ALPHA,
+					    width, height);
+    cr = cairo_create (surface);
+
+    r = height / 2;
+
+    for (i = 0; i < width; i++)
+    {
+	r += rand () % (height / 4) - (height / 8);
+	if (r < 0)
+	    r = 0;
+	else if (r > height)
+	    r = height;
+	cairo_rectangle (cr, i, (height - r) / 2, 1, r);
+    }
+    cairo_fill (cr);
+    cairo_destroy (cr);
+
+    return surface;
+}
+
+static cairo_perf_ticks_t
+do_wave (cairo_t *cr, int width, int height, int loops)
+{
+    cairo_surface_t *wave;
+    cairo_pattern_t *mask;
+
+    wave = generate_random_waveform (cr, width, height);
+
+    cairo_perf_timer_start ();
+
+    while (loops--) {
+	/* paint outline (and contents) */
+	cairo_set_source_rgb (cr, 1, 0, 0);
+	cairo_mask_surface (cr, wave, 0, 0);
+
+	/* overdraw inline */
+	/* first, create a mask */
+	cairo_push_group_with_content (cr, CAIRO_CONTENT_ALPHA);
+	cairo_set_source_surface (cr, wave, 0, 0);
+	cairo_paint (cr);
+	cairo_set_operator (cr, CAIRO_OPERATOR_IN);
+	cairo_set_source_surface (cr, wave, 1, 0);
+	cairo_paint (cr);
+	cairo_set_source_surface (cr, wave, -1, 0);
+	cairo_paint (cr);
+	cairo_set_source_surface (cr, wave, 0, 1);
+	cairo_paint (cr);
+	cairo_set_source_surface (cr, wave, 0, -1);
+	cairo_paint (cr);
+	mask = cairo_pop_group (cr);
+
+	/* second, paint the mask */
+	cairo_set_source_rgb (cr, 0, 1, 0);
+	cairo_mask (cr, mask);
+
+	cairo_pattern_destroy (mask);
+    }
+
+    cairo_perf_timer_stop ();
+
+    cairo_surface_destroy (wave);
+
+    return cairo_perf_timer_elapsed ();
+}
+
+void
+wave (cairo_perf_t *perf, cairo_t *cr, int width, int height)
+{
+    if (! cairo_perf_can_run (perf, "wave", NULL))
+	return;
+
+    cairo_perf_run (perf, "wave", do_wave, NULL);
+}