Refactoring: get rid of the SkBenchmark void* parameter.
While I was doing massive sed-ing, I also converted every bench to use DEF_BENCH instead of registering the ugly manual way.
BUG=
R=scroggo@google.com
Review URL: https://codereview.chromium.org/23876006
git-svn-id: http://skia.googlecode.com/svn/trunk@11263 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/bench/ScalarBench.cpp b/bench/ScalarBench.cpp
index b1014f4..536af28 100644
--- a/bench/ScalarBench.cpp
+++ b/bench/ScalarBench.cpp
@@ -14,7 +14,7 @@
class ScalarBench : public SkBenchmark {
SkString fName;
public:
- ScalarBench(void* param, const char name[]) : INHERITED(param) {
+ ScalarBench(const char name[]) {
fName.printf("scalar_%s", name);
fIsRendering = false;
}
@@ -62,7 +62,7 @@
class FloatComparisonBench : public ScalarBench {
public:
- FloatComparisonBench(void* param) : INHERITED(param, "compare_float") {
+ FloatComparisonBench() : INHERITED("compare_float") {
init9(fArray);
}
protected:
@@ -78,8 +78,8 @@
class ForcedIntComparisonBench : public ScalarBench {
public:
- ForcedIntComparisonBench(void* param)
- : INHERITED(param, "compare_forced_int") {
+ ForcedIntComparisonBench()
+ : INHERITED("compare_forced_int") {
init9(fArray);
}
protected:
@@ -99,7 +99,7 @@
class IsFiniteScalarBench : public ScalarBench {
public:
- IsFiniteScalarBench(void* param) : INHERITED(param, "isfinite") {
+ IsFiniteScalarBench() : INHERITED("isfinite") {
SkRandom rand;
for (size_t i = 0; i < ARRAY_N; ++i) {
fArray[i] = rand.nextSScalar1();
@@ -137,7 +137,7 @@
SkPoint fPts[PTS];
public:
- RectBoundsBench(void* param) : INHERITED(param) {
+ RectBoundsBench() {
SkRandom rand;
for (int i = 0; i < PTS; ++i) {
fPts[i].fX = rand.nextSScalar1();
@@ -164,12 +164,7 @@
///////////////////////////////////////////////////////////////////////////////
-static SkBenchmark* S0(void* p) { return new FloatComparisonBench(p); }
-static SkBenchmark* S1(void* p) { return new ForcedIntComparisonBench(p); }
-static SkBenchmark* S2(void* p) { return new RectBoundsBench(p); }
-static SkBenchmark* S3(void* p) { return new IsFiniteScalarBench(p); }
-
-static BenchRegistry gReg0(S0);
-static BenchRegistry gReg1(S1);
-static BenchRegistry gReg2(S2);
-static BenchRegistry gReg3(S3);
+DEF_BENCH( return new FloatComparisonBench(); )
+DEF_BENCH( return new ForcedIntComparisonBench(); )
+DEF_BENCH( return new RectBoundsBench(); )
+DEF_BENCH( return new IsFiniteScalarBench(); )