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 /tests/BlurTest.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 'tests/BlurTest.cpp')
| -rw-r--r-- | tests/BlurTest.cpp | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/tests/BlurTest.cpp b/tests/BlurTest.cpp index 07cfdcd2b1..2462342032 100644 --- a/tests/BlurTest.cpp +++ b/tests/BlurTest.cpp @@ -39,9 +39,7 @@ #include "Test.h" #include "sk_pixel_iter.h" -#if SK_SUPPORT_GPU #include "GrContextFactory.h" -#endif #include <math.h> #include <string.h> @@ -349,9 +347,7 @@ DEF_TEST(BlurSigmaRange, reporter) { #if WRITE_CSV write_as_csv("RectSpecialCase", sigma, rectSpecialCaseResult, kSize); write_as_csv("GeneralCase", sigma, generalCaseResult, kSize); -#if SK_SUPPORT_GPU write_as_csv("GPU", sigma, gpuResult, kSize); -#endif write_as_csv("GroundTruth2D", sigma, groundTruthResult, kSize); write_as_csv("BruteForce1D", sigma, bruteForce1DResult, kSize); #endif @@ -500,8 +496,6 @@ DEF_TEST(BlurAsABlur, reporter) { } } -#if SK_SUPPORT_GPU - // This exercises the problem discovered in crbug.com/570232. The return value from // SkBlurMask::BoxBlur wasn't being checked in SkBlurMaskFilter.cpp::GrRRectBlurEffect::Create DEF_GPUTEST_FOR_RENDERING_CONTEXTS(SmallBoxBlurBug, reporter, ctxInfo) { @@ -519,9 +513,6 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(SmallBoxBlurBug, reporter, ctxInfo) { canvas->drawRRect(rr, p); } -#endif - - DEF_TEST(BlurredRRectNinePatchComputation, reporter) { const SkRect r = SkRect::MakeXYWH(10, 10, 100, 100); static const SkScalar kBlurRad = 3.0f; @@ -710,7 +701,6 @@ DEF_TEST(BlurZeroSigma, reporter) { /////////////////////////////////////////////////////////////////////////////////////////// -#if SK_SUPPORT_GPU DEF_GPUTEST_FOR_RENDERING_CONTEXTS(BlurMaskBiggerThanDest, reporter, ctxInfo) { GrContext* context = ctxInfo.grContext(); @@ -741,6 +731,3 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(BlurMaskBiggerThanDest, reporter, ctxInfo) { REPORTER_ASSERT(reporter, SkColorGetB(readback.getColor(15, 15)) == 0); REPORTER_ASSERT(reporter, readback.getColor(31, 31) == SK_ColorBLACK); } - -#endif - |