Merge commit 'origin/gallium-master-merge'

This is the big merge of the gallium-0.2 branch into master.
gallium-master-merge was just the staging area for it.
Both gallium-0.2 and gallium-master-merge are considered closed now.

Conflicts:

	progs/demos/Makefile
	src/mesa/main/state.c
	src/mesa/main/texenvprogram.c

1 files changed, 20 insertions, 14 deletions

diff --git a/src/egl/main/egllog.c b/src/egl/main/egllog.c
index dc1daaa996..1d7a0a388c 100644
--- a/src/egl/main/egllog.c
+++ b/src/egl/main/egllog.c
@@ -1,5 +1,7 @@
 /**
  * Logging facility for debug/info messages.
+ * _EGL_FATAL messages are printed to stderr
+ * The EGL_LOG_LEVEL var controls the output of other warning/info/debug msgs.
  */
 
 
@@ -10,37 +12,41 @@
 #include "egllog.h"
 
 #define MAXSTRING 1000
-#define FALLBACK_LOG_LEVEL      _EGL_DEBUG
-#define FALLBACK_LOG_LEVEL_STR  "debug"
+#define FALLBACK_LOG_LEVEL      _EGL_WARNING
+#define FALLBACK_LOG_LEVEL_STR  "warning"
 
 static EGLint ReportingLevel = -1;
 
 
 static void
-log_level_initialize (void)
+log_level_initialize(void)
 {
-   char *log_env = getenv ("EGL_LOG_LEVEL");
+#if defined(_EGL_PLATFORM_X)  
+   char *log_env = getenv("EGL_LOG_LEVEL");
+#else
+   char *log_env = NULL;
+#endif
 
    if (log_env == NULL) {
       ReportingLevel = FALLBACK_LOG_LEVEL;
    }
-   else if (strcasecmp (log_env, "fatal") == 0) {
+   else if (strcasecmp(log_env, "fatal") == 0) {
       ReportingLevel = _EGL_FATAL;
    }
-   else if (strcasecmp (log_env, "warning") == 0) {
+   else if (strcasecmp(log_env, "warning") == 0) {
       ReportingLevel = _EGL_WARNING;
    }
-   else if (strcasecmp (log_env, "info") == 0) {
+   else if (strcasecmp(log_env, "info") == 0) {
       ReportingLevel = _EGL_INFO;
    }
-   else if (strcasecmp (log_env, "debug") == 0) {
+   else if (strcasecmp(log_env, "debug") == 0) {
       ReportingLevel = _EGL_DEBUG;
    }
    else {
-      fprintf (stderr, "Unrecognized EGL_LOG_LEVEL environment variable value. "
-               "Expected one of \"fatal\", \"warning\", \"info\", \"debug\". "
-               "Got \"%s\". Falling back to \"%s\".\n",
-               log_env, FALLBACK_LOG_LEVEL_STR);
+      fprintf(stderr, "Unrecognized EGL_LOG_LEVEL environment variable value. "
+              "Expected one of \"fatal\", \"warning\", \"info\", \"debug\". "
+              "Got \"%s\". Falling back to \"%s\".\n",
+              log_env, FALLBACK_LOG_LEVEL_STR);
       ReportingLevel = FALLBACK_LOG_LEVEL;
    }
 }
@@ -59,7 +65,7 @@ _eglLog(EGLint level, const char *fmtStr, ...)
    static int log_level_initialized = 0;
 
    if (!log_level_initialized) {
-      log_level_initialize ();
+      log_level_initialize();
       log_level_initialized = 1;
    }
 
@@ -85,7 +91,7 @@ _eglLog(EGLint level, const char *fmtStr, ...)
       vsnprintf(msg, MAXSTRING, fmtStr, args);
       va_end(args);
 
-      fprintf(stderr, "EGL %s: %s\n", levelStr, msg);
+      fprintf(stderr, "libEGL %s: %s\n", levelStr, msg);
 
       if (level == _EGL_FATAL) {
          exit(1); /* or abort()? */