Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6)

Unified Diff: include/core/SkPreConfig.h

Issue 169753004: Enable the SSSE3 files to be built for Android when SSSE3 is not present. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: comments Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | src/opts/SkBitmapProcState_opts_SSSE3.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: include/core/SkPreConfig.h
diff --git a/include/core/SkPreConfig.h b/include/core/SkPreConfig.h
index 1c2e24fba6577461abb86244c22a30554d9e38f4..406a159d891659a248decc1eed2303f68ce12bb9 100644
--- a/include/core/SkPreConfig.h
+++ b/include/core/SkPreConfig.h
@@ -116,40 +116,30 @@
// Are we in GCC?
#ifndef SK_CPU_SSE_LEVEL
- #if defined(__SSE2__)
- #define SK_CPU_SSE_LEVEL SK_CPU_SSE_LEVEL_SSE2
+ // These checks must be done in descending order to ensure we set the highest
+ // available SSE level.
+ #if defined(__SSSE3__)
+ #define SK_CPU_SSE_LEVEL SK_CPU_SSE_LEVEL_SSSE3
#elif defined(__SSE3__)
#define SK_CPU_SSE_LEVEL SK_CPU_SSE_LEVEL_SSE3
- #elif defined(__SSSE3__)
- #define SK_CPU_SSE_LEVEL SK_CPU_SSE_LEVEL_SSSE3
+ #elif defined(__SSE2__)
+ #define SK_CPU_SSE_LEVEL SK_CPU_SSE_LEVEL_SSE2
#endif
#endif
// Are we in VisualStudio?
#ifndef SK_CPU_SSE_LEVEL
+ // These checks must be done in descending order to ensure we set the highest
+ // available SSE level.
#if defined (_M_IX86_FP)
- #if _M_IX86_FP == 1
- #define SK_CPU_SSE_LEVEL SK_CPU_SSE_LEVEL_SSE1
- #elif _M_IX86_FP >= 2
+ #if _M_IX86_FP >= 2
#define SK_CPU_SSE_LEVEL SK_CPU_SSE_LEVEL_SSE2
+ #elif _M_IX86_FP == 1
+ #define SK_CPU_SSE_LEVEL SK_CPU_SSE_LEVEL_SSE1
#endif
#endif
#endif
-// 64bit intel guarantees at least SSE2
-#if defined(__x86_64__) || defined(_WIN64)
- #if !defined(SK_CPU_SSE_LEVEL) || (SK_CPU_SSE_LEVEL < SK_CPU_SSE_LEVEL_SSE2)
- #undef SK_CPU_SSE_LEVEL
- #define SK_CPU_SSE_LEVEL SK_CPU_SSE_LEVEL_SSE2
- #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
« no previous file with comments | « no previous file | src/opts/SkBitmapProcState_opts_SSSE3.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698