util/disk_cache: turn MESA_GLSL_CACHE_DISABLE into a boolean

Instead of setting based on set/unset, allow users to use boolean values.
In the docs and tests, use `DISABLE=true` instead of `DISABLE=1` as it's
clearer IMO.

Signed-off-by: Eric Engestrom <eric.engestrom@imgtec.com>
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>

diff --git a/docs/envvars.html b/docs/envvars.html
index 45e45eb0c9f66a05fd96d8d157ecc697efef3edc..51c930f013f094c61b6d9b71594d96ae8595f872 100644 (file)
--- a/docs/envvars.html
+++ b/docs/envvars.html
@@ -117,7 +117,7 @@ glGetString(GL_VERSION) for OpenGL ES.
 glGetString(GL_SHADING_LANGUAGE_VERSION). Valid values are integers, such as
 "130".  Mesa will not really implement all the features of the given language version
 if it's higher than what's normally reported. (for developers only)
-<li>MESA_GLSL_CACHE_DISABLE - if set, disables the GLSL shader cache
+<li>MESA_GLSL_CACHE_DISABLE - if set to `true`, disables the GLSL shader cache
 <li>MESA_GLSL_CACHE_MAX_SIZE - if set, determines the maximum size of
 the on-disk cache of compiled GLSL programs. Should be set to a number
 optionally followed by 'K', 'M', or 'G' to specify a size in

diff --git a/src/compiler/glsl/tests/cache_test.c b/src/compiler/glsl/tests/cache_test.c
index 8e7912c71b6b5fb0f554023e6bb8b1f181df45b9..75319f1160e68af421c44d531b9b9b30538d43e2 100644 (file)
--- a/src/compiler/glsl/tests/cache_test.c
+++ b/src/compiler/glsl/tests/cache_test.c
@@ -156,9 +156,9 @@ test_disk_cache_create(void)
    int err;
 
    /* Before doing anything else, ensure that with
-    * MESA_GLSL_CACHE_DISABLE set, that disk_cache_create returns NULL.
+    * MESA_GLSL_CACHE_DISABLE set to true, that disk_cache_create returns NULL.
     */
-   setenv("MESA_GLSL_CACHE_DISABLE", "1", 1);
+   setenv("MESA_GLSL_CACHE_DISABLE", "true", 1);
    cache = disk_cache_create("test", "make_check", 0);
    expect_null(cache, "disk_cache_create with MESA_GLSL_CACHE_DISABLE set");
 

diff --git a/src/util/disk_cache.c b/src/util/disk_cache.c
index 33e4dc8e7df0d725e6a01b1a59f0fbfbe9929f73..17913a913bd6db3a93aaed848064003fa6802ca9 100644 (file)
--- a/src/util/disk_cache.c
+++ b/src/util/disk_cache.c
@@ -40,6 +40,7 @@
 #include "zlib.h"
 
 #include "util/crc32.h"
+#include "util/debug.h"
 #include "util/rand_xor.h"
 #include "util/u_atomic.h"
 #include "util/u_queue.h"
@@ -204,7 +205,7 @@ disk_cache_create(const char *gpu_name, const char *timestamp,
       goto fail;
 
    /* At user request, disable shader cache entirely. */
-   if (getenv("MESA_GLSL_CACHE_DISABLE"))
+   if (env_var_as_boolean("MESA_GLSL_CACHE_DISABLE", false))
       goto fail;
 
    /* Determine path for cache based on the first defined name as follows: