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

Clean up error reporting in _mesa_glsl_process_extension

Browse Source
This commit is contained in:
Ian Romanick
2010-04-07 16:57:56 -07:00
parent c178c74c27
commit 887a8b07de
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
glsl_parser_extras.cpp
+12 -5
View File
@@ -101,7 +101,6 @@ _mesa_glsl_process_extension(const char *name, YYLTYPE *name_locp,
extension_require,
extension_warn
} ext_mode;
bool error = false;
if (strcmp(behavior, "warn") == 0) {
ext_mode = extension_warn;
@@ -118,6 +117,8 @@ _mesa_glsl_process_extension(const char *name, YYLTYPE *name_locp,
return false;
}
bool unsupported = false;
if (strcmp(name, "all") == 0) {
if ((ext_mode == extension_enable) || (ext_mode == extension_require)) {
_mesa_glsl_error(name_locp, state, "Cannot %s all extensions",
@@ -126,13 +127,19 @@ _mesa_glsl_process_extension(const char *name, YYLTYPE *name_locp,
return false;
}
} else {
unsupported = true;
}
if (unsupported) {
static const char *const fmt = "extension `%s' unsupported in %s shader";
if (ext_mode == extension_require) {
_mesa_glsl_error(name_locp, state, "Unknown extension `%s'",
name);
_mesa_glsl_error(name_locp, state, fmt,
name, _mesa_glsl_shader_target_name(state->target));
return false;
} else {
_mesa_glsl_warning(name_locp, state, "Unknown extension `%s'",
name);
_mesa_glsl_warning(name_locp, state, fmt,
name, _mesa_glsl_shader_target_name(state->target));
}
}