diff options
author | Brian Osman <brianosman@google.com> | 2018-05-31 14:27:17 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-05-31 18:59:44 +0000 |
commit | c7ad40f76f6f23b3acd73b53e989220fd71f2da2 (patch) | |
tree | 3a2372730179f1bd0dd2486b6e576ec308f1327b /gm/rrects.cpp | |
parent | 8103bb960933359f6536cbfd40d760e54b079e94 (diff) |
Remove SK_SUPPORT_GPU checks in tool-only code
Most of this is (obviously) not necessary to do, but once
I started, I figured I'd just get it all. Tools (nanobench,
DM, skiaserve), all GMs, benches, and unit tests, plus support
code (command line parsing and config stuff).
This is almost entirely mechanical.
Bug: skia:
Change-Id: I209500f8df8c5bd43f8298ff26440d1c4d7425fb
Reviewed-on: https://skia-review.googlesource.com/131153
Reviewed-by: Mike Klein <mtklein@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
Diffstat (limited to 'gm/rrects.cpp')
-rw-r--r-- | gm/rrects.cpp | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/gm/rrects.cpp b/gm/rrects.cpp index d6b52918ef..ff704c82a2 100644 --- a/gm/rrects.cpp +++ b/gm/rrects.cpp @@ -7,14 +7,12 @@ #include "gm.h" #include "sk_tool_utils.h" -#if SK_SUPPORT_GPU #include "GrCaps.h" #include "GrContext.h" #include "GrRenderTargetContextPriv.h" #include "effects/GrRRectEffect.h" #include "ops/GrDrawOp.h" #include "ops/GrRectOpFactory.h" -#endif #include "SkRRect.h" namespace skiagm { @@ -83,11 +81,7 @@ protected: SkIntToScalar(kImageHeight)); #endif -#if SK_SUPPORT_GPU int lastEdgeType = (kEffect_Type == fType) ? (int) GrClipEdgeType::kLast: 0; -#else - int lastEdgeType = 0; -#endif int y = 1; for (int et = 0; et <= lastEdgeType; ++et) { @@ -103,7 +97,6 @@ protected: canvas->save(); canvas->translate(SkIntToScalar(x), SkIntToScalar(y)); if (kEffect_Type == fType) { -#if SK_SUPPORT_GPU SkRRect rrect = fRRects[curRRect]; rrect.offset(SkIntToScalar(x), SkIntToScalar(y)); GrClipEdgeType edgeType = (GrClipEdgeType) et; @@ -125,7 +118,6 @@ protected: } else { drew = false; } -#endif } else if (kBW_Clip_Type == fType || kAA_Clip_Type == fType) { bool aaClip = (kAA_Clip_Type == fType); canvas->clipRRect(fRRects[curRRect], aaClip); @@ -257,8 +249,6 @@ DEF_GM( return new RRectGM(RRectGM::kAA_Draw_Type); ) DEF_GM( return new RRectGM(RRectGM::kBW_Draw_Type); ) DEF_GM( return new RRectGM(RRectGM::kAA_Clip_Type); ) DEF_GM( return new RRectGM(RRectGM::kBW_Clip_Type); ) -#if SK_SUPPORT_GPU DEF_GM( return new RRectGM(RRectGM::kEffect_Type); ) -#endif } |