Merge commit 'mesa_7_6_branch' into mesa_7_7_branch

[mesa.git] / src / mesa / shader / slang / slang_log.c

diff --git a/src/mesa/shader/slang/slang_log.c b/src/mesa/shader/slang/slang_log.c
index b6545b2c2e9e4382aa748684afd5983970c9e68b..d7d2b4fbfd00be226b5d4770209cbf62b970372f 100644 (file)
--- a/src/mesa/shader/slang/slang_log.c
+++ b/src/mesa/shader/slang/slang_log.c
@@ -1,8 +1,9 @@
 /*
  * Mesa 3-D graphics library
- * Version:  6.5.3
+ * Version:  7.3
  *
  * Copyright (C) 2005-2007  Brian Paul   All Rights Reserved.
+ * Copyright (C) 2009  VMware, Inc.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -22,7 +23,8 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "imports.h"
+#include "main/imports.h"
+#include "main/context.h"
 #include "slang_log.h"
 #include "slang_utility.h"
 
@@ -34,14 +36,15 @@ void
 slang_info_log_construct(slang_info_log * log)
 {
    log->text = NULL;
-   log->dont_free_text = 0;
+   log->dont_free_text = GL_FALSE;
+   log->error_flag = GL_FALSE;
 }
 
 void
 slang_info_log_destruct(slang_info_log * log)
 {
    if (!log->dont_free_text)
-      slang_alloc_free(log->text);
+      _mesa_free(log->text);
 }
 
 static int
@@ -58,10 +61,10 @@ slang_info_log_message(slang_info_log * log, const char *prefix,
    if (log->text != NULL) {
       GLuint old_len = slang_string_length(log->text);
       log->text = (char *)
-        slang_alloc_realloc(log->text, old_len + 1, old_len + size);
+        _mesa_realloc(log->text, old_len + 1, old_len + size);
    }
    else {
-      log->text = (char *) (slang_alloc_malloc(size));
+      log->text = (char *) (_mesa_malloc(size));
       if (log->text != NULL)
          log->text[0] = '\0';
    }
@@ -73,6 +76,7 @@ slang_info_log_message(slang_info_log * log, const char *prefix,
    }
    slang_string_concat(log->text, msg);
    slang_string_concat(log->text, "\n");
+
    return 1;
 }
 
@@ -97,6 +101,7 @@ slang_info_log_error(slang_info_log * log, const char *msg, ...)
    va_start(va, msg);
    _mesa_vsprintf(buf, msg, va);
    va_end(va);
+   log->error_flag = GL_TRUE;
    if (slang_info_log_message(log, "Error", buf))
       return 1;
    slang_info_log_memory(log);
@@ -122,7 +127,8 @@ void
 slang_info_log_memory(slang_info_log * log)
 {
    if (!slang_info_log_message(log, "Error", "Out of memory.")) {
-      log->dont_free_text = 1;
+      log->dont_free_text = GL_TRUE;
+      log->error_flag = GL_TRUE;
       log->text = out_of_memory;
    }
 }