diff options
| author | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-11 10:25:47 +0000 |
|---|---|---|
| committer | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-11 10:25:47 +0000 |
| commit | c12710a590811adb2c26707c4677b3d763514ecc (patch) | |
| tree | 1a28f02b6dd01c7c2bdeae166a1c17f07a814896 /third_party/qcms | |
| parent | 62f231901d588f789998a8d86e9791c43ea67e86 (diff) | |
| download | chromium_src-c12710a590811adb2c26707c4677b3d763514ecc.zip chromium_src-c12710a590811adb2c26707c4677b3d763514ecc.tar.gz chromium_src-c12710a590811adb2c26707c4677b3d763514ecc.tar.bz2 | |
Reenable SSE2 for QCMS on Win64.
Note that the SSE1 code is left out since MSVC doesn't support the particular __m64 MMX intrinsics it uses:
http://msdn.microsoft.com/en-us/library/08x3t697.aspx
BUG=179657
Review URL: https://codereview.chromium.org/185743003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@256183 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/qcms')
| -rw-r--r-- | third_party/qcms/qcms.gyp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/third_party/qcms/qcms.gyp b/third_party/qcms/qcms.gyp index 1608a27..4cfa67a 100644 --- a/third_party/qcms/qcms.gyp +++ b/third_party/qcms/qcms.gyp @@ -33,11 +33,9 @@ 'variables': { 'conditions': [ # For x86, turn off SSE2 for non-CrOS *nix Chrome builds. - # TODO(jschuh): Get MMX enabled on Win64. crbug.com/179657 ['disable_sse2==1 or \ (branding=="Chrome" and target_arch=="ia32" and \ - os_posix==1 and OS!="mac" and chromeos==0) or \ - (OS=="win" and target_arch=="x64")', { + os_posix==1 and OS!="mac" and chromeos==0)', { 'qcms_use_sse': 0, }, { 'qcms_use_sse': 1, @@ -55,6 +53,13 @@ 'src/transform-sse2.c', ], }], + # MSVC x64 doesn't support the MMX intrinsics present in the SSE1 code, + # but that's OK since qcms prefers using SSE2 when available. + [ 'qcms_use_sse==1 and OS=="win" and target_arch=="x64"', { + 'sources!': [ + 'src/transform-sse1.c', + ], + }], ['OS == "win" and (MSVS_VERSION == "2013" or MSVS_VERSION == "2013e")', { 'msvs_disabled_warnings': [ 4056, # overflow in floating-point constant arithmetic (INFINITY) |