diff options
author | Ethan Nicholas <ethannicholas@google.com> | 2018-07-31 09:44:36 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-07-31 15:18:03 +0000 |
commit | 0054311bf3b4f619a631e95d8aa1ea2d4bfd01c6 (patch) | |
tree | a3a48bece53f8a381c2a2e431db08f5055282e4f /src/sksl/SkSLIRGenerator.h | |
parent | ce3c7bbd0de68fda69903107461738b6afc8a3f4 (diff) |
Re-re-land "added GrSkSLFP and converted DitherEffect to use it"
This reverts commit 6c48e4d11ce80fa5cfef56e13b2d5847fe94a7cc.
Bug: skia:
Change-Id: I7ee78990fc30eec545d1856e59eb6e0573089426
Reviewed-on: https://skia-review.googlesource.com/144348
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
Diffstat (limited to 'src/sksl/SkSLIRGenerator.h')
-rw-r--r-- | src/sksl/SkSLIRGenerator.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/sksl/SkSLIRGenerator.h b/src/sksl/SkSLIRGenerator.h index 2a52e04b54..f456915877 100644 --- a/src/sksl/SkSLIRGenerator.h +++ b/src/sksl/SkSLIRGenerator.h @@ -77,9 +77,13 @@ public: std::unique_ptr<Expression> constantFold(const Expression& left, Token::Kind op, const Expression& right) const; + + std::unique_ptr<Expression> getArg(int offset, String name) const; + Program::Inputs fInputs; const Program::Settings* fSettings; const Context& fContext; + Program::Kind fKind; private: /** @@ -148,7 +152,6 @@ private: std::unique_ptr<Statement> convertReturn(const ASTReturnStatement& r); std::unique_ptr<Section> convertSection(const ASTSection& e); std::unique_ptr<Expression> getCap(int offset, String name); - std::unique_ptr<Expression> getArg(int offset, String name); std::unique_ptr<Expression> convertSuffixExpression(const ASTSuffixExpression& expression); std::unique_ptr<Expression> convertTypeField(int offset, const Type& type, StringFragment field); @@ -169,7 +172,6 @@ private: void setRefKind(const Expression& expr, VariableReference::RefKind kind); void getConstantInt(const Expression& value, int64_t* out); - Program::Kind fKind; const FunctionDeclaration* fCurrentFunction; std::unordered_map<String, Program::Settings::Value> fCapsMap; std::shared_ptr<SymbolTable> fRootSymbolTable; @@ -187,6 +189,7 @@ private: Variable* fRTAdjust; Variable* fRTAdjustInterfaceBlock; int fRTAdjustFieldIndex; + bool fStarted = false; friend class AutoSymbolTable; friend class AutoLoopLevel; |