From 5b2c2c6fd09752641b14766678d62fe50b4e3ef3 Mon Sep 17 00:00:00 2001
From: reed <reed@google.com>
Date: Fri, 22 Aug 2014 08:27:45 -0700
Subject: [PATCH] disable neon proc that is triggering asserts

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

Author: reed@google.com

Review URL: https://codereview.chromium.org/498733002
---
 src/opts/SkBlitRow_opts_arm_neon.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/opts/SkBlitRow_opts_arm_neon.cpp b/src/opts/SkBlitRow_opts_arm_neon.cpp
index 4b7e3be..c486533 100644
--- a/src/opts/SkBlitRow_opts_arm_neon.cpp
+++ b/src/opts/SkBlitRow_opts_arm_neon.cpp
@@ -1651,7 +1651,11 @@ const SkBlitRow::Proc sk_blitrow_platform_565_procs_arm_neon[] = {
     S32_D565_Opaque_neon,
     S32_D565_Blend_neon,
     S32A_D565_Opaque_neon,
+#ifdef SK_CPU_ARM64
+    NULL,   // https://code.google.com/p/skia/issues/detail?id=2845
+#else
     S32A_D565_Blend_neon,
+#endif
 
     // dither
     S32_D565_Opaque_Dither_neon,
-- 
2.7.4