aboutsummaryrefslogtreecommitdiffhomepage
path: root/gn/core.gni
diff options
context:
space:
mode:
authorGravatar Mike Klein <mtklein@chromium.org>2018-03-07 15:09:17 +0000
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2018-03-07 15:09:21 +0000
commit3a4bd34478826c0457a36a8755791faf36a44e5e (patch)
tree48abeba3dff608e8c73d462e031c124dac905306 /gn/core.gni
parent22e536e3a1a09405d1c0e6f071717a726d86e8d4 (diff)
Revert "make SkJumper stages normal Skia code"
This reverts commit 22e536e3a1a09405d1c0e6f071717a726d86e8d4. Reason for revert: wrong include path :/ Original change's description: > make SkJumper stages normal Skia code > > Enough clients are using Clang now that we can say, use Clang to build > if you want these software pipeline stages to go fast. > > This lets us drop the offline build aspect of SkJumper stages, instead > building as part of Skia using the SkOpts framework. > > I think everything should work, except I've (temporarily) removed > AVX-512 support. I will put this back in a follow up. > > I have had to drop Windows down to __vectorcall and our narrower > stage calling convention that keeps the d-registers on the stack. > I tried forcing sysv_abi, but that crashed Clang. :/ > > Added a TODO to up the same narrower stage calling convention > for lowp stages... we just *don't* today, for no good reason. > > Change-Id: Iaaa792ffe4deab3508d2dc5d0008c163c24b3383 > Reviewed-on: https://skia-review.googlesource.com/110641 > Commit-Queue: Mike Klein <mtklein@chromium.org> > Reviewed-by: Herb Derby <herb@google.com> > Reviewed-by: Florin Malita <fmalita@chromium.org> TBR=mtklein@chromium.org,herb@google.com,fmalita@chromium.org Change-Id: I2bdc709c80cdfa6b13ff24e024b3721bef887f46 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://skia-review.googlesource.com/112741 Reviewed-by: Mike Klein <mtklein@chromium.org> Commit-Queue: Mike Klein <mtklein@chromium.org>
Diffstat (limited to 'gn/core.gni')
-rw-r--r--gn/core.gni20
1 files changed, 17 insertions, 3 deletions
diff --git a/gn/core.gni b/gn/core.gni
index 12a74ae93b..bcec7c02f0 100644
--- a/gn/core.gni
+++ b/gn/core.gni
@@ -440,8 +440,6 @@ skia_core_sources = [
"$_include/core/SkUnPreMultiply.h",
"$_include/core/SkVertices.h",
- "$_src/jumper/SkJumper.cpp",
-
# private
"$_include/private/SkAtomics.h",
"$_include/private/SkChecksum.h",
@@ -529,4 +527,20 @@ skia_core_sources = [
"$_src/pathops/SkReduceOrder.h",
]
-skia_core_defines = [] # Used to be used by Chromium, but no longer.
+skia_core_sources += [
+ "$_src/jumper/SkJumper.cpp",
+ "$_src/jumper/SkJumper_stages.cpp",
+ "$_src/jumper/SkJumper_stages_lowp.cpp",
+]
+skia_core_defines = []
+if (is_win) {
+ if (host_os == "win") {
+ skia_core_sources += [ "$_src/jumper/SkJumper_generated_win.S" ]
+ } else {
+ # TODO(thakis): Enable jumper in linux->win cross builds once the
+ # assembler situation is figured out, https://crbug.com/762167
+ skia_core_defines += [ "SK_JUMPER_USE_ASSEMBLY=0" ]
+ }
+} else if (target_cpu != "wasm") {
+ skia_core_sources += [ "$_src/jumper/SkJumper_generated.S" ]
+}