diff options
| author |  bungeman <bungeman@google.com> | 2014-07-23 11:28:18 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-07-23 11:28:18 -0700 |
| commit | 2da0f85488879d7e3072fb6449b20eca5e1b4ec5 (patch) | |
| tree | ea245f0fd5f2d028a831ce00d9249d1e603d3b8f /gyp | |
| parent | ddb459e746dba8c0d20de1f5c01e9d77379f99e1 (diff) | |
Revert of Enable the SSSE3 compile time check on all platforms. (https://codereview.chromium.org/403583002/)
Reason for revert:
This is blocking the roll. Chromium Windows trybots (like win_chromium_x64_rel) are crashing in the SSSE3 code (for example SkCanvasVideoRenderTest.CroppedFrame).
Original issue's description:
> Enable the SSSE3 compile time check on all platforms (3rd attempt)
>
> BUG=skia:2746
>
> Committed: https://skia.googlesource.com/skia/+/933834851f9d48fbd85b728cc92e1f0134bfaa4e
R=halcanary@google.com, mtklein@google.com, djsollen@google.com
TBR=djsollen@google.com, halcanary@google.com, mtklein@google.com
NOTREECHECKS=true
NOTRY=true
BUG=skia:2746
Author: bungeman@google.com
Review URL: https://codereview.chromium.org/418523002
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/common_conditions.gypi | 5 | ||||
| -rw-r--r-- | gyp/opts.gyp | 50 |
2 files changed, 25 insertions, 30 deletions
diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi index abb47502b6..69f1ddbcd4 100644 --- a/gyp/common_conditions.gypi +++ b/gyp/common_conditions.gypi @@ -646,11 +646,6 @@ '-fuse-ld=gold', ], 'conditions': [ - [ 'skia_arch_type == "x86"', { - 'cflags': [ - '-mssse3', - ], - }], [ 'skia_android_framework', { 'libraries!': [ '-lstdc++', diff --git a/gyp/opts.gyp b/gyp/opts.gyp index 55306e4ee1..0c1bc0a0c9 100644 --- a/gyp/opts.gyp +++ b/gyp/opts.gyp @@ -188,20 +188,19 @@ '../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 @@ -221,27 +220,11 @@ '../src/core', '../src/utils', ], - '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', - ], - }], - [ 'skia_os == "win"', { - 'defines' : [ 'SK_CPU_SSE_LEVEL=41' ], - }], [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl", "chromeos", "android"] \ and not skia_android_framework', { 'cflags': [ - '-msse4.1', + '-msse4', ], }], [ 'skia_os == "mac"', { @@ -250,10 +233,27 @@ '-mssse3', ], 'OTHER_CPLUSPLUSFLAGS': [ - '-msse4.1', + '-msse4', ], }, }], + [ '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 |