diff options
author | Kevin Lubick <kjlubick@google.com> | 2018-06-19 12:04:18 +0000 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-06-19 12:23:21 +0000 |
commit | f2030783094e502fb74221077a5ee7cb41287fe4 (patch) | |
tree | 7716875c2aaf120f213bb916300bf9482d260d0c /src/sksl/SkSLIRGenerator.h | |
parent | fb3beb0591aed9fd6bf349eb5d08e0e485bcff08 (diff) |
Revert "added GrSkSLFP and converted DitherEffect to use it"
This reverts commit dfbfc738a9edfff7a9804253175e380c230f3d21.
Reason for revert: Seems to be breaking DDL/ASAN bots
Original change's description:
> added GrSkSLFP and converted DitherEffect to use it
>
> Bug: skia:
> Change-Id: I84b71165eab1712355f3c7669cee2d33d259f3df
> Reviewed-on: https://skia-review.googlesource.com/124504
> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
> Reviewed-by: Brian Salomon <bsalomon@google.com>
TBR=bsalomon@google.com,ethannicholas@google.com
Change-Id: Ic4c3978aaba0391f2f8bb1316a456e3821a3a2f2
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/135700
Commit-Queue: Kevin Lubick <kjlubick@google.com>
Reviewed-by: Kevin Lubick <kjlubick@google.com>
Diffstat (limited to 'src/sksl/SkSLIRGenerator.h')
-rw-r--r-- | src/sksl/SkSLIRGenerator.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/sksl/SkSLIRGenerator.h b/src/sksl/SkSLIRGenerator.h index f456915877..2a52e04b54 100644 --- a/src/sksl/SkSLIRGenerator.h +++ b/src/sksl/SkSLIRGenerator.h @@ -77,13 +77,9 @@ 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: /** @@ -152,6 +148,7 @@ 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); @@ -172,6 +169,7 @@ 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; @@ -189,7 +187,6 @@ private: Variable* fRTAdjust; Variable* fRTAdjustInterfaceBlock; int fRTAdjustFieldIndex; - bool fStarted = false; friend class AutoSymbolTable; friend class AutoLoopLevel; |