fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-04-17 04:00:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

glsl: Add version_string containing properly formatted GLSL version

Browse source
This commit is contained in:
Ian Romanick 2011-01-07 16:03:48 -08:00
parent a302d740bd
commit eebdfdfbcf
2 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/glsl/glsl_parser.ypp
View file

@ -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;
}

1
src/glsl/glsl_parser_extras.h
View file

@ -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;
/**