aboutsummaryrefslogtreecommitdiffhomepage
path: root/gyp
diff options
context:
space:
mode:
authorGravatar reed <reed@chromium.org>2014-07-06 18:51:29 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2014-07-06 18:51:29 -0700
commit82cb86f613300aa26f858e8f46454b1a8a5e2314 (patch)
treec59a70914f0aa5d799ffd41ef996b72fb7196869 /gyp
parentd930511ee73bf0ddc8bdf570ec23a17dd3e19709 (diff)
Revert of Add SSE4 version of BlurImage optimizations. (https://codereview.chromium.org/366593004/)
Reason for revert: breaks linker on chrome [04:36:09.966000] [503/5965] LIB obj\chrome\installer_util.lib [04:36:10.466000] FAILED: C:\Users\chrome-bot\buildbot\third_party\depot_tools\python276_bin\python.exe gyp-win-tool link-with-manifests environment.x86 True skia.dll "C:\Users\chrome-bot\buildbot\third_party\depot_tools\python276_bin\python.exe gyp-win-tool link-wrapper environment.x86 False link.exe /nologo /IMPLIB:skia.dll.lib /DLL /OUT:skia.dll @skia.dll.rsp" 2 mt.exe rc.exe "obj\skia\skia.skia.dll.intermediate.manifest" obj\skia\skia.skia.dll.generated.manifest [04:36:10.466000] skia.opts_check_x86.obj : error LNK2019: unresolved external symbol "bool __cdecl SkBoxBlurGetPlatformProcs_SSE4(void (__cdecl**)(unsigned int const *,int,unsigned int *,int,int,int,int,int),void (__cdecl**)(unsigned int const *,int,unsigned int *,int,int,int,int,int),void (__cdecl**)(unsigned int const *,int,unsigned int *,int,int,int,int,int),void (__cdecl**)(unsigned int const *,int,unsigned int *,int,int,int,int,int))" (?SkBoxBlurGetPlatformProcs_SSE4@@YA_NPAP6AXPBIHPAIHHHHH@Z222@Z) referenced in function "bool __cdecl SkBoxBlurGetPlatformProcs(void (__cdecl**)(unsigned int const *,int,unsigned int *,int,int,int,int,int),void (__cdecl**)(unsigned int const *,int,unsigned int *,int,int,int,int,int),void (__cdecl**)(unsigned int const *,int,unsigned int *,int,int,int,int,int),void (__cdecl**)(unsigned int const *,int,unsigned int *,int,int,int,int,int))" (?SkBoxBlurGetPlatformProcs@@YA_NPAP6AXPBIHPAIHHHHH@Z222@Z) [04:36:10.466000] [04:36:10.466000] skia.dll : fatal error LNK1120: 1 unresolved externals Original issue's description: > Add SSE4 version of BlurImage optimizations. > > Adds an SSE4.1 version of the existing BlurImage optimizations. > Performance of blur_image_filter_* benchmarks show a 10-50% > improvement on Linux/Ubuntu Core i7. > > Signed-off-by: Henrik Smiding <henrik.smiding@intel.com> > > Committed: https://skia.googlesource.com/skia/+/2830632ce93c97ed7647b13348365ea92e4ea665 R=mtklein@google.com, henrik.smiding@intel.com TBR=henrik.smiding@intel.com, mtklein@google.com NOTREECHECKS=true NOTRY=true Author: reed@chromium.org Review URL: https://codereview.chromium.org/375503003
Diffstat (limited to 'gyp')
-rw-r--r--gyp/opts.gyp33
1 files changed, 8 insertions, 25 deletions
diff --git a/gyp/opts.gyp b/gyp/opts.gyp
index 653006d0e3..85c8c503fa 100644
--- a/gyp/opts.gyp
+++ b/gyp/opts.gyp
@@ -212,39 +212,22 @@
'../src/core',
],
'conditions': [
- [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl", "chromeos", "android"] \
+ [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl", "chromeos", "android", "mac"] \
and not skia_android_framework', {
'cflags': [
'-msse4',
],
}],
- [ 'skia_os == "mac"', {
- 'xcode_settings': {
- 'OTHER_CPLUSPLUSFLAGS!': [
- '-mssse3',
- ],
- 'OTHER_CPLUSPLUSFLAGS': [
- '-msse4',
- ],
- },
- }],
- [ 'skia_arch_type == "x86"', {
+ [ 'skia_arch_width == 64 and 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',
- ],
- }],
+ '../src/opts/SkBlitRow_opts_SSE4_x64_asm.S',
],
}],
+ [ 'skia_arch_width == 32 and skia_arch_type == "x86"', {
+ 'sources': [
+ '../src/opts/SkBlitRow_opts_SSE4_asm.S',
+ ],
+ }],
],
},
# NEON code must be compiled with -mfpu=neon which also affects scalar