include/core/SkPreConfig.h - Issue 216823008: Revert to old behavior regarding SK_CPU_ARM and update documentation around SK_CPU_ARM64 on iOS.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: include/core/SkPreConfig.h

Issue 216823008: Revert to old behavior regarding SK_CPU_ARM and update documentation around SK_CPU_ARM64 on iOS. (Closed) Base URL: https://skia.googlecode.com/svn/trunk

Patch Set: Created 6 years, 9 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

Index: include/core/SkPreConfig.h

diff --git a/include/core/SkPreConfig.h b/include/core/SkPreConfig.h

index 41670317d328bd67310871da36234b96015463f8..5c653f5207d4ff22552226bc5e7737bed4b11b8f 100644

--- a/include/core/SkPreConfig.h

+++ b/include/core/SkPreConfig.h

@@ -149,7 +149,7 @@

//////////////////////////////////////////////////////////////////////

// ARM defines

-#if defined(__arm__) && !defined(__APPLE__)

+#if defined(__arm__) && (!defined(__APPLE__) || !TARGET_IPHONE_SIMULATOR)

#define SK_CPU_ARM

#if defined(__GNUC__)

@@ -180,7 +180,8 @@

#endif

-#if defined(__aarch64__) && !defined(__APPLE__)

+// Disable ARM64 optimizations for iOS due to complications regarding gyp and iOS.

+#if defined(__aarch64__) && !defined(SK_BUILD_FOR_IOS)

#define SK_CPU_ARM64

#endif

« no previous file with comments | « no previous file | no next file » | no next file with comments »