diff options
| author |  Mike Reed <reed@google.com> | 2017-07-19 17:20:37 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-07-20 00:43:37 +0000 |
| commit | e32500f0642df381fd79731df2f7a4a4a71a46e2 (patch) | |
| tree | 05747f712923791d6df14077714cede88d9d51ff /gn | |
| parent | 3e583cba8af153952e31925e0d4bfbc71cfa43b8 (diff) | |
Assume HQ is handled by pipeline, delete legacy code-path
CQ_INCLUDE_TRYBOTS=skia.primary:Test-Debian9-GCC-GCE-CPU-AVX2-x86_64-Release-SKNX_NO_SIMD
Bug: skia:
Change-Id: If6f0d0a57463bf99a66d674e65a62ce3931d0116
Reviewed-on: https://skia-review.googlesource.com/24644
Commit-Queue: Mike Reed <reed@google.com>
Reviewed-by: Mike Klein <mtklein@chromium.org>
Diffstat (limited to 'gn')
| -rw-r--r-- | gn/bench.gni | 1 | ||||
| -rw-r--r-- | gn/core.gni | 5 | ||||
| -rw-r--r-- | gn/gn_to_bp.py | 3 | ||||
| -rw-r--r-- | gn/opts.gni | 1 | ||||
| -rw-r--r-- | gn/shared_sources.gni | 2 |
5 files changed, 2 insertions, 10 deletions
diff --git a/gn/bench.gni b/gn/bench.gni index 7560613051..a5ab7810eb 100644 --- a/gn/bench.gni +++ b/gn/bench.gni @@ -17,7 +17,6 @@ bench_sources = [ "$_bench/BitmapBench.cpp", "$_bench/BitmapRectBench.cpp", "$_bench/BitmapRegionDecoderBench.cpp", - "$_bench/BitmapScaleBench.cpp", "$_bench/BlendmodeBench.cpp", "$_bench/BlurBench.cpp", "$_bench/BlurImageFilterBench.cpp", diff --git a/gn/core.gni b/gn/core.gni index 39a80fef85..43b972f45c 100644 --- a/gn/core.gni +++ b/gn/core.gni @@ -31,7 +31,6 @@ skia_core_sources = [ "$_src/core/SkBitmapController.cpp", "$_src/core/SkBitmapDevice.cpp", "$_src/core/SkBitmapDevice.h", - "$_src/core/SkBitmapFilter.h", "$_src/core/SkBitmapProcState.cpp", "$_src/core/SkBitmapProcState.h", "$_src/core/SkBitmapProcState_filter.h", @@ -44,8 +43,6 @@ skia_core_sources = [ "$_src/core/SkBitmapProcState_utils.h", "$_src/core/SkBitmapProvider.cpp", "$_src/core/SkBitmapProvider.h", - "$_src/core/SkBitmapScaler.h", - "$_src/core/SkBitmapScaler.cpp", "$_src/core/SkBlendMode.cpp", "$_src/core/SkBlitBWMaskTemplate.h", "$_src/core/SkBlitMask.h", @@ -89,8 +86,6 @@ skia_core_sources = [ "$_src/core/SkColorTable.cpp", "$_src/core/SkConvertPixels.cpp", "$_src/core/SkConvertPixels.h", - "$_src/core/SkConvolver.cpp", - "$_src/core/SkConvolver.h", "$_src/core/SkCoreBlitters.h", "$_src/core/SkCpu.cpp", "$_src/core/SkCpu.h", diff --git a/gn/gn_to_bp.py b/gn/gn_to_bp.py index 3fc30a03b5..2056c4274f 100644 --- a/gn/gn_to_bp.py +++ b/gn/gn_to_bp.py @@ -294,8 +294,7 @@ with open('Android.bp', 'w') as f: defs['ssse3'] + defs['sse41'] + defs['sse42'] + - defs['avx' ] + - defs['hsw' ])), + defs['avx' ])), 'tool_cflags' : bpfmt(8, tool_cflags), 'tool_shared_libs' : bpfmt(8, tool_shared_libs), diff --git a/gn/opts.gni b/gn/opts.gni index 34481db3b6..1cc6027af2 100644 --- a/gn/opts.gni +++ b/gn/opts.gni @@ -51,4 +51,3 @@ ssse3 = [ sse41 = [ "$_src/opts/SkOpts_sse41.cpp" ] sse42 = [ "$_src/opts/SkOpts_sse42.cpp" ] avx = [ "$_src/opts/SkOpts_avx.cpp" ] -hsw = [ "$_src/opts/SkOpts_hsw.cpp" ] diff --git a/gn/shared_sources.gni b/gn/shared_sources.gni index 6df999921a..29cac671a4 100644 --- a/gn/shared_sources.gni +++ b/gn/shared_sources.gni @@ -24,7 +24,7 @@ skia_opts = { sse41_sources = sse41 sse42_sources = sse42 avx_sources = avx - hsw_sources = hsw + hsw_sources = [] # remove after we update Chrome } # Skia Chromium defines. These flags will be defined in chromium If these |