diff options
author | Mike Klein <mtklein@google.com> | 2018-03-07 17:04:18 +0000 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-03-07 17:04:31 +0000 |
commit | 5cc94cc3937989e180c1c9897f15714534fc4d31 (patch) | |
tree | eaab0c34cfae2480a04a334cbfea80515f03ddd9 /src/core/SkRasterPipeline.h | |
parent | 61d56b92a4076f8afd644d015913641d691e39c8 (diff) |
Revert "Reland "make SkJumper stages normal Skia code""
This reverts commit 78cb579f33943421afc8423a39867fcfd69fed44.
Reason for revert: lowp should be controlled by defined(JUMPER_IS_SCALAR), not defined(__clang__). So close.
Original change's description:
> Reland "make SkJumper stages normal Skia code"
>
> This is a reland of 22e536e3a1a09405d1c0e6f071717a726d86e8d4
>
> Now with fixed #include paths in SkRasterPipeline_opts.h,
> and -ffp-contract=fast for the :hsw target to minimize
> diffs on non-Windows Clang AVX2/AVX-512 bots.
>
> 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>
>
> Change-Id: I44f2c03d33958e3807747e40904b6351957dd448
> Reviewed-on: https://skia-review.googlesource.com/112742
> Reviewed-by: Mike Klein <mtklein@chromium.org>
TBR=mtklein@chromium.org,herb@google.com,fmalita@chromium.org
Change-Id: Ie64da98f5187d44e03c0ce05d7cb189d4a6e6663
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/112743
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>
Diffstat (limited to 'src/core/SkRasterPipeline.h')
-rw-r--r-- | src/core/SkRasterPipeline.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/SkRasterPipeline.h b/src/core/SkRasterPipeline.h index a37ea44e0c..605eebee49 100644 --- a/src/core/SkRasterPipeline.h +++ b/src/core/SkRasterPipeline.h @@ -17,6 +17,8 @@ #include <functional> #include <vector> +struct SkJumper_Engine; + /** * SkRasterPipeline provides a cheap way to chain together a pixel processing pipeline. * @@ -161,9 +163,7 @@ private: void* ctx; }; - using StartPipelineFn = void(*)(size_t,size_t,size_t,size_t, void** program); - StartPipelineFn build_pipeline(void**) const; - + const SkJumper_Engine& build_pipeline(void**) const; void unchecked_append(StockStage, void*); SkArenaAlloc* fAlloc; |