From f4a9d205d8a6474defa86dc4f12b7e63e61a49d9 Mon Sep 17 00:00:00 2001
From: Eric Engestrom <eric.engestrom@imgtec.com>
Date: Fri, 8 Sep 2017 11:45:23 +0100
Subject: [PATCH] glx: turn LIBGL_DIAGNOSTIC into a boolean

Instead of setting based on set/unset, allow users to use boolean values.

Signed-off-by: Eric Engestrom <eric.engestrom@imgtec.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
---
 src/glx/Makefile.am               | 1 +
 src/glx/SConscript                | 1 +
 src/glx/apple/apple_glx_context.c | 4 +++-
 src/glx/apple/apple_glx_log.c     | 3 ++-
 src/glx/apple/apple_glx_pbuffer.c | 6 ++++--
 src/glx/glxext.c                  | 6 +++++-
 6 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/src/glx/Makefile.am b/src/glx/Makefile.am
index 34600475d98..5448a090764 100644
--- a/src/glx/Makefile.am
+++ b/src/glx/Makefile.am
@@ -99,6 +99,7 @@ libglx_la_SOURCES = \
 
 libglx_la_LIBADD = \
 	$(top_builddir)/src/loader/libloader.la \
+	$(top_builddir)/src/util/libmesautil.la \
 	$(top_builddir)/src/util/libxmlconfig.la
 
 if HAVE_DRISW
diff --git a/src/glx/SConscript b/src/glx/SConscript
index ca94d79519c..8ce17715814 100644
--- a/src/glx/SConscript
+++ b/src/glx/SConscript
@@ -29,6 +29,7 @@ env.Append(CPPDEFINES = [
 
 env.Prepend(LIBS = [
     libloader,
+    mesautil,
     glapi
 ])
 
diff --git a/src/glx/apple/apple_glx_context.c b/src/glx/apple/apple_glx_context.c
index 5650b4f3291..ff66ed499bf 100644
--- a/src/glx/apple/apple_glx_context.c
+++ b/src/glx/apple/apple_glx_context.c
@@ -55,6 +55,8 @@
 #include "apple_cgl.h"
 #include "apple_glx_drawable.h"
 
+#include "util/debug.h"
+
 static pthread_mutex_t context_lock = PTHREAD_MUTEX_INITIALIZER;
 
 /*
@@ -181,7 +183,7 @@ apple_glx_create_context(void **ptr, Display * dpy, int screen,
          *x11errorptr = false;
       }
 
-      if (getenv("LIBGL_DIAGNOSTIC"))
+      if (env_var_as_boolean("LIBGL_DIAGNOSTIC", false))
          fprintf(stderr, "error: %s\n", apple_cgl.error_string(error));
 
       return true;
diff --git a/src/glx/apple/apple_glx_log.c b/src/glx/apple/apple_glx_log.c
index 5b9a865b610..a3f446c26f2 100644
--- a/src/glx/apple/apple_glx_log.c
+++ b/src/glx/apple/apple_glx_log.c
@@ -36,12 +36,13 @@
 #include <inttypes.h>
 #include <pthread.h>
 #include "apple_glx_log.h"
+#include "util/debug.h"
 
 static bool diagnostic = false;
 static aslclient aslc;
 
 void apple_glx_log_init(void) {
-    if (getenv("LIBGL_DIAGNOSTIC")) {
+    if (env_var_as_boolean("LIBGL_DIAGNOSTIC", false)) {
         diagnostic = true;
     }
 
diff --git a/src/glx/apple/apple_glx_pbuffer.c b/src/glx/apple/apple_glx_pbuffer.c
index 142f4cce994..8c94d2010f4 100644
--- a/src/glx/apple/apple_glx_pbuffer.c
+++ b/src/glx/apple/apple_glx_pbuffer.c
@@ -40,12 +40,14 @@
 #include "apple_glx_context.h"
 #include "apple_glx_drawable.h"
 
+#include <stdbool.h>
 #include <stdlib.h>
 #include <pthread.h>
 #include <assert.h>
 #include "apple_glx.h"
 #include "glxconfig.h"
 #include "apple_cgl.h"
+#include "util/debug.h"
 
 /* mesa defines in glew.h, Apple in glext.h.
  * Due to namespace nightmares, just do it here.
@@ -208,7 +210,7 @@ get_max_size(int *widthresult, int *heightresult)
 
       err = apple_cgl.choose_pixel_format(attr, &pfobj, &vsref);
       if (kCGLNoError != err) {
-         if (getenv("LIBGL_DIAGNOSTIC")) {
+         if (env_var_as_boolean("LIBGL_DIAGNOSTIC", false)) {
             printf("choose_pixel_format error in %s: %s\n", __func__,
                    apple_cgl.error_string(err));
          }
@@ -220,7 +222,7 @@ get_max_size(int *widthresult, int *heightresult)
       err = apple_cgl.create_context(pfobj, NULL, &newcontext);
 
       if (kCGLNoError != err) {
-         if (getenv("LIBGL_DIAGNOSTIC")) {
+         if (env_var_as_boolean("LIBGL_DIAGNOSTIC", false)) {
             printf("create_context error in %s: %s\n", __func__,
                    apple_cgl.error_string(err));
          }
diff --git a/src/glx/glxext.c b/src/glx/glxext.c
index 9cbe3347723..3431f3e5cae 100644
--- a/src/glx/glxext.c
+++ b/src/glx/glxext.c
@@ -38,6 +38,8 @@
  */
 
 #include <assert.h>
+#include <stdbool.h>
+
 #include "glxclient.h"
 #include <X11/extensions/Xext.h>
 #include <X11/extensions/extutil.h>
@@ -47,6 +49,8 @@
 #endif
 #include "glxextensions.h"
 
+#include "util/debug.h"
+
 #include <X11/Xlib-xcb.h>
 #include <xcb/xcb.h>
 #include <xcb/glx.h>
@@ -577,7 +581,7 @@ __glXInitializeVisualConfigFromTags(struct glx_config * config, int count,
          i = count;
          break;
       default:
-         if(getenv("LIBGL_DIAGNOSTIC")) {
+         if(env_var_as_boolean("LIBGL_DIAGNOSTIC", false)) {
              long int tagvalue = *bp++;
              fprintf(stderr, "WARNING: unknown GLX tag from server: "
                      "tag 0x%lx value 0x%lx\n", tag, tagvalue);
-- 
2.11.0