diff options
| -rw-r--r-- | bench/nanobench.cpp | 2 | ||||
| -rw-r--r-- | gm/circularclips.cpp | 4 | ||||
| -rw-r--r-- | gm/convexpolyclip.cpp | 4 | ||||
| -rw-r--r-- | gm/dashing.cpp | 6 | ||||
| -rw-r--r-- | gm/gm.h | 4 | ||||
| -rw-r--r-- | gm/multipicturedraw.cpp | 3 | ||||
| -rw-r--r-- | gm/variedtext.cpp | 3 |
7 files changed, 17 insertions, 9 deletions
diff --git a/bench/nanobench.cpp b/bench/nanobench.cpp index 6fe2d626f4..8d00ca132f 100644 --- a/bench/nanobench.cpp +++ b/bench/nanobench.cpp @@ -503,7 +503,7 @@ public: while (fGMs) { SkAutoTDelete<skiagm::GM> gm(fGMs->factory()(NULL)); fGMs = fGMs->next(); - if (gm->getFlags() & skiagm::GM::kAsBench_Flag) { + if (gm->runAsBench()) { fSourceType = "gm"; fBenchType = "micro"; return SkNEW_ARGS(GMBench, (gm.detach())); diff --git a/gm/circularclips.cpp b/gm/circularclips.cpp index 6a8415c67e..69e8b69a8f 100644 --- a/gm/circularclips.cpp +++ b/gm/circularclips.cpp @@ -26,9 +26,11 @@ public: protected: uint32_t onGetFlags() const SK_OVERRIDE { - return kSkipTiled_Flag | kAsBench_Flag; + return kSkipTiled_Flag; } + bool runAsBench() const SK_OVERRIDE { return true; } + SkString onShortName() SK_OVERRIDE { return SkString("circular-clips"); } diff --git a/gm/convexpolyclip.cpp b/gm/convexpolyclip.cpp index f7aac897c7..0ec45b7647 100644 --- a/gm/convexpolyclip.cpp +++ b/gm/convexpolyclip.cpp @@ -215,9 +215,11 @@ protected: } virtual uint32_t onGetFlags() const { - return kAsBench_Flag | kSkipTiled_Flag; + return kSkipTiled_Flag; } + bool runAsBench() const SK_OVERRIDE { return true; } + private: class Clip { public: diff --git a/gm/dashing.cpp b/gm/dashing.cpp index a5d234f482..a3d6094067 100644 --- a/gm/dashing.cpp +++ b/gm/dashing.cpp @@ -414,9 +414,11 @@ public: Dashing5GM(bool doAA) : fDoAA(doAA) {} protected: - uint32_t onGetFlags() const SK_OVERRIDE { return kAsBench_Flag | kSkipTiled_Flag; } + uint32_t onGetFlags() const SK_OVERRIDE { return kSkipTiled_Flag; } - SkString onShortName() SK_OVERRIDE { + bool runAsBench() const SK_OVERRIDE { return true; } + + SkString onShortName() SK_OVERRIDE { if (fDoAA) { return SkString("dashing5_aa"); } else { @@ -53,8 +53,6 @@ namespace skiagm { kGPUOnly_Flag = 1 << 9, - kAsBench_Flag = 1 << 10, // Run the GM as a benchmark in the bench tool - kNoBBH_Flag = 1 << 11, // May draw wrong using a bounding-box hierarchy }; @@ -74,6 +72,8 @@ namespace skiagm { SkISize getISize() { return this->onISize(); } const char* getName(); + virtual bool runAsBench() const { return false; } + uint32_t getFlags() const { return this->onGetFlags(); } diff --git a/gm/multipicturedraw.cpp b/gm/multipicturedraw.cpp index c7da676af6..15b57e321d 100644 --- a/gm/multipicturedraw.cpp +++ b/gm/multipicturedraw.cpp @@ -534,7 +534,8 @@ namespace skiagm { return name; } - uint32_t onGetFlags() const SK_OVERRIDE { return kAsBench_Flag | kSkipTiled_Flag; } + uint32_t onGetFlags() const SK_OVERRIDE { return kSkipTiled_Flag; } + bool runAsBench() const SK_OVERRIDE { return true; } private: typedef GM INHERITED; diff --git a/gm/variedtext.cpp b/gm/variedtext.cpp index dddd79e942..dba5d70eb6 100644 --- a/gm/variedtext.cpp +++ b/gm/variedtext.cpp @@ -139,8 +139,9 @@ protected: uint32_t onGetFlags() const SK_OVERRIDE { // The aa hairline stroked rects used to visualize the clip draw slightly differently in // quilt mode in dm. - return kAsBench_Flag | kSkipTiled_Flag; + return kSkipTiled_Flag; } + bool runAsBench() const SK_OVERRIDE { return true; } private: static const int kCnt = 30; |