summaryrefslogtreecommitdiff
path: root/glsl_parser.ypp
diff options
context:
space:
mode:
Diffstat (limited to 'glsl_parser.ypp')
-rw-r--r--glsl_parser.ypp16
1 files changed, 7 insertions, 9 deletions
diff --git a/glsl_parser.ypp b/glsl_parser.ypp
index 99c6ca132c..ae009ed20c 100644
--- a/glsl_parser.ypp
+++ b/glsl_parser.ypp
@@ -186,21 +186,19 @@
%%
translation_unit:
- version_statement
+ version_statement extension_statement_list
{
_mesa_glsl_initialize_types(state);
}
- extension_statement_list external_declaration_list
- |
- {
- state->language_version = 110;
- _mesa_glsl_initialize_types(state);
- }
- extension_statement_list external_declaration_list
+ external_declaration_list
;
version_statement:
- VERSION INTCONSTANT EOL
+ /* blank - no #version specified */
+ {
+ state->language_version = 110;
+ }
+ | VERSION INTCONSTANT EOL
{
switch ($2) {
case 110: