Module: Mesa
Branch: glsl-pp-rework-2
Commit: 4703d7d3f8d50a0ff00dd043e999b0b8b11d45e6
URL:    
http://cgit.freedesktop.org/mesa/mesa/commit/?id=4703d7d3f8d50a0ff00dd043e999b0b8b11d45e6

Author: Michal Krol <[email protected]>
Date:   Tue Nov 10 00:16:09 2009 +0100

slang: Update for glsl/pp interface changes.

---

 src/mesa/shader/slang/slang_compile.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/mesa/shader/slang/slang_compile.c 
b/src/mesa/shader/slang/slang_compile.c
index ce3a85e..b8b7b3d 100644
--- a/src/mesa/shader/slang/slang_compile.c
+++ b/src/mesa/shader/slang/slang_compile.c
@@ -2589,12 +2589,14 @@ compile_with_grammar(grammar id, const char *source, 
slang_code_unit * unit,
    int result;
    struct sl_pp_purify_options options;
    char *outbuf;
+   char errmsg[200] = "";
+   unsigned int errline = 0;
    struct sl_pp_token_info *intokens;
    unsigned int tokens_eaten;
 
    memset(&options, 0, sizeof(options));
-   if (sl_pp_purify(source, &options, &outbuf)) {
-      slang_info_log_error(infolog, "unable to preprocess the source");
+   if (sl_pp_purify(source, &options, &outbuf, errmsg, sizeof(errmsg), 
&errline)) {
+      slang_info_log_error(infolog, errmsg);
       return GL_FALSE;
    }
 

_______________________________________________
mesa-commit mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/mesa-commit

Reply via email to