diff options
| author |  Ethan Nicholas <ethannicholas@google.com> | 2017-06-27 14:36:24 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-06-27 14:36:44 +0000 |
| commit | ed50200682e0de72c3abecaa4d5324ebcd1ed9f9 (patch) | |
| tree | f991fa9668072f9b87a9929c7834b55cd9175fff /src/sksl/ir/SkSLSwizzle.h | |
| parent | ccf59917d3fe7aaf59de714acfbd0596503f324f (diff) | |
Revert "sksl fragment processor support"
This reverts commit ccf59917d3fe7aaf59de714acfbd0596503f324f.
Reason for revert: breaking iOS bots
Original change's description:
> sksl fragment processor support
>
> Bug: skia:
> Change-Id: Ia3b0305c2b0c78074303831f628fb01852b90d34
> Reviewed-on: https://skia-review.googlesource.com/17843
> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
> Reviewed-by: Ben Wagner <benjaminwagner@google.com>
> Reviewed-by: Mike Klein <mtklein@google.com>
TBR=mtklein@google.com,benjaminwagner@google.com,ethannicholas@google.com
Change-Id: I0a33060c7c42c7b44c5c13d443ac42958291c2f1
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/20962
Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
Diffstat (limited to 'src/sksl/ir/SkSLSwizzle.h')
| -rw-r--r-- | src/sksl/ir/SkSLSwizzle.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/sksl/ir/SkSLSwizzle.h b/src/sksl/ir/SkSLSwizzle.h index 442e92f348..1e36c41e41 100644 --- a/src/sksl/ir/SkSLSwizzle.h +++ b/src/sksl/ir/SkSLSwizzle.h @@ -71,8 +71,10 @@ struct Swizzle : public Expression { ASSERT(fComponents.size() >= 1 && fComponents.size() <= 4); } - std::unique_ptr<Expression> constantPropagate(const IRGenerator& irGenerator, - const DefinitionMap& definitions) override { + virtual std::unique_ptr<Expression> constantPropagate( + const IRGenerator& irGenerator, + const DefinitionMap& definitions) override { + if (fBase->fKind == Expression::kConstructor_Kind && fBase->isConstant()) { // we're swizzling a constant vector, e.g. vec4(1).x. Simplify it. ASSERT(fBase->fKind == Expression::kConstructor_Kind); |