diff options
author | Mike Klein <mtklein@chromium.org> | 2016-11-18 12:55:21 -0500 |
---|---|---|
committer | Mike Klein <mtklein@chromium.org> | 2016-11-18 17:59:30 +0000 |
commit | c89e2438ae24c862087f8ca1cb076052edbb27ea (patch) | |
tree | 9dfbf620acaa68d2252d44f336fa0cb9d7e9b92c | |
parent | 9de9230b6c8409d21ce8947568a38909abaae990 (diff) |
Turn off /arch:AVX[2] on Windows builds.
This canaries a similar change Chrome may need.
BUG=chromium:666707
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=5005
Change-Id: Ibf7f9941968d905d865b9be1e63ebbf768870175
Reviewed-on: https://skia-review.googlesource.com/5005
Reviewed-by: Mike Klein <mtklein@chromium.org>
Commit-Queue: Mike Klein <mtklein@chromium.org>
-rw-r--r-- | BUILD.gn | 4 | ||||
-rw-r--r-- | gn/BUILD.gn | 1 |
2 files changed, 3 insertions, 2 deletions
@@ -250,7 +250,7 @@ opts("avx") { enabled = is_x86 sources = skia_opts.avx_sources if (is_win) { - cflags = [ "/arch:AVX" ] + defines = [ "SK_CPU_SSE_LEVEL=SK_CPU_SSE_LEVEL_AVX" ] } else { cflags = [ "-mavx" ] } @@ -260,7 +260,7 @@ opts("hsw") { enabled = is_x86 sources = skia_opts.hsw_sources if (is_win) { - cflags = [ "/arch:AVX2" ] + defines = [ "SK_CPU_SSE_LEVEL=SK_CPU_SSE_LEVEL_AVX2" ] } else { cflags = [ "-mavx2", diff --git a/gn/BUILD.gn b/gn/BUILD.gn index 60dddffd40..4be4d977bf 100644 --- a/gn/BUILD.gn +++ b/gn/BUILD.gn @@ -261,6 +261,7 @@ config("warnings") { "/wd4244", # conversion from 'float' to 'int', possible loss of data "/wd4267", # conversion from 'size_t' to 'int', possible loss of data "/wd4800", # forcing value to bool 'true' or 'false' (performance warning) + "/wd4752", # We use AVX but don't let the compiler do so itself. See crbug.com/666707. # Probably only triggers when /EHsc is enabled. "/wd4291", # no matching operator delete found; |