[cairo-commit] 3 commits - perf/cairo-perf-diff src/cairo-script-surface.c

[Chris Wilson]

 perf/cairo-perf-diff       |   10 ++++------
 src/cairo-script-surface.c |   15 ++++++++++++++-
 2 files changed, 18 insertions(+), 7 deletions(-)

New commits:
commit c004800fae362ae907ef9d1f822d02c598572161
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Wed Apr 7 22:46:38 2010 +0100

    script: Compile without FT_FONT

diff --git a/src/cairo-script-surface.c b/src/cairo-script-surface.c
index 7b08ddc..a9f6be5 100644
--- a/src/cairo-script-surface.c
+++ b/src/cairo-script-surface.c
@@ -49,7 +49,6 @@
 #include "cairo-analysis-surface-private.h"
 #include "cairo-device-private.h"
 #include "cairo-error-private.h"
-#include "cairo-ft-private.h"
 #include "cairo-list-private.h"
 #include "cairo-recording-surface-private.h"
 #include "cairo-output-stream-private.h"
@@ -57,6 +56,10 @@
 #include "cairo-surface-clipper-private.h"
 #include "cairo-surface-wrapper-private.h"
 
+#if CAIRO_HAS_FT_FONT
+#include "cairo-ft-private.h"
+#endif
+
 #include <ctype.h>
 
 #ifdef WORDS_BIGENDIAN
@@ -2588,7 +2591,11 @@ _emit_type42_font (cairo_script_surface_t *surface,
 	return status;
     }
 
+#if CAIRO_HAS_FT_FONT
     load_flags = _cairo_ft_scaled_font_get_load_flags (scaled_font);
+#else
+    load_flags = 0;
+#endif
     _cairo_output_stream_printf (ctx->stream,
 				 "<< "
 				 "/type 42 "
commit bdf8f50adae67498d5fe36727ed2cd34c0206509
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Wed Apr 7 22:44:02 2010 +0100

    script: Another RGB16_565 warning.

diff --git a/src/cairo-script-surface.c b/src/cairo-script-surface.c
index 9b37ca9..7b08ddc 100644
--- a/src/cairo-script-surface.c
+++ b/src/cairo-script-surface.c
@@ -1056,6 +1056,12 @@ _write_image_surface (cairo_output_stream_t *output,
 	    data += stride;
 	}
 	break;
+    case CAIRO_FORMAT_RGB16_565:
+	for (row = image->height; row--; ) {
+	    _cairo_output_stream_write (output, data, 2*width);
+	    data += stride;
+	}
+	break;
     case CAIRO_FORMAT_RGB24:
 	for (row = image->height; row--; ) {
 	    int col;
commit f5f64317874a3faa4f47688848a499b1e8836cf6
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Wed Apr 7 21:57:22 2010 +0100

    perf: Switch between micro and trace benchmarks for cairo-perf-diff

diff --git a/perf/cairo-perf-diff b/perf/cairo-perf-diff
index 436f149..5700cf2 100755
--- a/perf/cairo-perf-diff
+++ b/perf/cairo-perf-diff
@@ -52,14 +52,14 @@ END
     exit 1
 }
 
-benchmarks="cairo-perf-micro"
+benchmark="cairo-perf-micro"
 
 # First, pull off any known options
 while true; do
     case $1 in
         -f|--force) force_cairo_perf="true";;
         -h|--html) html_output="$2"; shift ;;
-        -t|--trace) benchmarks="${benchmarks} cairo-perf-trace";;
+        -t|--trace) benchmark="cairo-perf-trace";;
         *) break;;
     esac
 
@@ -178,7 +178,7 @@ build() {
     (cd boilerplate && make libcairoboilerplate.la)
 
     cd perf
-    make cairo-perf cairo-perf-trace
+    make ${benchmark}
 }
 
 # Usage: run_cairo_perf_if_not_cached <rev> <suffix>
@@ -214,9 +214,7 @@ run_cairo_perf_if_not_cached() {
     }
 
     echo "Running \"cairo-perf $CAIRO_PERF_OPTIONS\" against $rev. Results will be cached in:"
-    for cmd in $benchmarks; do
-	(./$cmd $CAIRO_PERF_OPTIONS || echo "*** Performance test crashed") >> $perf
-    done
+    {./$benchmark $CAIRO_PERF_OPTIONS || echo "*** Performance test crashed"} >> $perf
 
     cd $owd
 }