diff options
| author |  Ethan Nicholas <ethannicholas@google.com> | 2018-07-12 14:02:00 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-07-19 19:00:55 +0000 |
| commit | 97ae0c89025dfd791047f5701e57d58da37c125c (patch) | |
| tree | d944775c2c88dd36d5e40fb6c1bae5c7c2376e3b /src/sksl/ir/SkSLProgram.h | |
| parent | 310f44d3d5298becdd8ab235af29789f6ed769b5 (diff) | |
Revert "Revert "added GrSkSLFP and converted DitherEffect to use it""
This reverts commit f2030783094e502fb74221077a5ee7cb41287fe4.
Bug: skia:
Change-Id: Icaaa8b3ea652a8f126bfbcc788a360493a7ebe3e
Reviewed-on: https://skia-review.googlesource.com/137391
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'src/sksl/ir/SkSLProgram.h')
| -rw-r--r-- | src/sksl/ir/SkSLProgram.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/sksl/ir/SkSLProgram.h b/src/sksl/ir/SkSLProgram.h index 9f140877b7..59c91229f8 100644 --- a/src/sksl/ir/SkSLProgram.h +++ b/src/sksl/ir/SkSLProgram.h @@ -39,6 +39,10 @@ struct Program { : fKind(kInt_Kind) , fValue(i) {} + Value(unsigned int i) + : fKind(kInt_Kind) + , fValue(i) {} + std::unique_ptr<Expression> literal(const Context& context, int offset) const { switch (fKind) { case Program::Settings::Value::kBool_Kind: @@ -192,7 +196,7 @@ struct Program { kVertex_Kind, kGeometry_Kind, kFragmentProcessor_Kind, - kCPU_Kind + kPipelineStage_Kind }; Program(Kind kind, @@ -252,10 +256,13 @@ struct Program { // because destroying elements can modify reference counts in symbols std::shared_ptr<SymbolTable> fSymbols; Inputs fInputs; + bool fIsOptimized = false; private: std::vector<std::unique_ptr<ProgramElement>>* fInheritedElements; std::vector<std::unique_ptr<ProgramElement>> fElements; + + friend class Compiler; }; } // namespace |