diff options
| author |  ethannicholas <ethannicholas@google.com> | 2016-09-12 09:15:53 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-09-12 09:15:53 -0700 |
| commit | a316395e66095aa1bf495525e34c991688467a45 (patch) | |
| tree | fe174f0a4e8aabd9ae88e3762ee0e8cfe6932a47 /src/sksl/SkSLParser.cpp | |
| parent | b3e9ae6c0ca200f6e1021258d4d6562b1e3e9458 (diff) | |
Revert of Turned on SkSL->GLSL compiler (patchset #12 id:220001 of https://codereview.chromium.org/2288033003/ )
Reason for revert:
Compilation errors on some bots.
Original issue's description:
> Turned on SkSL->GLSL compiler
> GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2288033003
>
> Committed: https://skia.googlesource.com/skia/+/9b0fe3d125f237d9884732a48414fa85fc71b4e3
TBR=benjaminwagner@google.com,bsalomon@google.com,egdaniel@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Review-Url: https://codereview.chromium.org/2337553002
Diffstat (limited to 'src/sksl/SkSLParser.cpp')
| -rw-r--r-- | src/sksl/SkSLParser.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/sksl/SkSLParser.cpp b/src/sksl/SkSLParser.cpp index f9e7498ee5..b240e4501e 100644 --- a/src/sksl/SkSLParser.cpp +++ b/src/sksl/SkSLParser.cpp @@ -185,8 +185,7 @@ void Parser::precision() { this->expect(Token::SEMICOLON, "';'"); } -/* DIRECTIVE(#version) INT_LITERAL ("es" | "compatibility")? | - DIRECTIVE(#extension) IDENTIFIER COLON IDENTIFIER */ +/* DIRECTIVE(#version) INT_LITERAL | DIRECTIVE(#extension) IDENTIFIER COLON IDENTIFIER */ std::unique_ptr<ASTDeclaration> Parser::directive() { Token start; if (!this->expect(Token::DIRECTIVE, "a directive", &start)) { @@ -194,12 +193,7 @@ std::unique_ptr<ASTDeclaration> Parser::directive() { } if (start.fText == "#version") { this->expect(Token::INT_LITERAL, "a version number"); - Token next = this->peek(); - if (next.fText == "es" || next.fText == "compatibility") { - this->nextToken(); - } - // version is ignored for now; it will eventually become an error when we stop pretending - // to be GLSL + // ignored for now return nullptr; } else if (start.fText == "#extension") { Token name; |