diff options
| author |  mtklein@google.com <mtklein@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-09-13 19:52:27 +0000 |
|---|---|---|
| committer | mtklein@google.com <mtklein@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-09-13 19:52:27 +0000 |
| commit | 410e6e80f00a6c660675c80904807a041c7b7d2a (patch) | |
| tree | e6b7287001f032ae9a9e09de19db5d0867bea9e3 /bench/MorphologyBench.cpp | |
| parent | af54a513a5b7723b53f61730afe0ad6256881749 (diff) | |
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
Diffstat (limited to 'bench/MorphologyBench.cpp')
| -rw-r--r-- | bench/MorphologyBench.cpp | 31 |
1 files changed, 9 insertions, 22 deletions
diff --git a/bench/MorphologyBench.cpp b/bench/MorphologyBench.cpp index 2d4b4ee4b5..d042e6d3e6 100644 --- a/bench/MorphologyBench.cpp +++ b/bench/MorphologyBench.cpp @@ -36,8 +36,8 @@ class MorphologyBench : public SkBenchmark { SkString fName; public: - MorphologyBench(void* param, SkScalar rad, MorphologyType style) - : INHERITED(param) { + MorphologyBench(SkScalar rad, MorphologyType style) + { fRadius = rad; fStyle = style; const char* name = rad > 0 ? gStyleName[style] : "none"; @@ -87,30 +87,17 @@ private: typedef SkBenchmark INHERITED; }; -static SkBenchmark* Fact00(void* p) { return new MorphologyBench(p, SMALL, kErode_MT); } -static SkBenchmark* Fact01(void* p) { return new MorphologyBench(p, SMALL, kDilate_MT); } - -static SkBenchmark* Fact10(void* p) { return new MorphologyBench(p, BIG, kErode_MT); } -static SkBenchmark* Fact11(void* p) { return new MorphologyBench(p, BIG, kDilate_MT); } - -static SkBenchmark* Fact20(void* p) { return new MorphologyBench(p, REAL, kErode_MT); } -static SkBenchmark* Fact21(void* p) { return new MorphologyBench(p, REAL, kDilate_MT); } - -static SkBenchmark* FactNone(void* p) { return new MorphologyBench(p, 0, kErode_MT); } - // Fixed point can be 100x slower than float on these tests, causing // bench to timeout. #ifndef SK_SCALAR_IS_FIXED +DEF_BENCH( return new MorphologyBench(SMALL, kErode_MT); ) +DEF_BENCH( return new MorphologyBench(SMALL, kDilate_MT); ) -static BenchRegistry gReg00(Fact00); -static BenchRegistry gReg01(Fact01); - -static BenchRegistry gReg10(Fact10); -static BenchRegistry gReg11(Fact11); - -static BenchRegistry gReg20(Fact20); -static BenchRegistry gReg21(Fact21); +DEF_BENCH( return new MorphologyBench(BIG, kErode_MT); ) +DEF_BENCH( return new MorphologyBench(BIG, kDilate_MT); ) -static BenchRegistry gRegNone(FactNone); +DEF_BENCH( return new MorphologyBench(REAL, kErode_MT); ) +DEF_BENCH( return new MorphologyBench(REAL, kDilate_MT); ) +DEF_BENCH( return new MorphologyBench(0, kErode_MT); ) #endif |