diff options
author | Mike Klein <mtklein@chromium.org> | 2018-03-10 12:37:11 -0500 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-03-11 15:47:59 +0000 |
commit | e8de02456a10720bc243e5bd51bd4edc9b24ad39 (patch) | |
tree | 60e215e0fba26ed4e3ae9b8434d884dc578127c7 /src/shaders | |
parent | 6f5bfdca206522dbc9c9a86ca32a54e36f33e1b7 (diff) |
with no more offline codegen, seed_shader can be normal
We passed this iota array as an argument before because it was
generating awkward code for our object file parser to handle
(relocations, other weird things, can't quite remember).
Now that we're compiling pipeline code normally, we can make seed_shader
a normal stage again, with no special iota ctx pointer needed.
Change-Id: I3929d61bfb6f914248f360c2c2326ce3d1f23163
Reviewed-on: https://skia-review.googlesource.com/113667
Reviewed-by: Herb Derby <herb@google.com>
Commit-Queue: Mike Klein <mtklein@chromium.org>
Diffstat (limited to 'src/shaders')
-rw-r--r-- | src/shaders/SkImageShader.cpp | 2 | ||||
-rw-r--r-- | src/shaders/SkShader.cpp | 2 | ||||
-rw-r--r-- | src/shaders/gradients/SkGradientShader.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/shaders/SkImageShader.cpp b/src/shaders/SkImageShader.cpp index a76edc053c..c3e6931baf 100644 --- a/src/shaders/SkImageShader.cpp +++ b/src/shaders/SkImageShader.cpp @@ -341,7 +341,7 @@ bool SkImageShader::onAppendStages(const StageRec& rec) const { } } - p->append_seed_shader(); + p->append(SkRasterPipeline::seed_shader); struct MiscCtx { std::unique_ptr<SkBitmapController::State> state; diff --git a/src/shaders/SkShader.cpp b/src/shaders/SkShader.cpp index 17b56a2e27..2dcba94983 100644 --- a/src/shaders/SkShader.cpp +++ b/src/shaders/SkShader.cpp @@ -232,7 +232,7 @@ bool SkShaderBase::onAppendStages(const StageRec& rec) const { }; if (cb->ctx) { - rec.fPipeline->append_seed_shader(); + rec.fPipeline->append(SkRasterPipeline::seed_shader); rec.fPipeline->append(SkRasterPipeline::callback, cb); return true; } diff --git a/src/shaders/gradients/SkGradientShader.cpp b/src/shaders/gradients/SkGradientShader.cpp index e5f0c7f33c..a6fb4e94bd 100644 --- a/src/shaders/gradients/SkGradientShader.cpp +++ b/src/shaders/gradients/SkGradientShader.cpp @@ -289,7 +289,7 @@ bool SkGradientShaderBase::onAppendStages(const StageRec& rec) const { SkRasterPipeline_<256> postPipeline; - p->append_seed_shader(); + p->append(SkRasterPipeline::seed_shader); p->append_matrix(alloc, matrix); this->appendGradientStages(alloc, p, &postPipeline); |