commit 4a1764688c990fb926aaeab538497dad52768d99
author djsollen <djsollen@google.com> Tue Sep 02 05:32:23 2014 -0700
committer Commit bot <commit-bot@chromium.org> Tue Sep 02 05:32:23 2014 -0700
tree b68b3cbfa437dbb776873a8195c09123b08ca671
parent d565a9c71be190ea1459498705a2027d7673ff20

Disable NEON procs for box blur as it produces invalid results

BUG=skia:2845
R=senorblanco@google.com, mtklein@google.com

Author: djsollen@google.com

Review URL: https://codereview.chromium.org/520963002

expectations/gm/ignored-tests.txt

diff --git a/expectations/gm/ignored-tests.txt b/expectations/gm/ignored-tests.txt
index 3a3224d..569d866 100644
--- a/expectations/gm/ignored-tests.txt
+++ b/expectations/gm/ignored-tests.txt
@@ -44,3 +44,7 @@
 
 # Added as part of https://codereview.chromium.org/466363009/
 fontcache
+
+# fix broken blurs on android (djsollen
+# http://skbug.com/2845
+imageblur2

src/opts/SkBlurImage_opts_arm.cpp

diff --git a/src/opts/SkBlurImage_opts_arm.cpp b/src/opts/SkBlurImage_opts_arm.cpp
index 7462e6f..fb61034 100644
--- a/src/opts/SkBlurImage_opts_arm.cpp
+++ b/src/opts/SkBlurImage_opts_arm.cpp
@@ -12,10 +12,11 @@
                                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()) {