diff options
| author | Paul Berry <stereotype441@gmail.com> | 2012-08-01 14:50:05 -0700 |
|---|---|---|
| committer | Ian Romanick <ian.d.romanick@intel.com> | 2012-12-06 12:13:21 -0800 |
| commit | e3ded7fe628d5a842f2fae0da355a4034cff27cf (patch) | |
| tree | 9f844ea688b37f3a564609d9331fe6440960b471 /src/glsl/glsl_lexer.ll | |
| parent | 5d0fd3270f028cd93efa5301c998be034826a102 (diff) | |
| download | external_mesa3d-e3ded7fe628d5a842f2fae0da355a4034cff27cf.zip external_mesa3d-e3ded7fe628d5a842f2fae0da355a4034cff27cf.tar.gz external_mesa3d-e3ded7fe628d5a842f2fae0da355a4034cff27cf.tar.bz2 | |
glsl: Make use of new _mesa_glsl_parse_state::is_version() function.
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Acked-by: Carl Worth <cworth@cworth.org>
Diffstat (limited to 'src/glsl/glsl_lexer.ll')
| -rw-r--r-- | src/glsl/glsl_lexer.ll | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/glsl/glsl_lexer.ll b/src/glsl/glsl_lexer.ll index c538d7d..d2c8c31 100644 --- a/src/glsl/glsl_lexer.ll +++ b/src/glsl/glsl_lexer.ll @@ -103,7 +103,7 @@ literal_integer(char *text, int len, struct _mesa_glsl_parse_state *state, if (value > UINT_MAX) { /* Note that signed 0xffffffff is valid, not out of range! */ - if (state->language_version >= 130) { + if (state->is_version(130, 0)) { _mesa_glsl_error(lloc, state, "Literal value `%s' out of range", text); } else { @@ -333,7 +333,7 @@ struct return STRUCT; void return VOID_TOK; layout { - if ((yyextra->language_version >= 140) + if ((yyextra->is_version(140, 0)) || yyextra->AMD_conservative_depth_enable || yyextra->ARB_conservative_depth_enable || yyextra->ARB_explicit_attrib_location_enable |