diff options
| author | Ian Romanick <ian.d.romanick@intel.com> | 2010-03-23 13:21:19 -0700 |
|---|---|---|
| committer | Ian Romanick <ian.d.romanick@intel.com> | 2010-03-23 13:21:19 -0700 |
| commit | 71d0bbfcb2853f37b580ec7b705e55bb0eb426fa (patch) | |
| tree | 7c38957675404fa622729ac8f2549e96bf62c3fb /ast_to_hir.cpp | |
| parent | f3f111eac45162e9634208cd7305981d8393328d (diff) | |
Disallow passing NULL for state to _mesa_glsl_error
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.
Diffstat (limited to 'ast_to_hir.cpp')
| -rw-r--r-- | ast_to_hir.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ast_to_hir.cpp b/ast_to_hir.cpp index b4a3d054eb..563cb92122 100644 --- a/ast_to_hir.cpp +++ b/ast_to_hir.cpp @@ -650,7 +650,7 @@ ast_expression::hir(exec_list *instructions, if (var != NULL) { type = result->type; } else { - _mesa_glsl_error(& loc, NULL, "`%s' undeclared", + _mesa_glsl_error(& loc, state, "`%s' undeclared", this->primary_expression.identifier); error_emitted = true; @@ -704,7 +704,7 @@ ast_expression::hir(exec_list *instructions, } if (is_error_type(type) && !error_emitted) - _mesa_glsl_error(& loc, NULL, "type mismatch"); + _mesa_glsl_error(& loc, state, "type mismatch"); return result; } |