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

[Marek Olšák]

On Thu, Feb 23, 2017 at 5:55 PM, Timothy Arceri <tarceri at itsqueeze.com> wrote:
> On 24/02/17 02:09, Marek Olšák wrote:
>>
>> On Thu, Feb 23, 2017 at 3:09 AM, Timothy Arceri <tarceri at itsqueeze.com>
>> wrote:
>>>
>>> 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.
>>> ---
>>>
>>> I'm in the process of doing some CTS testing. I can hold this
>>> patch back if there are any issues.
>>>
>>>  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
>>> @@ -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 f5e1145..f280f1b 100644
>>> --- a/src/util/disk_cache.c
>>> +++ b/src/util/disk_cache.c
>>> @@ -213,13 +213,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;
>>
>>
>> Maybe keep the variable, but default to 1?
>
>
> Yeah there is already a MESA_GLSL_CACHE_DISABLE, so I don't think we need to
> keep it. Karl wrote this patch to be reverted at some point.
>
> I'm thinking that we should probably be disabling per driver anyway, a
> global disable isn't going to work if we want to enable this in radeonsi but
> i965 still wants to have it disabled by default.

Sounds good.

Reviewed-by: Marek Olšák <marek.olsak at amd.com>

Marek