From 7b4edb249bd9c8275348a2bba22e751564e70678 Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Fri, 21 Feb 2014 23:11:35 +0000 Subject: [PATCH] Revert of Enable the SSSE3 files to be built for Android when SSSE3 is not present. (https://codereview.chromium.org/169753004/) Reason for revert: Breaking the build. Non-android machines are calling sk_throw(). Original issue's description: > Enable the SSSE3 files to be built for Android when SSSE3 is not present. > > Committed: http://code.google.com/p/skia/source/detail?r=13547 R=reed@google.com, mtklein@google.com, djsollen@google.com TBR=djsollen@google.com, mtklein@google.com, reed@google.com NOTREECHECKS=true NOTRY=true Author: scroggo@google.com Review URL: https://codereview.chromium.org/175543004 git-svn-id: http://skia.googlecode.com/svn/trunk@13549 2bbb7eff-a529-9590-31e7-b0007b416f81 --- include/core/SkPreConfig.h | 6 +++++ src/opts/SkBitmapProcState_opts_SSSE3.cpp | 32 +---------------------- 2 files changed, 7 insertions(+), 31 deletions(-) diff --git a/include/core/SkPreConfig.h b/include/core/SkPreConfig.h index 47e83d19e8..1c2e24fba6 100644 --- a/include/core/SkPreConfig.h +++ b/include/core/SkPreConfig.h @@ -144,6 +144,12 @@ #endif #endif +// Android x86 NDK ABI requires SSE3 support +#if defined(SK_BUILD_FOR_ANDROID) + #undef SK_CPU_SSE_LEVEL + #define SK_CPU_SSE_LEVEL SK_CPU_SSE_LEVEL_SSE3 +#endif + ////////////////////////////////////////////////////////////////////// // ARM defines diff --git a/src/opts/SkBitmapProcState_opts_SSSE3.cpp b/src/opts/SkBitmapProcState_opts_SSSE3.cpp index 1f0477378e..f8342ecaad 100644 --- a/src/opts/SkBitmapProcState_opts_SSSE3.cpp +++ b/src/opts/SkBitmapProcState_opts_SSSE3.cpp @@ -5,13 +5,11 @@ * found in the LICENSE file. */ +#include // SSSE3 #include "SkBitmapProcState_opts_SSSE3.h" #include "SkPaint.h" #include "SkUtils.h" -#if SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSSE3 -#include // SSSE3 - // adding anonymous namespace seemed to force gcc to inline directly the // instantiation, instead of creating the functions // S32_generic_D32_filter_DX_SSSE3 and @@ -724,31 +722,3 @@ void S32_alpha_D32_filter_DXDY_SSSE3(const SkBitmapProcState& s, int count, uint32_t* colors) { S32_generic_D32_filter_DXDY_SSSE3(s, xy, count, colors); } - -#else //SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSSE3 - -void S32_opaque_D32_filter_DX_SSSE3(const SkBitmapProcState& s, - const uint32_t* xy, - int count, uint32_t* colors) { - sk_throw(); -} - -void S32_alpha_D32_filter_DX_SSSE3(const SkBitmapProcState& s, - const uint32_t* xy, - int count, uint32_t* colors) { - sk_throw(); -} - -void S32_opaque_D32_filter_DXDY_SSSE3(const SkBitmapProcState& s, - const uint32_t* xy, - int count, uint32_t* colors) { - sk_throw(); -} - -void S32_alpha_D32_filter_DXDY_SSSE3(const SkBitmapProcState& s, - const uint32_t* xy, - int count, uint32_t* colors) { - sk_throw(); -} - -#endif