Merge branch 'origin' into glsl-compiler-1

Conflicts:

	src/mesa/main/state.c
	src/mesa/shader/program.c
	src/mesa/shader/program.h
	src/mesa/shader/programopt.c
	src/mesa/shader/slang/slang_execute.c
	src/mesa/sources
	src/mesa/swrast/s_arbshader.c
	src/mesa/swrast/s_context.c
	src/mesa/swrast/s_span.c
	src/mesa/swrast/s_zoom.c
	src/mesa/tnl/t_context.c
	src/mesa/tnl/t_save_api.c
	src/mesa/tnl/t_vb_arbprogram.c
	src/mesa/tnl/t_vp_build.c
	src/mesa/tnl/t_vtx_eval.c

1 files changed, 39 insertions, 2 deletions

diff --git a/src/egl/main/egllog.c b/src/egl/main/egllog.c
index 59b1d2684e3..dc1daaa996a 100644
--- a/src/egl/main/egllog.c
+++ b/src/egl/main/egllog.c
@@ -6,13 +6,44 @@
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include "egllog.h"
 
 #define MAXSTRING 1000
+#define FALLBACK_LOG_LEVEL      _EGL_DEBUG
+#define FALLBACK_LOG_LEVEL_STR  "debug"
 
+static EGLint ReportingLevel = -1;
 
-/* XXX init this with an env var or something */
-static EGLint ReportingLevel = _EGL_DEBUG;
+
+static void
+log_level_initialize (void)
+{
+   char *log_env = getenv ("EGL_LOG_LEVEL");
+
+   if (log_env == NULL) {
+      ReportingLevel = FALLBACK_LOG_LEVEL;
+   }
+   else if (strcasecmp (log_env, "fatal") == 0) {
+      ReportingLevel = _EGL_FATAL;
+   }
+   else if (strcasecmp (log_env, "warning") == 0) {
+      ReportingLevel = _EGL_WARNING;
+   }
+   else if (strcasecmp (log_env, "info") == 0) {
+      ReportingLevel = _EGL_INFO;
+   }
+   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);
+      ReportingLevel = FALLBACK_LOG_LEVEL;
+   }
+}
 
 
 /**
@@ -25,6 +56,12 @@ _eglLog(EGLint level, const char *fmtStr, ...)
    va_list args;
    char msg[MAXSTRING];
    const char *levelStr;
+   static int log_level_initialized = 0;
+
+   if (!log_level_initialized) {
+      log_level_initialize ();
+      log_level_initialized = 1;
+   }
 
    if (level <= ReportingLevel) {
       switch (level) {