OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Disallow passing NULL for state to _mesa_glsl_error

Browse Source 
The two places that were still passing NULL had a state pointer to
pass.  Not passing it in these places prevented termination of
compilation of erroneous programs.
This commit is contained in:
Ian Romanick
2010-03-23 13:21:19 -07:00
parent f3f111eac4
commit 71d0bbfcb2
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ast_to_hir.cpp
View File

@@ -650,7 +650,7 @@ ast_expression::hir(exec_list *instructions,
if (var != NULL) { if (var != NULL) {
type = result->type; type = result->type;
} else { } else {
_mesa_glsl_error(& loc, NULL, "`%s' undeclared", _mesa_glsl_error(& loc, state, "`%s' undeclared",
this->primary_expression.identifier); this->primary_expression.identifier);
error_emitted = true; error_emitted = true;
@@ -704,7 +704,7 @@ ast_expression::hir(exec_list *instructions,
} }
if (is_error_type(type) && !error_emitted) if (is_error_type(type) && !error_emitted)
_mesa_glsl_error(& loc, NULL, "type mismatch"); _mesa_glsl_error(& loc, state, "type mismatch");
return result; return result;
} }

1
glsl_parser_extras.cpp
View File

@@ -44,7 +44,6 @@ _mesa_glsl_error(YYLTYPE *locp, _mesa_glsl_parse_state *state,
int len; int len;
va_list ap; va_list ap;
if (state)
state->error = true; state->error = true;
len = snprintf(buf, sizeof(buf), "%u:%u(%u): error: ", len = snprintf(buf, sizeof(buf), "%u:%u(%u): error: ",