diff options
author | 2014-09-02 06:32:25 -0700 | |
---|---|---|
committer | 2014-09-02 06:32:26 -0700 | |
commit | 4d6484e764ef8d38efc841e74922d61360ff8667 (patch) | |
tree | 47fd45ba7a7e143416df06f5e580299585b2abaf | |
parent | 4a1764688c990fb926aaeab538497dad52768d99 (diff) |
Revert of Disable NEON procs for box blur as it produces invalid results (patchset #1 id:1 of https://codereview.chromium.org/520963002/)
Reason for revert:
failing more GMs than expected.
Original issue's description:
> Disable NEON procs for box blur as it produces invalid results
>
> BUG=skia:2845
>
> Committed: https://skia.googlesource.com/skia/+/4a1764688c990fb926aaeab538497dad52768d99
R=senorblanco@google.com, mtklein@google.com
TBR=mtklein@google.com, senorblanco@google.com
NOTREECHECKS=true
NOTRY=true
BUG=skia:2845
Author: djsollen@google.com
Review URL: https://codereview.chromium.org/531023002
-rw-r--r-- | expectations/gm/ignored-tests.txt | 4 | ||||
-rw-r--r-- | src/opts/SkBlurImage_opts_arm.cpp | 5 |
2 files changed, 2 insertions, 7 deletions
diff --git a/expectations/gm/ignored-tests.txt b/expectations/gm/ignored-tests.txt index 569d866e6a..3a3224dfa9 100644 --- a/expectations/gm/ignored-tests.txt +++ b/expectations/gm/ignored-tests.txt @@ -44,7 +44,3 @@ matrixconvolution # Added as part of https://codereview.chromium.org/466363009/ fontcache - -# fix broken blurs on android (djsollen -# http://skbug.com/2845 -imageblur2 diff --git a/src/opts/SkBlurImage_opts_arm.cpp b/src/opts/SkBlurImage_opts_arm.cpp index fb6103482c..7462e6fb7d 100644 --- a/src/opts/SkBlurImage_opts_arm.cpp +++ b/src/opts/SkBlurImage_opts_arm.cpp @@ -12,11 +12,10 @@ bool SkBoxBlurGetPlatformProcs(SkBoxBlurProc* boxBlurX, SkBoxBlurProc* boxBlurY, SkBoxBlurProc* boxBlurXY, SkBoxBlurProc* boxBlurYX) { - // Temporary workaround for http://skbug.com/2845 - return false; - #if SK_ARM_NEON_IS_NONE return false; +#elif defined(SK_CPU_ARM64) // Temporary fix for + return false; // http://skbug.com/2845 #else #if SK_ARM_NEON_IS_DYNAMIC if (!sk_cpu_arm_has_neon()) { |