From 177fd320d6fdccad09397fc54a1cefc94e1c4de0 Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Fri, 8 Sep 2017 11:53:47 +0100 Subject: [PATCH] glx: turn LIBGL_ALWAYS_INDIRECT into a boolean Instead of setting based on set/unset, allow users to use boolean values. In the docs, use `ALWAYS=true` instead of `ALWAYS=1` as it's clearer IMO. Signed-off-by: Eric Engestrom Reviewed-by: Emil Velikov --- docs/envvars.html | 2 +- docs/libGL.txt | 2 +- src/glx/glxext.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/envvars.html b/docs/envvars.html index b70528fa467..aeb5ff28478 100644 --- a/docs/envvars.html +++ b/docs/envvars.html @@ -29,7 +29,7 @@ sometimes be useful for debugging end-user issues.
  • LIBGL_DEBUG - If defined debug information will be printed to stderr. If set to 'verbose' additional information will be printed.
  • LIBGL_DRIVERS_PATH - colon-separated list of paths to search for DRI drivers -
  • LIBGL_ALWAYS_INDIRECT - forces an indirect rendering context/connection. +
  • LIBGL_ALWAYS_INDIRECT - if set to `true`, forces an indirect rendering context/connection.
  • LIBGL_ALWAYS_SOFTWARE - if set to `true`, always use software rendering
  • LIBGL_NO_DRAWARRAYS - if set do not use DrawArrays GLX protocol (for debugging)
  • LIBGL_SHOW_FPS - print framerate to stdout based on the number of glXSwapBuffers diff --git a/docs/libGL.txt b/docs/libGL.txt index 839e330cf06..b69b8c07fcb 100644 --- a/docs/libGL.txt +++ b/docs/libGL.txt @@ -59,7 +59,7 @@ to learn if it is thread safe. Indirect Rendering You can force indirect rendering mode by setting the LIBGL_ALWAYS_INDIRECT -environment variable. Hardware acceleration will not be used. +environment variable to `true`. Hardware acceleration will not be used. diff --git a/src/glx/glxext.c b/src/glx/glxext.c index cd9a3ba6ba0..40219397129 100644 --- a/src/glx/glxext.c +++ b/src/glx/glxext.c @@ -907,7 +907,7 @@ __glXInitialize(Display * dpy) dpyPriv->glXDrawHash = __glxHashCreate(); #if defined(GLX_DIRECT_RENDERING) && !defined(GLX_USE_APPLEGL) - glx_direct = (getenv("LIBGL_ALWAYS_INDIRECT") == NULL); + glx_direct = !env_var_as_boolean("LIBGL_ALWAYS_INDIRECT", false); glx_accel = !env_var_as_boolean("LIBGL_ALWAYS_SOFTWARE", false); dpyPriv->drawHash = __glxHashCreate(); -- 2.30.2