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>

diff --git a/src/compiler/glsl/tests/cache_test.c b/src/compiler/glsl/tests/cache_test.c
index c4e6e36994253f0265e490b6e044789cf2e43ee9..de92e5aba0e5048fb54c2e1f6446438615d3b7fa 100644 (file)
--- 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 7f249399e0dfab73a1f2b6e32795171e3a37c66f..9a7c5c94350f3bddb34b6a701907e827202dea19 100644 (file)
--- 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