diff options
| author |  Florin Malita <fmalita@chromium.org> | 2017-01-29 16:42:42 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-01-29 16:42:52 +0000 |
| commit | 5ce33efa7c91a638c0dc94f539c9597a954fd529 (patch) | |
| tree | 6c5cf2903e28d73fd2790cbed64f506cc46239b3 /include | |
| parent | 6d11ed2951fadc281433606a8edc6774bed39735 (diff) | |
Revert "SkRasterPipeline shader adapter"
This reverts commit 6d11ed2951fadc281433606a8edc6774bed39735.
Build failure: https://chromium-swarm.appspot.com/task?id=3403da0cdee8c210&refresh=10
../../../src/core/SkOpts.cpp -o obj/src/core/libskia.SkOpts.o
In file included from ../../../src/core/SkOpts.cpp:46:
../../../src/opts/SkRasterPipeline_opts.h:1093:11: error: no member named 'Load4' in '(anonymous namespace)::SkNx<8, float>'
SkNf::Load4(buf, &r, &g, &b, &a);
~~~~~~^
1 error generated.
Leak: https://chromium-swarm.appspot.com/task?id=3403df55fd5eaa10&refresh=10
Original change's description:
> SkRasterPipeline shader adapter
>
> (lifted from https://skia-review.googlesource.com/c/7088/)
>
> R=​mtklein@google.com,herb@google.com,reed@google.com
>
> CQ_INCLUDE_TRYBOTS=skia.primary:Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-SKNX_NO_SIMD
>
> Change-Id: Idddb84069423c5fc535bea0a65a5b21a4d07084d
> Reviewed-on: https://skia-review.googlesource.com/7615
> Commit-Queue: Florin Malita <fmalita@chromium.org>
> Reviewed-by: Mike Klein <mtklein@chromium.org>
> Reviewed-by: Mike Reed <reed@google.com>
>
TBR=mtklein@chromium.org,mtklein@google.com,herb@google.com,fmalita@chromium.org,reed@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
CQ_INCLUDE_TRYBOTS=skia.primary:Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-SKNX_NO_SIMD
Change-Id: I68c0be3398bde93cd0842baf25b025c5fe1c3df7
Reviewed-on: https://skia-review.googlesource.com/7730
Commit-Queue: Florin Malita <fmalita@chromium.org>
Reviewed-by: Florin Malita <fmalita@chromium.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/core/SkShader.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/core/SkShader.h b/include/core/SkShader.h index 30a10dcc9f..a885f0b982 100644 --- a/include/core/SkShader.h +++ b/include/core/SkShader.h @@ -503,7 +503,9 @@ protected: virtual bool onAppendStages(SkRasterPipeline*, SkColorSpace*, SkArenaAlloc*, const SkMatrix&, const SkPaint&, - const SkMatrix* /*local matrix*/) const; + const SkMatrix* /*local matrix*/) const { + return false; + } private: // This is essentially const, but not officially so it can be modified in |