diff options
| author | Kenneth Graunke <kenneth@whitecape.org> | 2010-09-05 00:31:28 -0700 |
|---|---|---|
| committer | Kenneth Graunke <kenneth@whitecape.org> | 2010-09-07 17:30:37 -0700 |
| commit | 814c89abdbcd5b841b98746af921796df0362238 (patch) | |
| tree | 7286d59bd66ed267037896bada25190ceedc26c2 /src/glsl/glsl_parser.ypp | |
| parent | 4a867be14378587574b3082071e9fff962d28d12 (diff) | |
glsl: Set default language version in mesa_glsl_parse_state constructor.
This should make it easier to change the default version based on the
API (say, version 1.00 for OpenGL ES).
Also, synchronize the symbol table's version with the parse state's
version just before doing AST-to-HIR. This way, it will be set when
it matters, but the main initialization code doesn't have to care about
the symbol table.
Diffstat (limited to 'src/glsl/glsl_parser.ypp')
| -rw-r--r-- | src/glsl/glsl_parser.ypp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/glsl/glsl_parser.ypp b/src/glsl/glsl_parser.ypp index b9cc03c194..3b5a4088ae 100644 --- a/src/glsl/glsl_parser.ypp +++ b/src/glsl/glsl_parser.ypp @@ -218,11 +218,7 @@ translation_unit: ; version_statement: - /* blank - no #version specified */ - { - state->language_version = 110; - state->symbols->language_version = 110; - } + /* blank - no #version specified: defaults are already set */ | VERSION INTCONSTANT EOL { switch ($2) { @@ -231,7 +227,6 @@ version_statement: case 130: /* FINISHME: Check against implementation support versions. */ state->language_version = $2; - state->symbols->language_version = $2; break; default: _mesa_glsl_error(& @2, state, "Shading language version" |