[Mesa-dev] [PATCH 4/4] Revert "glsl: Switch to disable-by-default for the GLSL shader cache"

[Timothy Arceri]

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 at amd.com>
Tested-by: Michel Dänzer <michel.daenzer at amd.com>
---
 src/compiler/glsl/tests/cache_test.c | 5 -----
 src/util/disk_cache.c                | 7 -------
 2 files changed, 12 deletions(-)

diff --git a/src/compiler/glsl/tests/cache_test.c b/src/compiler/glsl/tests/cache_test.c
index c4e6e36..de92e5a 100644
--- a/src/compiler/glsl/tests/cache_test.c
+++ b/src/compiler/glsl/tests/cache_test.c
@@ -421,25 +421,20 @@ test_put_key_and_get_key(void)
    disk_cache_destroy(cache);
 }
 #endif /* ENABLE_SHADER_CACHE */
 
 int
 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();
 
    test_put_key_and_get_key();
 
    err = rmrf_local(CACHE_TEST_TMP);
    expect_equal(err, 0, "Removing " CACHE_TEST_TMP " again");
 #endif /* ENABLE_SHADER_CACHE */
 
diff --git a/src/util/disk_cache.c b/src/util/disk_cache.c
index 2a0edca..7c881ed 100644
--- a/src/util/disk_cache.c
+++ b/src/util/disk_cache.c
@@ -207,27 +207,20 @@ disk_cache_create(const char *gpu_name, const char *timestamp)
 
    /* A ralloc context for transient data during this invocation. */
    local = ralloc_context(NULL);
    if (local == NULL)
       goto fail;
 
    /* At user request, disable shader cache entirely. */
    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
     *   $XDG_CACHE_HOME/mesa
     *   <pwd.pw_dir>/.cache/mesa
     */
    path = getenv("MESA_GLSL_CACHE_DIR");
    if (path) {
       if (mkdir_if_needed(path) == -1)
          goto fail;
-- 
2.9.3