summaryrefslogtreecommitdiff
path: root/glsl_parser_extras.cpp
diff options
context:
space:
mode:
authorIan Romanick <ian.d.romanick@intel.com>2010-03-23 13:21:19 -0700
committerIan Romanick <ian.d.romanick@intel.com>2010-03-23 13:21:19 -0700
commit71d0bbfcb2853f37b580ec7b705e55bb0eb426fa (patch)
tree7c38957675404fa622729ac8f2549e96bf62c3fb /glsl_parser_extras.cpp
parentf3f111eac45162e9634208cd7305981d8393328d (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 'glsl_parser_extras.cpp')
-rw-r--r--glsl_parser_extras.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/glsl_parser_extras.cpp b/glsl_parser_extras.cpp
index 3a2038a153..b774d8b5f4 100644
--- a/glsl_parser_extras.cpp
+++ b/glsl_parser_extras.cpp
@@ -44,8 +44,7 @@ _mesa_glsl_error(YYLTYPE *locp, _mesa_glsl_parse_state *state,
int len;
va_list ap;
- if (state)
- state->error = true;
+ state->error = true;
len = snprintf(buf, sizeof(buf), "%u:%u(%u): error: ",
locp->source, locp->first_line, locp->first_column);