diff options
| author |  Mike Klein <mtklein@chromium.org> | 2017-03-07 10:04:05 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-03-08 14:18:57 +0000 |
| commit | 135555101cbde68656f028c41506113374a4026f (patch) | |
| tree | 4b22ee04418ce39fc298b2f08932f36e54cb6eaa | |
| parent | 33fdb8d353b35bb4ab20efd1b0fafecd423f4ebe (diff) | |
Turn on SkJumper all the time.
If the previous CL sticks, it's now easy to turn on SkJumper everywhere:
I was mostly holding back because of build system complexity.
This has the main effect of turning on SkJumper in Chromium.
It's already been on on our local test bots and on Android framework.
Change-Id: I7fbfc6aaaa7dace9c3f2cb509583c69b10997dbf
Reviewed-on: https://skia-review.googlesource.com/9380
Reviewed-by: Mike Klein <mtklein@chromium.org>
Commit-Queue: Mike Klein <mtklein@chromium.org>
| -rw-r--r-- | BUILD.gn | 12 | ||||
| -rw-r--r-- | gn/core.gni | 4 | ||||
| -rw-r--r-- | gn/gn_to_bp.py | 1 | ||||
| -rw-r--r-- | src/core/SkRasterPipeline.cpp | 2 |
4 files changed, 4 insertions, 15 deletions
@@ -30,7 +30,6 @@ declare_args() { skia_enable_android_framework_defines = false skia_enable_discrete_gpu = true skia_enable_effects = true - skia_enable_jumper = is_skia_dev_build skia_enable_gpu = true skia_enable_pdf = true skia_enable_tools = is_skia_dev_build @@ -500,16 +499,6 @@ optional("raw") { ] } -optional("jumper") { - enabled = skia_enable_jumper - public_defines = [ "SK_JUMPER" ] - sources = [ - "src/jumper/SkJumper.cpp", - "src/jumper/SkJumper_generated.cpp", - "src/jumper/SkJumper_stages.cpp", - ] -} - optional("typeface_freetype") { enabled = skia_use_freetype @@ -569,7 +558,6 @@ component("skia") { ":gpu", ":hsw", ":jpeg", - ":jumper", ":none", ":pdf", ":png", diff --git a/gn/core.gni b/gn/core.gni index 3b71c45f49..56dd13feeb 100644 --- a/gn/core.gni +++ b/gn/core.gni @@ -381,6 +381,10 @@ skia_core_sources = [ # "$_src/image/SkSurface_Gpu.cpp", "$_src/image/SkSurface_Raster.cpp", + "$_src/jumper/SkJumper.cpp", + "$_src/jumper/SkJumper_generated.cpp", + "$_src/jumper/SkJumper_stages.cpp", + "$_src/pipe/SkPipeCanvas.cpp", "$_src/pipe/SkPipeReader.cpp", diff --git a/gn/gn_to_bp.py b/gn/gn_to_bp.py index 487bdffd1e..c8c7079a89 100644 --- a/gn/gn_to_bp.py +++ b/gn/gn_to_bp.py @@ -192,7 +192,6 @@ cc_test { # We'll run GN to get the main source lists and include directories for Skia. gn_args = { 'is_official_build': 'true', - 'skia_enable_jumper': 'true', 'skia_enable_tools': 'true', 'skia_use_vulkan': 'true', 'target_cpu': '"none"', diff --git a/src/core/SkRasterPipeline.cpp b/src/core/SkRasterPipeline.cpp index 42f0212f1a..3e3fe3bd85 100644 --- a/src/core/SkRasterPipeline.cpp +++ b/src/core/SkRasterPipeline.cpp @@ -22,11 +22,9 @@ void SkRasterPipeline::extend(const SkRasterPipeline& src) { void SkRasterPipeline::run(size_t x, size_t n) const { if (!fStages.empty()) { - #if defined(SK_JUMPER) if (this->run_with_jumper(x, n)) { return; } - #endif SkOpts::run_pipeline(x,n, fStages.data(), SkToInt(fStages.size())); } } |