summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTimothy Arceri <tarceri@itsqueeze.com>2017-02-23 13:09:03 +1100
committerTimothy Arceri <tarceri@itsqueeze.com>2017-03-06 09:38:07 +1100
commite3a01a5d1b019e7b00218ba526874f4c77ea8bee (patch)
tree120450eb2c1f2a1500c1fd1ac6c97f70c7436420
parentee8d2e280445b3f732e010bc6e2507483213a51a (diff)
Revert "glsl: Switch to disable-by-default for the GLSL shader cache"
This reverts commit 0f60c6616e93cba72bff4fbfedb72a753ef78e05. Piglit and all games tested so far seem to be working without issue. This change will allow wide user testing and we can decided before the next release if we need to turn it off again. Reviewed-by: Marek Olšák <marek.olsak@amd.com>
-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