mesa: Branch 'master'

[Brian Paul]

 src/glx/x11/dri_glx.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletion(-)

New commits:
diff-tree a83593922218b3fc88d3e553f8db079b188bd068 (from 98abd1bbc8351c1fcb7de9fe91129c8a75a66b87)
Author: Bernardo Innocenti <bernie at develer.com>
Date:   Tue Mar 27 08:05:33 2007 -0600

    always print error messages, unless LIBGL_DEBUG=quiet

diff --git a/src/glx/x11/dri_glx.c b/src/glx/x11/dri_glx.c
index d88ce91..a8d9306 100644
--- a/src/glx/x11/dri_glx.c
+++ b/src/glx/x11/dri_glx.c
@@ -81,11 +81,15 @@ static void InfoMessageF(const char *f, 
     }
 }
 
+/**
+ * Print error to stderr, unless LIBGL_DEBUG=="quiet".
+ */
 static void ErrorMessageF(const char *f, ...)
 {
     va_list args;
+    const char *env;
 
-    if (getenv("LIBGL_DEBUG")) {
+    if ((env = getenv("LIBGL_DEBUG")) && !strstr(env, "quiet")) {
 	fprintf(stderr, "libGL error: ");
 	va_start(args, f);
 	vfprintf(stderr, f, args);