commit 831f6c676fca68ccfc73f1db265f9a73d66bf8d0
author reed@android.com <reed@android.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Feb 22 22:03:06 2010 +0000
committer reed@android.com <reed@android.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Feb 22 22:03:06 2010 +0000
tree ddc5ac018d252e4ceeab8614b8c984e90e0776a5
parent 0c9da393d9974877f53e8785082f40e1d1c4c833

update with better fps reporting



git-svn-id: http://skia.googlecode.com/svn/trunk@506 2bbb7eff-a529-9590-31e7-b0007b416f81

bench/FPSBench.cpp

diff --git a/bench/FPSBench.cpp b/bench/FPSBench.cpp
index f103dc1..28668fe 100644
--- a/bench/FPSBench.cpp
+++ b/bench/FPSBench.cpp
@@ -49,12 +49,23 @@
 
 class Bitmap_FPSBench : public FPSBench {
 public:
-    Bitmap_FPSBench(void* p, SkBitmap::Config config, bool doScale) : INHERITED(p) {
+    Bitmap_FPSBench(void* p, SkBitmap::Config config, bool doOpaque, bool doScale) : INHERITED(p) {
         fBitmap.setConfig(config, this->width(), this->height());
         fBitmap.allocPixels();
         fBitmap.eraseColor(0xFFFF0000);
+        if (doOpaque) {
+            fBitmap.setIsOpaque(true);
+        }
 
-        fName.printf("fps_bitmap_%d_%s", fBitmap.bytesPerPixel(),
+        const char* configStr = "565";
+        if (config == SkBitmap::kARGB_8888_Config) {
+            if (doOpaque) {
+                configStr = "X888";
+            } else {
+                configStr = "8888";
+            }
+        }
+        fName.printf("fps_bitmap_%s_%s", configStr,
                      doScale ? "scale" : "noscale");
 
         fMatrix.reset();
@@ -79,10 +90,12 @@
 
 static SkBenchmark* FillFactory(void* p) { return SkNEW_ARGS(Color_FPSBench, (p, 0xFFFF0000, "fps_fill")); }
 static SkBenchmark* BlendFactory(void* p) { return SkNEW_ARGS(Color_FPSBench, (p, 0x80FF0000, "fps_blend")); }
-static SkBenchmark* BMFactory0(void* p) { return SkNEW_ARGS(Bitmap_FPSBench, (p, SkBitmap::kARGB_8888_Config, false)); }
-static SkBenchmark* BMFactory1(void* p) { return SkNEW_ARGS(Bitmap_FPSBench, (p, SkBitmap::kARGB_8888_Config, true)); }
-static SkBenchmark* BMFactory2(void* p) { return SkNEW_ARGS(Bitmap_FPSBench, (p, SkBitmap::kRGB_565_Config, false)); }
-static SkBenchmark* BMFactory3(void* p) { return SkNEW_ARGS(Bitmap_FPSBench, (p, SkBitmap::kRGB_565_Config, true)); }
+static SkBenchmark* BMFactory0(void* p) { return SkNEW_ARGS(Bitmap_FPSBench, (p, SkBitmap::kARGB_8888_Config, false, false)); }
+static SkBenchmark* BMFactory1(void* p) { return SkNEW_ARGS(Bitmap_FPSBench, (p, SkBitmap::kARGB_8888_Config, false, true)); }
+static SkBenchmark* BMFactory2(void* p) { return SkNEW_ARGS(Bitmap_FPSBench, (p, SkBitmap::kARGB_8888_Config, true, false)); }
+static SkBenchmark* BMFactory3(void* p) { return SkNEW_ARGS(Bitmap_FPSBench, (p, SkBitmap::kARGB_8888_Config, true, true)); }
+static SkBenchmark* BMFactory4(void* p) { return SkNEW_ARGS(Bitmap_FPSBench, (p, SkBitmap::kRGB_565_Config, false, false)); }
+static SkBenchmark* BMFactory5(void* p) { return SkNEW_ARGS(Bitmap_FPSBench, (p, SkBitmap::kRGB_565_Config, false, true)); }
 
 static BenchRegistry gFillReg(FillFactory);
 static BenchRegistry gBlendReg(BlendFactory);
@@ -90,4 +103,6 @@
 static BenchRegistry gBMReg1(BMFactory1);
 static BenchRegistry gBMReg2(BMFactory2);
 static BenchRegistry gBMReg3(BMFactory3);
+static BenchRegistry gBMReg4(BMFactory4);
+static BenchRegistry gBMReg5(BMFactory5);