AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

util/disk_cache: Allow disk cache on Android if explicitly enabled

Browse Source 
Disk cache is disabled on Android because by default it is
managed by EGL_ANDROID_blob_cache layer. However there are cases
or custom Android builds where disk cache is needed, then it can be
explicitly enabled via `mesa.shader.cache.disable=false` property
and cache path must be set via `mesa.shader.cache.dir`.

Signed-off-by: Danylo Piliaiev <dpiliaiev@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/36821>
This commit is contained in:
Danylo Piliaiev
2025-02-17 12:40:58 +01:00
committed by Marge Bot
parent ff9ba2cef0
commit 3ec7615e54
2 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/util/disk_cache.c
View File

@@ -46,6 +46,7 @@
#include "util/perf/cpu_trace.h"
#include "util/ralloc.h"
#include "util/compiler.h"
#include "util/log.h"
#include "disk_cache.h"
#include "disk_cache_os.h"
@@ -325,9 +326,9 @@ void
disk_cache_destroy(struct disk_cache *cache)
{
if (unlikely(cache && cache->stats.enabled)) {
printf("disk shader cache: hits = %u, misses = %u\n",
cache->stats.hits,
cache->stats.misses);
mesa_logi("disk shader cache: hits = %u, misses = %u\n",
cache->stats.hits,
cache->stats.misses);
}
if (cache && util_queue_is_initialized(&cache->cache_queue)) {

19
src/util/disk_cache_os.c
View File

@@ -1005,23 +1005,25 @@ disk_cache_generate_cache_dir(void *mem_ctx, const char *gpu_name,
bool
disk_cache_enabled()
{
/* Disk cache is not enabled for android, but android's EGL layer
* uses EGL_ANDROID_blob_cache to manage the cache itself:
*/
if (DETECT_OS_ANDROID)
return false;
/* If running as a users other than the real user disable cache */
if (!__normal_user())
return false;
/* At user request, disable shader cache entirely. */
#ifdef SHADER_CACHE_DISABLE_BY_DEFAULT
/* At user request, disable shader cache entirely.
* Disk cache is not enabled by default for android, for most
* applications the EGL layer uses EGL_ANDROID_blob_cache to manage
* the cache itself, however those that wish to use the cache directly
* can set `mesa.shader.cache.disable=false` property.
* Don't forget to also set the shader cache path to something readable
* and writable by the application via `mesa.shader.cache.dir`.
*/
#if defined(SHADER_CACHE_DISABLE_BY_DEFAULT) || DETECT_OS_ANDROID
bool disable_by_default = true;
#else
bool disable_by_default = false;
#endif
char *envvar_name = "MESA_SHADER_CACHE_DISABLE";
#if !DETECT_OS_ANDROID
if (!getenv(envvar_name)) {
envvar_name = "MESA_GLSL_CACHE_DISABLE";
if (getenv(envvar_name))
@@ -1029,6 +1031,7 @@ disk_cache_enabled()
"*** MESA_GLSL_CACHE_DISABLE is deprecated; "
"use MESA_SHADER_CACHE_DISABLE instead ***\n");
}
#endif
if (debug_get_bool_option(envvar_name, disable_by_default) ||
/* MESA_GLSL_DISABLE_IO_OPT must disable the cache to get expected