AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "Turn off /arch:AVX[2] on Windows builds."

Browse Source 
This reverts commit c89e2438ae.

Reason for revert: 

I'm going to stub this code out in Chrome instead for now.  Chrome's not going to land something that looks like this, so I'd rather undo it than leave Skia in this odd state.

Original change's description:
> 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>
> 

TBR=mtklein@chromium.org,brucedawson@chromium.org,reviews@skia.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true

Change-Id: I9562f7877749c61f6ba4d48d6c4b557f09876128
Reviewed-on: https://skia-review.googlesource.com/5069
Commit-Queue: Mike Klein <mtklein@chromium.org>
Reviewed-by: Mike Klein <mtklein@chromium.org>
This commit is contained in:
Mike Klein 2016-11-18 22:11:41 +00:00 committed by Skia Commit-Bot
parent 2e35e8a45c
commit 17b6e487b7
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
BUILD.gn
View File

@ -250,7 +250,7 @@ opts("avx") {
enabled = is_x86
sources = skia_opts.avx_sources
if (is_win) {
defines = [ "SK_CPU_SSE_LEVEL=SK_CPU_SSE_LEVEL_AVX" ]
cflags = [ "/arch:AVX" ]
} else {
cflags = [ "-mavx" ]
}
@ -260,7 +260,7 @@ opts("hsw") {
enabled = is_x86
sources = skia_opts.hsw_sources
if (is_win) {
defines = [ "SK_CPU_SSE_LEVEL=SK_CPU_SSE_LEVEL_AVX2" ]
cflags = [ "/arch:AVX2" ]
} else {
cflags = [
"-mavx2",

1
gn/BUILD.gn
View File

@ -261,7 +261,6 @@ 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;