Turn on SkJumper all the time, try 2.

Rebased on top of _win.S change, which I hope lands first.

CQ_INCLUDE_TRYBOTS=master.tryserver.blink:linux_trusty_blink_rel;master.tryserver.chromium.linux:linux_optional_gpu_tests_rel;master.tryserver.chromium.mac:mac_optional_gpu_tests_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel,win_chrome_official,win_chromium_dbg_ng,win_chromium_rel_ng,win_chromium_compile_dbg_ng,win_chromium_compile_rel_ng,win_clang;master.tryserver.chromium.android:android_optional_gpu_tests_rel

Change-Id: I30e97dbb55b8a42251b46f5607096ca12bc670b9
Reviewed-on: https://skia-review.googlesource.com/10462
Commit-Queue: Mike Klein <mtklein@chromium.org>
Reviewed-by: Herb Derby <herb@google.com>

5 files changed, 11 insertions, 20 deletions

diff --git a/BUILD.gn b/BUILD.gn
index b84a0a76f6..7d4ac6dc1b 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -31,7 +31,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_spirv_validation = is_skia_dev_build && is_debug
@@ -513,20 +512,6 @@ optional("raw") {
   ]
 }
 
-optional("jumper") {
-  enabled = skia_enable_jumper
-  public_defines = [ "SK_JUMPER" ]
-  sources = [
-    "src/jumper/SkJumper.cpp",
-    "src/jumper/SkJumper_stages.cpp",
-  ]
-  if (is_win) {
-    sources += [ "src/jumper/SkJumper_generated_win.S" ]
-  } else {
-    sources += [ "src/jumper/SkJumper_generated.S" ]
-  }
-}
-
 optional("typeface_freetype") {
   enabled = skia_use_freetype
 
@@ -586,7 +571,6 @@ component("skia") {
     ":gpu",
     ":hsw",
     ":jpeg",
-    ":jumper",
     ":none",
     ":pdf",
     ":png",
diff --git a/gn/core.gni b/gn/core.gni
index fa65f25eea..e95d22557f 100644
--- a/gn/core.gni
+++ b/gn/core.gni
@@ -540,3 +540,13 @@ skia_core_sources = [
   "$_src/pathops/SkPathWriter.h",
   "$_src/pathops/SkReduceOrder.h",
 ]
+
+skia_core_sources += [
+  "$_src/jumper/SkJumper.cpp",
+  "$_src/jumper/SkJumper_stages.cpp",
+]
+if (is_win) {
+  skia_core_sources += [ "$_src/jumper/SkJumper_generated_win.S" ]
+} else {
+  skia_core_sources += [ "$_src/jumper/SkJumper_generated.S" ]
+}
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/public.bzl b/public.bzl
index 89b80a43a4..4373738738 100644
--- a/public.bzl
+++ b/public.bzl
@@ -62,6 +62,7 @@ BASE_SRCS_ALL = struct(
         "src/**/*.h",
         "src/**/*.cpp",
         "src/**/*.inc",
+        "src/jumper/SkJumper_generated.S",
 
         # Third Party
         "third_party/etc1/*.cpp",
@@ -83,7 +84,6 @@ BASE_SRCS_ALL = struct(
         "src/gpu/gl/mac/*",
         "src/gpu/gl/win/*",
         "src/images/*",
-        "src/jumper/*",
         "src/opts/**/*",
         "src/ports/**/*",
         "src/utils/android/**/*",
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()));
     }
 }