summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Engestrom <[email protected]>2017-09-08 11:55:14 +0100
committerEric Engestrom <[email protected]>2017-09-12 13:53:12 +0100
commit14e431b270331ee8c6d638729b4b8e8703f8e52e (patch)
treebaec82d4f427818534d51905f1a9cca4ec60fae6
parent177fd320d6fdccad09397fc54a1cefc94e1c4de0 (diff)
egl+glx: turn LIBGL_DRI3_DISABLE into a boolean
Instead of setting based on set/unset, allow users to use boolean values. In the docs, use `DISABLE=true` instead of `DISABLE=1` as it's clearer IMO. Signed-off-by: Eric Engestrom <[email protected]> Reviewed-by: Emil Velikov <[email protected]>
-rw-r--r--docs/envvars.html2
-rw-r--r--src/egl/drivers/dri2/platform_x11.c2
-rw-r--r--src/glx/glxext.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/docs/envvars.html b/docs/envvars.html
index aeb5ff28478..89563e36361 100644
--- a/docs/envvars.html
+++ b/docs/envvars.html
@@ -34,7 +34,7 @@ sometimes be useful for debugging end-user issues.
<li>LIBGL_NO_DRAWARRAYS - if set do not use DrawArrays GLX protocol (for debugging)
<li>LIBGL_SHOW_FPS - print framerate to stdout based on the number of glXSwapBuffers
calls per second.
-<li>LIBGL_DRI3_DISABLE - disable DRI3 if set (the value does not matter)
+<li>LIBGL_DRI3_DISABLE - disable DRI3 if set to `true`.
</ul>
diff --git a/src/egl/drivers/dri2/platform_x11.c b/src/egl/drivers/dri2/platform_x11.c
index 5d5eea3773b..d80eee2969a 100644
--- a/src/egl/drivers/dri2/platform_x11.c
+++ b/src/egl/drivers/dri2/platform_x11.c
@@ -1461,7 +1461,7 @@ dri2_initialize_x11(_EGLDriver *drv, _EGLDisplay *disp)
if (!env_var_as_boolean("LIBGL_ALWAYS_SOFTWARE", false)) {
#ifdef HAVE_DRI3
- if (!getenv("LIBGL_DRI3_DISABLE"))
+ if (!env_var_as_boolean("LIBGL_DRI3_DISABLE", false))
initialized = dri2_initialize_x11_dri3(drv, disp);
#endif
diff --git a/src/glx/glxext.c b/src/glx/glxext.c
index 40219397129..5f23d3717a4 100644
--- a/src/glx/glxext.c
+++ b/src/glx/glxext.c
@@ -920,7 +920,7 @@ __glXInitialize(Display * dpy)
#if defined(GLX_USE_DRM)
if (glx_direct && glx_accel) {
#if defined(HAVE_DRI3)
- if (!getenv("LIBGL_DRI3_DISABLE"))
+ if (!env_var_as_boolean("LIBGL_DRI3_DISABLE", false))
dpyPriv->dri3Display = dri3_create_display(dpy);
#endif /* HAVE_DRI3 */
dpyPriv->dri2Display = dri2CreateDisplay(dpy);