From 429a9ffa075b7da1910145c018d97f28418d6ed2 Mon Sep 17 00:00:00 2001 From: caryclark Date: Tue, 4 Oct 2016 06:32:58 -0700 Subject: update skia to latest sources Update clip to use intersect verb from canvas. R=dsinclair@chromium.org Review-Url: https://codereview.chromium.org/2384283002 --- skia/BUILD.gn | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) (limited to 'skia') diff --git a/skia/BUILD.gn b/skia/BUILD.gn index 61790ebab3..43342b61a1 100644 --- a/skia/BUILD.gn +++ b/skia/BUILD.gn @@ -175,18 +175,17 @@ component("skia") { sources += skia_effects_sources sources += skia_utils_sources sources += [ - "//third_party/skia/src/ports/SkImageGenerator_none.cpp", - "//third_party/skia/src/fonts/SkFontMgr_indirect.cpp", "//third_party/skia/src/fonts/SkRemotableFontMgr.cpp", - "//third_party/skia/src/ports/SkFontHost_FreeType_common.cpp", "//third_party/skia/src/ports/SkFontHost_FreeType.cpp", + "//third_party/skia/src/ports/SkFontHost_FreeType_common.cpp", "//third_party/skia/src/ports/SkFontHost_win.cpp", "//third_party/skia/src/ports/SkFontMgr_android.cpp", "//third_party/skia/src/ports/SkFontMgr_android_factory.cpp", "//third_party/skia/src/ports/SkFontMgr_android_parser.cpp", "//third_party/skia/src/ports/SkGlobalInitialization_default.cpp", "//third_party/skia/src/ports/SkImageEncoder_none.cpp", + "//third_party/skia/src/ports/SkImageGenerator_none.cpp", "//third_party/skia/src/ports/SkOSFile_posix.cpp", "//third_party/skia/src/ports/SkOSFile_stdio.cpp", "//third_party/skia/src/ports/SkOSFile_win.cpp", @@ -415,10 +414,16 @@ if (current_cpu == "x86" || current_cpu == "x64") { "//build/config/compiler:no_chromium_code", ] } - source_set("skia_opts_avx2") { - sources = skia_opts.avx2_sources + source_set("skia_opts_hsw") { + sources = skia_opts.hsw_sources if (!is_win) { - cflags = [ "-mavx2" ] + cflags = [ + "-mavx2", + "-mbmi", + "-mbmi2", + "-mf16c", + "-mfma", + ] } if (is_win) { cflags = [ "/arch:AVX2" ] @@ -440,7 +445,7 @@ source_set("skia_opts") { sources = skia_opts.sse2_sources deps = [ ":skia_opts_avx", - ":skia_opts_avx2", + ":skia_opts_hsw", ":skia_opts_sse3", ":skia_opts_sse41", ":skia_opts_sse42", -- cgit v1.2.3