AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

glsl: Parse "#version 150 core" directives.

Browse Source 
Previously we only supported "#version 150".  This patch recognizes
"compatibility" to give the user a more descriptive error message.

Fixes Piglit's version-150-core-profile test.

Reviewed-by: Matt Turner <mattst88@gmail.com>
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Kenneth Graunke
2013-06-07 21:28:59 -07:00
parent f730b1f72a
commit e203919a4e
1 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/glsl/glsl_parser_extras.cpp
+13
View File
@@ -226,6 +226,19 @@ _mesa_glsl_parse_state::process_version_directive(YYLTYPE *locp, int version,
if (ident) {
if (strcmp(ident, "es") == 0) {
es_token_present = true;
} else if (version >= 150) {
if (strcmp(ident, "core") == 0) {
/* Accept the token. There's no need to record that this is
* a core profile shader since that's the only profile we support.
*/
} else if (strcmp(ident, "compatibility") == 0) {
_mesa_glsl_error(locp, this,
"The compatibility profile is not supported.\n");
} else {
_mesa_glsl_error(locp, this,
"\"%s\" is not a valid shading language profile; "
"if present, it must be \"core\".\n", ident);
}
} else {
_mesa_glsl_error(locp, this,
"Illegal text following version number\n");