Overhaul of error logging.

diff --git a/src/mesa/shader/slang/slang_error.h b/src/mesa/shader/slang/slang_error.h
index d35ae83fba05e8ebdf7ee2ce97c41709b13a5469..064b11b498d1124875186dcf2f7c47476f177fa9 100644 (file)
--- a/src/mesa/shader/slang/slang_error.h
+++ b/src/mesa/shader/slang/slang_error.h
@@ -25,7 +25,7 @@
 #ifndef SLANG_ERROR_H
 #define SLANG_ERROR_H
 
-
+#if 0
 extern void
 _slang_reset_error(void);
 
@@ -37,49 +37,8 @@ _slang_record_error(const char *msg1, const char *msg2,
 
 extern const char *
 _slang_error_text(void);
-
-
-/**
- * Record a compilation error, single string message.
- */
-#define RETURN_ERROR(MSG, POS)                             \
-do {                                                       \
-   _slang_record_error(MSG, "", POS, __FILE__, __LINE__);  \
-   return GL_FALSE;                                        \
-} while (0)
-
-
-/**
- * Record a compilation error, two-string message.
- */
-#define RETURN_ERROR2(MSG1, MSG2, POS)                        \
-do {                                                          \
-   _slang_record_error(MSG1, MSG2, POS, __FILE__, __LINE__);  \
-   return GL_FALSE;                                           \
-} while (0)
-
-
-/**
- * Record a nil error.  Either a real error message or out of memory should
- * have already been recorded.
- */
-#define RETURN_NIL()                                            \
-do {                                                            \
-   _slang_record_error("unknown", "", -1, __FILE__, __LINE__);  \
-   return GL_FALSE;                                             \
-} while (0)
-
-
-/**
- * Used to report an out of memory condition.
- */
-#define RETURN_OUT_OF_MEMORY()                                        \
-do {                                                                  \
-   _slang_record_error("Out of memory", "", -1, __FILE__, __LINE__);  \
-   return GL_FALSE;                                                   \
-} while (0)
-
-
+#endif
+foo!
 
 
 #endif /* SLANG_ERROR_H */