diff options
author | scroggo <scroggo@google.com> | 2014-06-12 12:10:24 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-06-12 12:10:24 -0700 |
commit | e07c1ab40882078b505f2b0ceb7413c44af569e8 (patch) | |
tree | f40909bac00379e7964d92398d5ca954464e4cf2 /tests/BlurTest.cpp | |
parent | 8b6fee1eb9166f1ee70b9b4b3c87e1d1902b8898 (diff) |
Revert of third try at landing improved blur rect; this time with more correctness (https://codereview.chromium.org/331443003/)
Reason for revert:
Failing layout test: https://storage.googleapis.com/chromium-layout-test-archives/WebKit_Linux/32762/layout-test-results/virtual/gpu/fast/canvas/canvas-draw-canvas-on-canvas-shadow-pretty-diff.html
Original issue's description:
> third try at landing improved blur rect; this time with more correctness
>
> BUG=skia:2095
> R=bsalomon@google.com
> TBR=bsalomon
>
> Committed: https://skia.googlesource.com/skia/+/72abfc2b4e7caead660f6b6a05e60d05eaf1a66f
R=bsalomon@google.com, reed@google.com, humper@google.com
TBR=bsalomon@google.com, humper@google.com, reed@google.com
NOTREECHECKS=true
NOTRY=true
BUG=skia:2095
Author: scroggo@google.com
Review URL: https://codereview.chromium.org/333763002
Diffstat (limited to 'tests/BlurTest.cpp')
-rw-r--r-- | tests/BlurTest.cpp | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/tests/BlurTest.cpp b/tests/BlurTest.cpp index 143d777e88..c09a4ee1c6 100644 --- a/tests/BlurTest.cpp +++ b/tests/BlurTest.cpp @@ -273,8 +273,6 @@ static void cpu_blur_path(const SkPath& path, SkScalar gaussianSigma, } #if SK_SUPPORT_GPU -#if 0 -// temporary disable; see below for explanation static bool gpu_blur_path(GrContextFactory* factory, const SkPath& path, SkScalar gaussianSigma, int* result, int resultCount) { @@ -300,7 +298,6 @@ static bool gpu_blur_path(GrContextFactory* factory, const SkPath& path, return true; } #endif -#endif #if WRITE_CSV static void write_as_csv(const char* label, SkScalar scale, int* data, int count) { @@ -346,6 +343,9 @@ static void test_sigma_range(skiatest::Reporter* reporter, GrContextFactory* fac int rectSpecialCaseResult[kSize]; int generalCaseResult[kSize]; +#if SK_SUPPORT_GPU + int gpuResult[kSize]; +#endif int groundTruthResult[kSize]; int bruteForce1DResult[kSize]; @@ -355,24 +355,20 @@ static void test_sigma_range(skiatest::Reporter* reporter, GrContextFactory* fac cpu_blur_path(rectPath, sigma, rectSpecialCaseResult, kSize); cpu_blur_path(polyPath, sigma, generalCaseResult, kSize); - +#if SK_SUPPORT_GPU + bool haveGPUResult = gpu_blur_path(factory, rectPath, sigma, gpuResult, kSize); +#endif ground_truth_2d(100, 100, sigma, groundTruthResult, kSize); brute_force_1d(-50.0f, 50.0f, sigma, bruteForce1DResult, kSize); REPORTER_ASSERT(reporter, match(rectSpecialCaseResult, bruteForce1DResult, kSize, 5)); REPORTER_ASSERT(reporter, match(generalCaseResult, bruteForce1DResult, kSize, 15)); #if SK_SUPPORT_GPU -#if 0 - int gpuResult[kSize]; - bool haveGPUResult = gpu_blur_path(factory, rectPath, sigma, gpuResult, kSize); - // Disabling this test for now -- I don't think it's a legit comparison. - // Will continue to investigate this. if (haveGPUResult) { // 1 works everywhere but: Ubuntu13 & Nexus4 REPORTER_ASSERT(reporter, match(gpuResult, bruteForce1DResult, kSize, 10)); } #endif -#endif REPORTER_ASSERT(reporter, match(groundTruthResult, bruteForce1DResult, kSize, 1)); #if WRITE_CSV |