diff options
author | Mike Klein <mtklein@google.com> | 2017-06-27 22:52:03 +0000 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-06-27 22:52:10 +0000 |
commit | 5ce397205528f82084fc650c2ce27d246c01da33 (patch) | |
tree | 3e359ae172fed10fce8204163d6d372b0c3f6207 /src/sksl/SkSLGLSLCodeGenerator.h | |
parent | 3fe44544c93759e7791ee0df3e5d172cb0f268b6 (diff) |
Revert "Re-land sksl fragment processor support"
This reverts commit c070939fd1a954b7a492bc30f0cf64a664b90181.
Reason for revert:
This has some knock-on effects in the generation of Android.bp from our GN files. See gn/gn_to_bp.py? We're seeing things like "tmp/tmpsBVycx/gen/" end up in the include search path in Android.bp, which obviously don't exist there...
Original change's description:
> Re-land sksl fragment processor support
>
> This reverts commit ed50200682e0de72c3abecaa4d5324ebcd1ed9f9.
>
> Bug: skia:
> Change-Id: I9caa7454b391450620d6989dc472abb3cf7a2cab
> Reviewed-on: https://skia-review.googlesource.com/20965
> Reviewed-by: Ben Wagner <benjaminwagner@google.com>
> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
TBR=benjaminwagner@google.com,ethannicholas@google.com
Change-Id: I502486b5405923b322429219f4cc396a45a14cea
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/20990
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>
Diffstat (limited to 'src/sksl/SkSLGLSLCodeGenerator.h')
-rw-r--r-- | src/sksl/SkSLGLSLCodeGenerator.h | 28 |
1 files changed, 6 insertions, 22 deletions
diff --git a/src/sksl/SkSLGLSLCodeGenerator.h b/src/sksl/SkSLGLSLCodeGenerator.h index aaf036900d..032b70eea1 100644 --- a/src/sksl/SkSLGLSLCodeGenerator.h +++ b/src/sksl/SkSLGLSLCodeGenerator.h @@ -13,7 +13,6 @@ #include <unordered_map> #include "SkSLCodeGenerator.h" -#include "SkSLStringStream.h" #include "ir/SkSLBinaryExpression.h" #include "ir/SkSLBoolLiteral.h" #include "ir/SkSLConstructor.h" @@ -33,7 +32,6 @@ #include "ir/SkSLPostfixExpression.h" #include "ir/SkSLProgramElement.h" #include "ir/SkSLReturnStatement.h" -#include "ir/SkSLSetting.h" #include "ir/SkSLStatement.h" #include "ir/SkSLSwitchStatement.h" #include "ir/SkSLSwizzle.h" @@ -76,12 +74,11 @@ public: GLSLCodeGenerator(const Context* context, const Program* program, ErrorReporter* errors, OutputStream* out) : INHERITED(program, errors, out) - , fLineEnding("\n") , fContext(*context) {} - bool generateCode() override; + virtual bool generateCode() override; -protected: +private: void write(const char* s); void writeLine(); @@ -92,10 +89,6 @@ protected: void writeLine(const String& s); - virtual void writeHeader(); - - virtual void writePrecisionModifier(); - void writeType(const Type& type); void writeExtension(const Extension& ext); @@ -106,7 +99,7 @@ protected: void writeFunctionDeclaration(const FunctionDeclaration& f); - virtual void writeFunction(const FunctionDefinition& f); + void writeFunction(const FunctionDefinition& f); void writeLayout(const Layout& layout); @@ -114,13 +107,11 @@ protected: void writeGlobalVars(const VarDeclaration& vs); - virtual void writeVarInitializer(const Variable& var, const Expression& value); - void writeVarDeclarations(const VarDeclarations& decl, bool global); void writeFragCoord(); - virtual void writeVariableReference(const VariableReference& ref); + void writeVariableReference(const VariableReference& ref); void writeExpression(const Expression& expr, Precedence parentPrecedence); @@ -136,13 +127,11 @@ protected: void writeSwizzle(const Swizzle& swizzle); - static Precedence GetBinaryPrecedence(Token::Kind op); - - virtual void writeBinaryExpression(const BinaryExpression& b, Precedence parentPrecedence); + void writeBinaryExpression(const BinaryExpression& b, Precedence parentPrecedence); void writeTernaryExpression(const TernaryExpression& t, Precedence parentPrecedence); - virtual void writeIndexExpression(const IndexExpression& expr); + void writeIndexExpression(const IndexExpression& expr); void writePrefixExpression(const PrefixExpression& p, Precedence parentPrecedence); @@ -154,8 +143,6 @@ protected: void writeFloatLiteral(const FloatLiteral& f); - virtual void writeSetting(const Setting& s); - void writeStatement(const Statement& s); void writeStatements(const std::vector<std::unique_ptr<Statement>>& statements); @@ -174,9 +161,6 @@ protected: void writeReturnStatement(const ReturnStatement& r); - virtual void writeProgramElement(const ProgramElement& e); - - const char* fLineEnding; const Context& fContext; StringStream fHeader; String fFunctionHeader; |