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

Unified Diff: gyp/opts.gyp

Issue 403583002: Enable the SSSE3 compile time check on all platforms. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: equals Created 6 years, 5 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: gyp/opts.gyp
diff --git a/gyp/opts.gyp b/gyp/opts.gyp
index 0c1bc0a0c9b07aa20882961fa2732a823715dd8e..eded863f882fdacdfb30e34848a620018f8dde0d 100644
--- a/gyp/opts.gyp
+++ b/gyp/opts.gyp
@@ -188,19 +188,20 @@
'../src/core',
'../src/utils',
],
+ 'sources': [
+ '../src/opts/SkBitmapProcState_opts_SSSE3.cpp',
+ ],
'conditions': [
+ [ 'skia_os == "win"', {
+ 'defines' : [ 'SK_CPU_SSE_LEVEL=31' ],
+ }],
+ # (Mac has -mssse3 globally.)
[ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl", "chromeos", "android"] \
and not skia_android_framework', {
'cflags': [
'-mssse3',
],
}],
- # (Mac has -mssse3 globally.)
- [ 'skia_arch_type == "x86"', {
- 'sources': [
- '../src/opts/SkBitmapProcState_opts_SSSE3.cpp',
- ],
- }],
],
},
# For the same lame reasons as what is done for skia_opts, we also have to
@@ -220,11 +221,29 @@
'../src/core',
'../src/utils',
],
+ 'sources': [
+ '../src/opts/SkBlurImage_opts_SSE4.cpp',
+ ],
+ 'conditions': [
+ [ 'skia_os == "win"', {
+ 'defines' : [ 'SK_CPU_SSE_LEVEL=41' ],
+ }],
+ [ 'skia_arch_width == 64', {
+ 'sources': [
+ '../src/opts/SkBlitRow_opts_SSE4_x64_asm.S',
+ ],
+ }],
+ [ 'skia_arch_width == 32', {
+ 'sources': [
+ '../src/opts/SkBlitRow_opts_SSE4_asm.S',
+ ],
+ }],
+ ],
hal.canary 2014/07/21 19:48:28 Delete lines 241 and 242.
'conditions': [
[ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl", "chromeos", "android"] \
and not skia_android_framework', {
'cflags': [
- '-msse4',
+ '-msse4.1',
],
}],
[ 'skia_os == "mac"', {
@@ -233,27 +252,10 @@
'-mssse3',
],
'OTHER_CPLUSPLUSFLAGS': [
- '-msse4',
+ '-msse4.1',
],
},
}],
- [ 'skia_arch_type == "x86"', {
- 'sources': [
- '../src/opts/SkBlurImage_opts_SSE4.cpp',
- ],
- 'conditions': [
- [ 'skia_arch_width == 64', {
- 'sources': [
- '../src/opts/SkBlitRow_opts_SSE4_x64_asm.S',
- ],
- }],
- [ 'skia_arch_width == 32', {
- 'sources': [
- '../src/opts/SkBlitRow_opts_SSE4_asm.S',
- ],
- }],
- ],
- }],
],
},
# NEON code must be compiled with -mfpu=neon which also affects scalar

Powered by Google App Engine
This is Rietveld 408576698