diff options
| author |  Mike Klein <mtklein@chromium.org> | 2018-03-07 15:09:17 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-03-07 15:09:21 +0000 |
| commit | 3a4bd34478826c0457a36a8755791faf36a44e5e (patch) | |
| tree | 48abeba3dff608e8c73d462e031c124dac905306 /src/core/SkOpts.cpp | |
| parent | 22e536e3a1a09405d1c0e6f071717a726d86e8d4 (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 'src/core/SkOpts.cpp')
| -rw-r--r-- | src/core/SkOpts.cpp | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/src/core/SkOpts.cpp b/src/core/SkOpts.cpp index dbf60eaca5..8a3d30e334 100644 --- a/src/core/SkOpts.cpp +++ b/src/core/SkOpts.cpp @@ -40,7 +40,6 @@ #include "SkBlitRow_opts.h" #include "SkChecksum_opts.h" #include "SkMorphologyImageFilter_opts.h" -#include "SkRasterPipeline_opts.h" #include "SkSwizzler_opts.h" #include "SkUtils_opts.h" #include "SkXfermode_opts.h" @@ -82,26 +81,11 @@ namespace SkOpts { #undef DEFINE_DEFAULT -#define M(st) (StageFn)SK_OPTS_NS::st, - StageFn stages_highp[] = { SK_RASTER_PIPELINE_STAGES(M) }; - StageFn just_return_highp = (StageFn)SK_OPTS_NS::just_return; - void (*start_pipeline_highp)(size_t,size_t,size_t,size_t,void**) - = SK_OPTS_NS::start_pipeline; -#undef M - -#define M(st) (StageFn)SK_OPTS_NS::lowp::st, - StageFn stages_lowp[] = { SK_RASTER_PIPELINE_STAGES(M) }; - StageFn just_return_lowp = (StageFn)SK_OPTS_NS::lowp::just_return; - void (*start_pipeline_lowp)(size_t,size_t,size_t,size_t,void**) - = SK_OPTS_NS::lowp::start_pipeline; -#undef M - // Each Init_foo() is defined in src/opts/SkOpts_foo.cpp. void Init_ssse3(); void Init_sse41(); void Init_sse42(); void Init_avx(); - void Init_hsw(); void Init_crc32(); static void init() { @@ -120,8 +104,7 @@ namespace SkOpts { #endif #if SK_CPU_SSE_LEVEL < SK_CPU_SSE_LEVEL_AVX - if (SkCpu::Supports(SkCpu::AVX)) { Init_avx(); } - if (SkCpu::Supports(SkCpu::HSW)) { Init_hsw(); } + if (SkCpu::Supports(SkCpu::AVX )) { Init_avx(); } #endif #elif defined(SK_CPU_ARM64) |