From: Eric Anholt <eric@anholt.net>
Date: Fri, 30 Apr 2010 01:00:33 +0000 (-0700)
Subject: Store warnings and errors in a parser state infolog.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=3623df68fa9f4db88c436425524bc27c7f59a051;p=mesa.git

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 4183d138566..88767af2049 100644
--- 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 125c675a921..b06b3fe920c 100644
--- 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,