diff options
author | Mike Klein <mtklein@chromium.org> | 2016-10-07 13:16:35 +0000 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-10-07 13:16:54 +0000 |
commit | 942858774831fea6e3f5f9d6c39b9538cf031bfd (patch) | |
tree | 69506ff13179ef4076f43d069ebc10707c8cea05 /src/opts/SkOpts_hsw.cpp | |
parent | 3786c7716c4796146835e60d7145cff252ed50bd (diff) |
Revert "SkRasterPipeline: 8x pipelines"
This reverts commit I1c82e5755d8e44cc0b9c6673d04b117f85d71a3a.
Reason for revert: lots of failing bots.
TBR=mtklein@chromium.org,msarett@google.com,reviews@skia.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Change-Id: I653bed3905187f43196504f19424985fa2a765b5
Reviewed-on: https://skia-review.googlesource.com/3063
Commit-Queue: Mike Klein <mtklein@chromium.org>
Reviewed-by: Mike Klein <mtklein@chromium.org>
Diffstat (limited to 'src/opts/SkOpts_hsw.cpp')
-rw-r--r-- | src/opts/SkOpts_hsw.cpp | 74 |
1 files changed, 1 insertions, 73 deletions
diff --git a/src/opts/SkOpts_hsw.cpp b/src/opts/SkOpts_hsw.cpp index c994bf6534..53e2e5acdd 100644 --- a/src/opts/SkOpts_hsw.cpp +++ b/src/opts/SkOpts_hsw.cpp @@ -7,81 +7,9 @@ #include "SkOpts.h" - #define SK_OPTS_NS hsw -#include "SkRasterPipeline_opts.h" namespace SkOpts { - void Init_hsw() { - -// The 32-bit MSVC __vectorcall ABI mangles type information into the names of -// SkOpts::body, SkOpts::tail, and SkOpts::run_pipeline, so that this code will -// not link as written: they're all defined in a file where SkRasterPipeline::V -// is Sk4f, but here we're seeing it as Sk8f. -// -// We can work around this by storing those pointers as some generic function -// pointer type like void(*)(), but it's even simpler to just not do any of this -// when targeting 32-bit Windows. -#if !defined(_M_IX86) - - run_pipeline = SK_OPTS_NS::run_pipeline; - - #define STAGE(stage) \ - body[SkRasterPipeline::stage] = SK_OPTS_NS::stage; \ - tail[SkRasterPipeline::stage] = SK_OPTS_NS::stage##_tail - - STAGE(store_565); - STAGE(store_srgb); - STAGE(store_f16); - - STAGE(load_s_565); - STAGE(load_s_srgb); - STAGE(load_s_f16); - - STAGE(load_d_565); - STAGE(load_d_srgb); - STAGE(load_d_f16); - - STAGE(scale_u8); - - STAGE(lerp_u8); - STAGE(lerp_565); - #undef STAGE - - #define STAGE(stage) \ - body[SkRasterPipeline::stage] = SK_OPTS_NS::stage; \ - tail[SkRasterPipeline::stage] = SK_OPTS_NS::stage - - STAGE(lerp_constant_float); - STAGE(constant_color); - - STAGE(dst); - STAGE(dstatop); - STAGE(dstin); - STAGE(dstout); - STAGE(dstover); - STAGE(srcatop); - STAGE(srcin); - STAGE(srcout); - STAGE(srcover); - STAGE(clear); - STAGE(modulate); - STAGE(multiply); - STAGE(plus_); - STAGE(screen); - STAGE(xor_); - STAGE(colorburn); - STAGE(colordodge); - STAGE(darken); - STAGE(difference); - STAGE(exclusion); - STAGE(hardlight); - STAGE(lighten); - STAGE(overlay); - STAGE(softlight); - #undef STAGE - -#endif // !defined(_M_IX86) - } + void Init_hsw() { } } |