Index: src/sksl/SkSLParser.cpp |
diff --git a/src/sksl/SkSLParser.cpp b/src/sksl/SkSLParser.cpp |
index 154989fe84d6c5fbbb388f75c0248d52d0d4b24b..324bd41c86c972f39e9ad3714ef4069c90d8c6dd 100644 |
--- a/src/sksl/SkSLParser.cpp |
+++ b/src/sksl/SkSLParser.cpp |
@@ -526,7 +526,8 @@ |
return -1; |
} |
-/* LAYOUT LPAREN IDENTIFIER (EQ INT_LITERAL)? (COMMA IDENTIFIER (EQ INT_LITERAL)?)* RPAREN */ |
+/* LAYOUT LPAREN IDENTIFIER EQ INT_LITERAL (COMMA IDENTIFIER EQ INT_LITERAL)* |
+ RPAREN */ |
ASTLayout Parser::layout() { |
int location = -1; |
int binding = -1; |
@@ -536,12 +537,11 @@ |
bool originUpperLeft = false; |
bool overrideCoverage = false; |
bool blendSupportAllEquations = false; |
- bool pushConstant = false; |
if (this->peek().fKind == Token::LAYOUT) { |
this->nextToken(); |
if (!this->expect(Token::LPAREN, "'('")) { |
return ASTLayout(location, binding, index, set, builtin, originUpperLeft, |
- overrideCoverage, blendSupportAllEquations, pushConstant); |
+ overrideCoverage, blendSupportAllEquations); |
} |
for (;;) { |
Token t = this->nextToken(); |
@@ -561,8 +561,6 @@ |
overrideCoverage = true; |
} else if (t.fText == "blend_support_all_equations") { |
blendSupportAllEquations = true; |
- } else if (t.fText == "push_constant") { |
- pushConstant = true; |
} else { |
this->error(t.fPosition, ("'" + t.fText + |
"' is not a valid layout qualifier").c_str()); |
@@ -577,7 +575,7 @@ |
} |
} |
return ASTLayout(location, binding, index, set, builtin, originUpperLeft, overrideCoverage, |
- blendSupportAllEquations, pushConstant); |
+ blendSupportAllEquations); |
} |
/* layout? (UNIFORM | CONST | IN | OUT | INOUT | LOWP | MEDIUMP | HIGHP | FLAT | NOPERSPECTIVE)* */ |