From 410e6e80f00a6c660675c80904807a041c7b7d2a Mon Sep 17 00:00:00 2001 From: "mtklein@google.com" Date: Fri, 13 Sep 2013 19:52:27 +0000 Subject: 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 --- bench/GameBench.cpp | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) (limited to 'bench/GameBench.cpp') diff --git a/bench/GameBench.cpp b/bench/GameBench.cpp index 5fc9c03288..7812285344 100644 --- a/bench/GameBench.cpp +++ b/bench/GameBench.cpp @@ -27,11 +27,10 @@ public: kPartial_Clear }; - GameBench(void* param, Type type, Clear clear, + GameBench(Type type, Clear clear, bool aligned = false, bool useAtlas = false, bool useDrawVertices = false) - : INHERITED(param) - , fType(type) + : fType(type) , fClear(clear) , fAligned(aligned) , fUseAtlas(useAtlas) @@ -313,27 +312,27 @@ private: }; // Partial clear -DEF_BENCH( return SkNEW_ARGS(GameBench, (p, GameBench::kScale_Type, +DEF_BENCH( return SkNEW_ARGS(GameBench, (GameBench::kScale_Type, GameBench::kPartial_Clear)); ) -DEF_BENCH( return SkNEW_ARGS(GameBench, (p, GameBench::kTranslate_Type, +DEF_BENCH( return SkNEW_ARGS(GameBench, (GameBench::kTranslate_Type, GameBench::kPartial_Clear)); ) -DEF_BENCH( return SkNEW_ARGS(GameBench, (p, GameBench::kTranslate_Type, +DEF_BENCH( return SkNEW_ARGS(GameBench, (GameBench::kTranslate_Type, GameBench::kPartial_Clear, true)); ) -DEF_BENCH( return SkNEW_ARGS(GameBench, (p, GameBench::kRotate_Type, +DEF_BENCH( return SkNEW_ARGS(GameBench, (GameBench::kRotate_Type, GameBench::kPartial_Clear)); ) // Full clear -DEF_BENCH( return SkNEW_ARGS(GameBench, (p, GameBench::kScale_Type, +DEF_BENCH( return SkNEW_ARGS(GameBench, (GameBench::kScale_Type, GameBench::kFull_Clear)); ) -DEF_BENCH( return SkNEW_ARGS(GameBench, (p, GameBench::kTranslate_Type, +DEF_BENCH( return SkNEW_ARGS(GameBench, (GameBench::kTranslate_Type, GameBench::kFull_Clear)); ) -DEF_BENCH( return SkNEW_ARGS(GameBench, (p, GameBench::kTranslate_Type, +DEF_BENCH( return SkNEW_ARGS(GameBench, (GameBench::kTranslate_Type, GameBench::kFull_Clear, true)); ) -DEF_BENCH( return SkNEW_ARGS(GameBench, (p, GameBench::kRotate_Type, +DEF_BENCH( return SkNEW_ARGS(GameBench, (GameBench::kRotate_Type, GameBench::kFull_Clear)); ) // Atlased -DEF_BENCH( return SkNEW_ARGS(GameBench, (p, GameBench::kTranslate_Type, +DEF_BENCH( return SkNEW_ARGS(GameBench, (GameBench::kTranslate_Type, GameBench::kFull_Clear, false, true)); ) -DEF_BENCH( return SkNEW_ARGS(GameBench, (p, GameBench::kTranslate_Type, +DEF_BENCH( return SkNEW_ARGS(GameBench, (GameBench::kTranslate_Type, GameBench::kFull_Clear, false, true, true)); ) -- cgit v1.2.3