Merge freedesktop/master into otc-private/master

[android-x86/external-mesa.git] / src / glsl / glsl_parser.yy

diff --git a/src/glsl/glsl_parser.yy b/src/glsl/glsl_parser.yy
index 6e92c26..56367f8 100644 (file)
--- a/src/glsl/glsl_parser.yy
+++ b/src/glsl/glsl_parser.yy
@@ -267,10 +267,16 @@ version_statement:
        | VERSION_TOK INTCONSTANT EOL
        {
            state->process_version_directive(&@2, $2, NULL);
+          if (state->error) {
+             YYERROR;
+          }
        }
         | VERSION_TOK INTCONSTANT any_identifier EOL
         {
            state->process_version_directive(&@2, $2, $3);
+          if (state->error) {
+             YYERROR;
+          }
         }
        ;