Use same random numbers for colorization

This makes most of the tests display the same for both cairo and skia.

7 files changed, 38 insertions, 6 deletions

diff --git a/src/cairo-tests/bubbles.cpp b/src/cairo-tests/bubbles.cpp
index 235e2df..9c7fa8e 100644
--- a/src/cairo-tests/bubbles.cpp
+++ b/src/cairo-tests/bubbles.cpp
@@ -25,10 +25,11 @@ ca_test_bubbles(caskbench_context_t *ctx)
     cairo_t *cr = ctx->cairo_cr;
 
     for (i=0; i<ctx->size; i++) {
+        randomize_color (cr);
+
         r = ((double)max_dim*rand())/RAND_MAX + 1;
         x = (0.5*(double)ctx->canvas_width*rand())/RAND_MAX;
         y = (0.5*(double)ctx->canvas_height*rand())/RAND_MAX;
-        randomize_color (cr);
         cairo_arc (cr, x, y, r, 0, 2*M_PI);
         cairo_fill (cr);
     }
diff --git a/src/caskbench.cpp b/src/caskbench.cpp
index 7b4a76c..91afefa 100644
--- a/src/caskbench.cpp
+++ b/src/caskbench.cpp
@@ -282,10 +282,12 @@ context_init(caskbench_context_t *context, int size, const char* surface_type)
     context->skia_canvas->clear(0);
     context->skia_paint->setARGB(255, 0, 0, 0);
     context->skia_canvas->drawPaint(*context->skia_paint);
+    context->skia_paint->setAntiAlias(true);
 
     // Clear Cairo background to black
     cairo_set_source_rgb (context->cairo_cr, 0, 0, 0);
     cairo_paint (context->cairo_cr);
+    cairo_set_antialias (context->cairo_cr, CAIRO_ANTIALIAS_DEFAULT);
 
 }
 
diff --git a/src/skia-tests/bubbles.cpp b/src/skia-tests/bubbles.cpp
index 8784953..e4f7bfa 100644
--- a/src/skia-tests/bubbles.cpp
+++ b/src/skia-tests/bubbles.cpp
@@ -23,12 +23,18 @@ sk_teardown_bubbles(void)
 int
 sk_test_bubbles(caskbench_context_t *ctx)
 {
+    unsigned char red, green, blue, alpha;
     int i, x, y, r;
     for (i=0; i<ctx->size; i++) {
+        red = int( 255 * (double)rand()/RAND_MAX );
+        green = int( 255 * (double)rand()/RAND_MAX );
+        blue = int( 255 * (double)rand()/RAND_MAX );
+        alpha = int( 255 * (double)rand()/RAND_MAX );
+        ctx->skia_paint->setARGB(alpha, red, green, blue);
+
         r = ((double)max_dim*rand())/RAND_MAX + 1;
         x = (0.5*(double)ctx->canvas_width*rand())/RAND_MAX;
         y = (0.5*(double)ctx->canvas_height*rand())/RAND_MAX;
-        ctx->skia_paint->setColor(rand());
         ctx->skia_canvas->drawCircle(x, y, r, *ctx->skia_paint);
     }
 
diff --git a/src/skia-tests/fill.cpp b/src/skia-tests/fill.cpp
index 586f821..e721ef2 100644
--- a/src/skia-tests/fill.cpp
+++ b/src/skia-tests/fill.cpp
@@ -20,9 +20,15 @@ sk_teardown_fill(void)
 int
 sk_test_fill(caskbench_context_t *ctx)
 {
+    unsigned char red, green, blue, alpha;
     int i;
     for (i=0; i<ctx->size; i++) {
-        ctx->skia_paint->setColor(rand());
+        red = int( 255 * (double)rand()/RAND_MAX );
+        green = int( 255 * (double)rand()/RAND_MAX );
+        blue = int( 255 * (double)rand()/RAND_MAX );
+        alpha = int( 255 * (double)rand()/RAND_MAX );
+        ctx->skia_paint->setARGB(alpha, red, green, blue);
+
         ctx->skia_canvas->drawCircle(40*i, 40, 30, *ctx->skia_paint);
     }
 
diff --git a/src/skia-tests/multishape.cpp b/src/skia-tests/multishape.cpp
index 1ff5dab..29c0049 100644
--- a/src/skia-tests/multishape.cpp
+++ b/src/skia-tests/multishape.cpp
@@ -31,6 +31,7 @@ sk_teardown_multishape(void)
 int
 sk_test_multishape(caskbench_context_t *ctx)
 {
+    unsigned char red, green, blue, alpha;
     int i, j, x, y, r;
 
     r = 0.9 * element_spacing / 2;
@@ -40,7 +41,11 @@ sk_test_multishape(caskbench_context_t *ctx)
             x = i * element_spacing;
 
             // TODO: Select a pre-defined paint object at random
-            ctx->skia_paint->setColor(rand());
+            red = int( 255 * (double)rand()/RAND_MAX );
+            green = int( 255 * (double)rand()/RAND_MAX );
+            blue = int( 255 * (double)rand()/RAND_MAX );
+            alpha = int( 255 * (double)rand()/RAND_MAX );
+            ctx->skia_paint->setARGB(alpha, red, green, blue);
 
             // TODO: Randomly select different shapes to be drawn
             ctx->skia_canvas->drawCircle(x, y, r, *ctx->skia_paint);
diff --git a/src/skia-tests/paint.cpp b/src/skia-tests/paint.cpp
index 8b69bc3..4482b76 100644
--- a/src/skia-tests/paint.cpp
+++ b/src/skia-tests/paint.cpp
@@ -21,9 +21,15 @@ sk_teardown_paint(void)
 int
 sk_test_paint(caskbench_context_t *ctx)
 {
+    unsigned char red, green, blue, alpha;
     int i;
     for (i=0; i<ctx->size; i++) {
-        ctx->skia_canvas->drawColor(rand());
+        red = int( 255 * (double)rand()/RAND_MAX );
+        green = int( 255 * (double)rand()/RAND_MAX );
+        blue = int( 255 * (double)rand()/RAND_MAX );
+        alpha = int( 255 * (double)rand()/RAND_MAX );
+
+        ctx->skia_paint->setARGB(alpha, red, green, blue);
     }
 
     return 1;
diff --git a/src/skia-tests/stroke.cpp b/src/skia-tests/stroke.cpp
index 3a9ba67..142dd01 100644
--- a/src/skia-tests/stroke.cpp
+++ b/src/skia-tests/stroke.cpp
@@ -24,11 +24,17 @@ sk_teardown_stroke(void)
 int
 sk_test_stroke(caskbench_context_t *ctx)
 {
+    unsigned char red, green, blue, alpha;
     int i, x, w, prev_w;
     x = 0;
     prev_w = 0;
     for (i=0; i<ctx->size; i++) {
-        ctx->skia_paint->setColor(rand());
+        red = int( 255 * (double)rand()/RAND_MAX );
+        green = int( 255 * (double)rand()/RAND_MAX );
+        blue = int( 255 * (double)rand()/RAND_MAX );
+        alpha = int( 255 * (double)rand()/RAND_MAX );
+        ctx->skia_paint->setARGB(alpha, red, green, blue);
+
         w = ((double)ctx->size*rand())/RAND_MAX + 1;
         x += 4 + (prev_w + w)/2.0;
         ctx->skia_paint->setStrokeWidth(w);