From c55f699e8b01644b49dddfc21bfb538f1a5ed06a Mon Sep 17 00:00:00 2001 From: mtklein Date: Thu, 14 Jan 2016 13:49:17 -0800 Subject: Revert of these _procs_arm are not used when we have NEON (patchset #1 id:1 of https://codereview.chromium.org/1587983004/ ) Reason for revert: Breaks Chrome roll: https://build.chromium.org/p/tryserver.chromium.android/builders/android_chromium_gn_compile_rel/builds/8391/steps/compile%20%28with%20patch%29/logs/stdio Original issue's description: > these _procs_arm are not used when we have NEON > > BUG=skia:4798 > GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1587983004 > CQ_EXTRA_TRYBOTS=client.skia:Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-SKNX_NO_SIMD-Trybot > > Committed: https://skia.googlesource.com/skia/+/349dcc99b69f27ab834232796371e678625078e0 TBR=msarett@google.com,mtklein@chromium.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=skia:4798 Review URL: https://codereview.chromium.org/1589633005 --- src/opts/SkBlitRow_opts_arm.cpp | 2 -- 1 file changed, 2 deletions(-) (limited to 'src') diff --git a/src/opts/SkBlitRow_opts_arm.cpp b/src/opts/SkBlitRow_opts_arm.cpp index 6ebd809126..24566ba6c5 100644 --- a/src/opts/SkBlitRow_opts_arm.cpp +++ b/src/opts/SkBlitRow_opts_arm.cpp @@ -10,7 +10,6 @@ #include "SkBlitRow_opts_arm_neon.h" -#if !defined(SK_ARM_HAS_NEON) static const SkBlitRow::Proc16 sk_blitrow_platform_565_procs_arm[] = { nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, }; @@ -22,7 +21,6 @@ static const SkBlitRow::ColorProc16 sk_blitrow_platform_565_colorprocs_arm[] = { static const SkBlitRow::Proc32 sk_blitrow_platform_32_procs_arm[] = { nullptr, nullptr, nullptr, nullptr, }; -#endif SkBlitRow::Proc16 SkBlitRow::PlatformFactory565(unsigned flags) { return SK_ARM_NEON_WRAP(sk_blitrow_platform_565_procs_arm)[flags]; -- cgit v1.2.3