glsl_lexer: centroid and invariant are not reserved words in GLSL 1.10

2010-06-18 18:40:12 -07:00
parent 8655b7e78a
commit 93dad36844
1 changed files with 16 additions and 2 deletions
@@ -156,8 +156,22 @@ out		return OUT;
 inout		return INOUT;
 uniform		return UNIFORM;
 varying		return VARYING;
-centroid	return CENTROID;
-invariant	return INVARIANT;
+centroid	{
+		   if (yyextra->language_version >= 120) {
+		      return CENTROID;
+		   } else {
+		      yylval->identifier = strdup(yytext);
+		      return IDENTIFIER;
+		   }
+		}
+invariant	{
+		   if (yyextra->language_version >= 120) {
+		      return INVARIANT;
+		   } else {
+		      yylval->identifier = strdup(yytext);
+		      return IDENTIFIER;
+		   }
+		}

 flat		{
 		   if (yyextra->language_version >= 130) {