diff options
author | Ethan Nicholas <ethannicholas@google.com> | 2017-06-27 14:36:24 +0000 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-06-27 14:36:44 +0000 |
commit | ed50200682e0de72c3abecaa4d5324ebcd1ed9f9 (patch) | |
tree | f991fa9668072f9b87a9929c7834b55cd9175fff /src/sksl/SkSLParser.h | |
parent | ccf59917d3fe7aaf59de714acfbd0596503f324f (diff) |
Revert "sksl fragment processor support"
This reverts commit ccf59917d3fe7aaf59de714acfbd0596503f324f.
Reason for revert: breaking iOS bots
Original change's description:
> sksl fragment processor support
>
> Bug: skia:
> Change-Id: Ia3b0305c2b0c78074303831f628fb01852b90d34
> Reviewed-on: https://skia-review.googlesource.com/17843
> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
> Reviewed-by: Ben Wagner <benjaminwagner@google.com>
> Reviewed-by: Mike Klein <mtklein@google.com>
TBR=mtklein@google.com,benjaminwagner@google.com,ethannicholas@google.com
Change-Id: I0a33060c7c42c7b44c5c13d443ac42958291c2f1
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/20962
Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
Diffstat (limited to 'src/sksl/SkSLParser.h')
-rw-r--r-- | src/sksl/SkSLParser.h | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/src/sksl/SkSLParser.h b/src/sksl/SkSLParser.h index e820484591..2f55b34986 100644 --- a/src/sksl/SkSLParser.h +++ b/src/sksl/SkSLParser.h @@ -13,7 +13,6 @@ #include <unordered_map> #include <unordered_set> #include "SkSLErrorReporter.h" -#include "ir/SkSLLayout.h" #include "SkSLToken.h" struct yy_buffer_state; @@ -43,6 +42,7 @@ struct ASTSwitchStatement; struct ASTType; struct ASTWhileStatement; struct ASTVarDeclarations; +struct Layout; struct Modifiers; class SymbolTable; @@ -64,12 +64,7 @@ public: private: /** - * Return the next token, including whitespace tokens, from the parse stream. - */ - Token nextRawToken(); - - /** - * Return the next non-whitespace token from the parse stream. + * Return the next token from the parse stream. */ Token nextToken(); @@ -81,7 +76,7 @@ private: void pushback(Token t); /** - * Returns the next non-whitespace token without consuming it from the stream. + * Returns the next token without consuming it from the stream. */ Token peek(); @@ -92,8 +87,8 @@ private: bool checkNext(Token::Kind kind, Token* result = nullptr); /** - * Reads the next non-whitespace token and generates an error if it is not the expected type. - * The 'expected' string is part of the error message, which reads: + * Reads the next token and generates an error if it is not the expected type. The 'expected' + * string is part of the error message, which reads: * * "expected <expected>, but found '<actual text>'" * @@ -120,8 +115,6 @@ private: std::unique_ptr<ASTDeclaration> directive(); - std::unique_ptr<ASTDeclaration> section(); - std::unique_ptr<ASTDeclaration> declaration(); std::unique_ptr<ASTVarDeclarations> varDeclarations(); @@ -138,10 +131,6 @@ private: int layoutInt(); - String layoutCode(); - - Layout::Key layoutKey(); - Layout layout(); Modifiers modifiers(); |