Store warnings and errors in a parser state infolog.

Cleans up compile warning about unused state in _mesa_glsl_warning.  We
would want infolog handling roughly like this anyway.

diff --git a/glsl_parser_extras.cpp b/glsl_parser_extras.cpp
index 4183d1385660e134cee875e567d00fb3240b2aa6..88767af2049e9b74af06fea121b09ecc3fedee5f 100644 (file)
--- a/glsl_parser_extras.cpp
+++ b/glsl_parser_extras.cpp
@@ -73,11 +73,15 @@ _mesa_glsl_error(YYLTYPE *locp, _mesa_glsl_parse_state *state,
    va_end(ap);
 
    printf("%s\n", buf);
+
+   if (state->info_log)
+      free(state->info_log);
+   state->info_log = strdup(buf);
 }
 
 
 void
-_mesa_glsl_warning(const YYLTYPE *locp, const _mesa_glsl_parse_state *state,
+_mesa_glsl_warning(const YYLTYPE *locp, _mesa_glsl_parse_state *state,
                   const char *fmt, ...)
 {
    char buf[1024];
@@ -92,6 +96,10 @@ _mesa_glsl_warning(const YYLTYPE *locp, const _mesa_glsl_parse_state *state,
    va_end(ap);
 
    printf("%s\n", buf);
+
+   if (!state->info_log) {
+      state->info_log = strdup(buf);
+   }
 }
 
 

diff --git a/glsl_parser_extras.h b/glsl_parser_extras.h
index 125c675a9212c2c6de4171d74cb8adf972f06e0e..b06b3fe920cc15773070aa532cfebf2150c9ca62 100644 (file)
--- a/glsl_parser_extras.h
+++ b/glsl_parser_extras.h
@@ -65,6 +65,8 @@ struct _mesa_glsl_parse_state {
    const glsl_type **user_structures;
    unsigned num_user_structures;
 
+   char *info_log;
+
    /**
     * \name Enable bits for GLSL extensions
     */
@@ -95,7 +97,7 @@ extern void _mesa_glsl_error(YYLTYPE *locp, _mesa_glsl_parse_state *state,
  * \sa _mesa_glsl_error
  */
 extern void _mesa_glsl_warning(const YYLTYPE *locp,
-                              const _mesa_glsl_parse_state *state,
+                              _mesa_glsl_parse_state *state,
                               const char *fmt, ...);
 
 extern void _mesa_glsl_lexer_ctor(struct _mesa_glsl_parse_state *state,