diff options
author | Greg Daniel <egdaniel@google.com> | 2017-06-15 18:30:25 +0000 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-06-15 18:30:29 +0000 |
commit | 8ea60736aaa92cf3cf24705fb356e9e09e85b1fd (patch) | |
tree | 48d45c6037b3b4b14e4d3b51e844e918872ea737 /src/sksl/SkSLIRGenerator.h | |
parent | bcf65edf2ca14bfd63712f7fb6a347973213daf5 (diff) |
Revert "implemented mustImplementGSInvocationsWithLoop workaround in sksl"
This reverts commit d5d323f45777c4766ddf4c74eedff36ee5d9bc56.
Reason for revert: Looks like this might be breaking vulkan
Original change's description:
> implemented mustImplementGSInvocationsWithLoop workaround in sksl
>
> Bug: skia:
> Change-Id: I8434be89537a8baf9e9c5c7a643d28c03108f4ea
> Reviewed-on: https://skia-review.googlesource.com/18154
> Reviewed-by: Chris Dalton <csmartdalton@google.com>
> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
TBR=csmartdalton@google.com,ethannicholas@google.com
Change-Id: I606aad071d3c084eb7eb7ec6c1c1a3cf10479cec
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/20045
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>
Diffstat (limited to 'src/sksl/SkSLIRGenerator.h')
-rw-r--r-- | src/sksl/SkSLIRGenerator.h | 25 |
1 files changed, 7 insertions, 18 deletions
diff --git a/src/sksl/SkSLIRGenerator.h b/src/sksl/SkSLIRGenerator.h index 9bbc2bed32..d4a684638c 100644 --- a/src/sksl/SkSLIRGenerator.h +++ b/src/sksl/SkSLIRGenerator.h @@ -81,10 +81,13 @@ public: IRGenerator(const Context* context, std::shared_ptr<SymbolTable> root, ErrorReporter& errorReporter); - void convertProgram(String text, - SymbolTable& types, - Modifiers::Flag* defaultPrecision, - std::vector<std::unique_ptr<ProgramElement>>* result); + std::unique_ptr<VarDeclarations> convertVarDeclarations(const ASTVarDeclarations& decl, + Variable::Storage storage); + std::unique_ptr<FunctionDefinition> convertFunction(const ASTFunction& f); + std::unique_ptr<Statement> convertStatement(const ASTStatement& statement); + std::unique_ptr<Expression> convertExpression(const ASTExpression& expression); + std::unique_ptr<ModifiersDeclaration> convertModifiersDeclaration( + const ASTModifiersDeclaration& m); /** * If both operands are compile-time constants and can be folded, returns an expression @@ -112,15 +115,6 @@ private: void pushSymbolTable(); void popSymbolTable(); - std::unique_ptr<VarDeclarations> convertVarDeclarations(const ASTVarDeclarations& decl, - Variable::Storage storage); - void convertFunction(const ASTFunction& f, - std::vector<std::unique_ptr<ProgramElement>>* out); - std::unique_ptr<Statement> convertStatement(const ASTStatement& statement); - std::unique_ptr<Expression> convertExpression(const ASTExpression& expression); - std::unique_ptr<ModifiersDeclaration> convertModifiersDeclaration( - const ASTModifiersDeclaration& m); - const Type* convertType(const ASTType& type); std::unique_ptr<Expression> call(Position position, const FunctionDeclaration& function, @@ -169,10 +163,6 @@ private: std::unique_ptr<Expression> convertTernaryExpression(const ASTTernaryExpression& expression); std::unique_ptr<Statement> convertVarDeclarationStatement(const ASTVarDeclarationStatement& s); std::unique_ptr<Statement> convertWhile(const ASTWhileStatement& w); - std::unique_ptr<Block> applyInvocationIDWorkaround( - std::unique_ptr<Block> main, - Variable* invocationID, - std::vector<std::unique_ptr<ProgramElement>>* out); void fixRectSampling(std::vector<std::unique_ptr<Expression>>& arguments); void checkValid(const Expression& expr); @@ -185,7 +175,6 @@ private: int fLoopLevel; int fSwitchLevel; ErrorReporter& fErrors; - int fInvocations; friend class AutoSymbolTable; friend class AutoLoopLevel; |