diff options
| author | Ian Romanick <[email protected]> | 2011-01-07 16:03:48 -0800 |
|---|---|---|
| committer | Ian Romanick <[email protected]> | 2011-01-10 17:39:16 -0800 |
| commit | eebdfdfbcf2721349d2c2cafe2d81fd83cade9b9 (patch) | |
| tree | e5fef424266be0033b1f2ccd1a158592a0bb5804 | |
| parent | a302d740bd1e90d3db2b8cee79b2d5ee1220f8bf (diff) | |
glsl: Add version_string containing properly formatted GLSL version
| -rw-r--r-- | src/glsl/glsl_parser.ypp | 27 | ||||
| -rw-r--r-- | src/glsl/glsl_parser_extras.h | 1 |
2 files changed, 14 insertions, 14 deletions
diff --git a/src/glsl/glsl_parser.ypp b/src/glsl/glsl_parser.ypp index 41b51a74725..124ee18356d 100644 --- a/src/glsl/glsl_parser.ypp +++ b/src/glsl/glsl_parser.ypp @@ -228,6 +228,11 @@ version_statement: case 130: /* FINISHME: Check against implementation support versions. */ state->language_version = $2; + state->version_string = + talloc_asprintf(state, "GLSL%s %d.%02d", + state->es_shader ? " ES" : "", + state->language_version / 100, + state->language_version % 100); break; default: _mesa_glsl_error(& @2, state, "Shading language version" @@ -246,11 +251,8 @@ pragma_statement: { if (state->language_version < 120) { _mesa_glsl_warning(& @1, state, - "pragma `invariant(all)' not supported in " - "GLSL%s %d.%02d", - state->es_shader ? " ES" : "", - state->language_version / 100, - state->language_version % 100); + "pragma `invariant(all)' not supported in %s", + state->version_string); } else { state->all_invariant = true; } @@ -1296,10 +1298,9 @@ precision_qualifier: if (!state->es_shader && state->language_version < 130) _mesa_glsl_error(& @1, state, "precision qualifier forbidden " - "in GLSL %d.%d (1.30 or later " + "in %s (1.30 or later " "required)\n", - state->language_version / 100, - state->language_version % 100); + state->version_string); $$ = ast_precision_high; } @@ -1307,10 +1308,9 @@ precision_qualifier: if (!state->es_shader && state->language_version < 130) _mesa_glsl_error(& @1, state, "precision qualifier forbidden " - "in GLSL %d.%d (1.30 or later " + "in %s (1.30 or later " "required)\n", - state->language_version / 100, - state->language_version % 100); + state->version_string); $$ = ast_precision_medium; } @@ -1318,10 +1318,9 @@ precision_qualifier: if (!state->es_shader && state->language_version < 130) _mesa_glsl_error(& @1, state, "precision qualifier forbidden " - "in GLSL %d.%d (1.30 or later " + "in %s (1.30 or later " "required)\n", - state->language_version / 100, - state->language_version % 100); + state->version_string); $$ = ast_precision_low; } diff --git a/src/glsl/glsl_parser_extras.h b/src/glsl/glsl_parser_extras.h index 13d3a2979e4..39c10b99e83 100644 --- a/src/glsl/glsl_parser_extras.h +++ b/src/glsl/glsl_parser_extras.h @@ -69,6 +69,7 @@ struct _mesa_glsl_parse_state { bool es_shader; unsigned language_version; + const char *version_string; enum _mesa_glsl_parser_targets target; /** |