summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/compiler/glsl/tests/cache_test.c5
-rw-r--r--src/util/disk_cache.c7
2 files changed, 0 insertions, 12 deletions
diff --git a/src/compiler/glsl/tests/cache_test.c b/src/compiler/glsl/tests/cache_test.c
index c4e6e369942..de92e5aba0e 100644
--- a/src/compiler/glsl/tests/cache_test.c
+++ b/src/compiler/glsl/tests/cache_test.c
@@ -428,11 +428,6 @@ main(void)
#ifdef ENABLE_SHADER_CACHE
int err;
- /* While the shader cache is still experimental, this variable must
- * be set or the cache does nothing.
- */
- setenv("MESA_GLSL_CACHE_ENABLE", "1", 1);
-
test_disk_cache_create();
test_put_and_get();
diff --git a/src/util/disk_cache.c b/src/util/disk_cache.c
index 7f249399e0d..9a7c5c94350 100644
--- a/src/util/disk_cache.c
+++ b/src/util/disk_cache.c
@@ -242,13 +242,6 @@ disk_cache_create(const char *gpu_name, const char *timestamp)
if (getenv("MESA_GLSL_CACHE_DISABLE"))
goto fail;
- /* As a temporary measure, (while the shader cache is under
- * development, and known to not be fully functional), also require
- * the MESA_GLSL_CACHE_ENABLE variable to be set.
- */
- if (!getenv("MESA_GLSL_CACHE_ENABLE"))
- goto fail;
-
/* Determine path for cache based on the first defined name as follows:
*
* $MESA_GLSL_CACHE_DIR