diff options
| author | Ian Romanick <ian.d.romanick@intel.com> | 2016-08-09 14:31:49 -0700 |
|---|---|---|
| committer | Ian Romanick <ian.d.romanick@intel.com> | 2016-08-10 16:42:02 -0700 |
| commit | eda6349346616f3a45ca2d03e2c1a3da956df6b3 (patch) | |
| tree | 18103a1baa3bac24fe35b75d722338bf7d670f3a /src/compiler/glsl/glcpp | |
| parent | 30e5ff706789823145c51313870c87bffab6943f (diff) | |
| download | external_mesa3d-eda6349346616f3a45ca2d03e2c1a3da956df6b3.zip external_mesa3d-eda6349346616f3a45ca2d03e2c1a3da956df6b3.tar.gz external_mesa3d-eda6349346616f3a45ca2d03e2c1a3da956df6b3.tar.bz2 | |
glcpp: Track the actual version instead of just the version_resolved flag
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Timothy Arceri <timothy.arceri@collabora.com>
Cc: mesa-stable@lists.freedesktop.org
Diffstat (limited to 'src/compiler/glsl/glcpp')
| -rw-r--r-- | src/compiler/glsl/glcpp/glcpp-parse.y | 10 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/glcpp.h | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/compiler/glsl/glcpp/glcpp-parse.y b/src/compiler/glsl/glcpp/glcpp-parse.y index ca376d9..05a76c7 100644 --- a/src/compiler/glsl/glcpp/glcpp-parse.y +++ b/src/compiler/glsl/glcpp/glcpp-parse.y @@ -396,13 +396,13 @@ control_line_success: _glcpp_parser_skip_stack_pop (parser, & @1); } NEWLINE | HASH_TOKEN VERSION_TOKEN integer_constant NEWLINE { - if (parser->version_resolved) { + if (parser->version != 0) { glcpp_error(& @1, parser, "#version must appear on the first line"); } _glcpp_parser_handle_version_declaration(parser, $3, NULL, true); } | HASH_TOKEN VERSION_TOKEN integer_constant IDENTIFIER NEWLINE { - if (parser->version_resolved) { + if (parser->version != 0) { glcpp_error(& @1, parser, "#version must appear on the first line"); } _glcpp_parser_handle_version_declaration(parser, $3, $4, true); @@ -1346,7 +1346,7 @@ glcpp_parser_create(glcpp_extension_iterator extensions, void *state, gl_api api parser->extensions = extensions; parser->state = state; parser->api = api; - parser->version_resolved = false; + parser->version = 0; parser->has_new_line_number = 0; parser->new_line_number = 1; @@ -2280,10 +2280,10 @@ _glcpp_parser_handle_version_declaration(glcpp_parser_t *parser, intmax_t versio const char *es_identifier, bool explicitly_set) { - if (parser->version_resolved) + if (parser->version != 0) return; - parser->version_resolved = true; + parser->version = version; add_builtin_define (parser, "__VERSION__", version); diff --git a/src/compiler/glsl/glcpp/glcpp.h b/src/compiler/glsl/glcpp/glcpp.h index 07eaf68..9f35b05 100644 --- a/src/compiler/glsl/glcpp/glcpp.h +++ b/src/compiler/glsl/glcpp/glcpp.h @@ -206,7 +206,7 @@ struct glcpp_parser { glcpp_extension_iterator extensions; void *state; gl_api api; - bool version_resolved; + unsigned version; bool has_new_line_number; int new_line_number; bool has_new_source_number; |