From 2a1e32b4105fe95413a615a44d40938920ea1a19 Mon Sep 17 00:00:00 2001 From: David McFarland Date: Mon, 6 Aug 2018 15:52:11 -0300 Subject: [PATCH] disk_cache: include dri driver path in cache key This fixes invalid cache hits on NixOS where all shared library timestamps in /nix/store are zero. --- meson_options.txt | 6 ++++++ src/util/disk_cache.c | 3 +++ src/util/meson.build | 7 ++++++- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/meson_options.txt b/meson_options.txt index a723b5406cf..65a8954291f 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -330,3 +330,9 @@ option( value : true, description : 'Enable direct rendering in GLX and EGL for DRI', ) +option( + 'disk-cache-key', + type : 'string', + value : '', + description : 'Mesa cache key.' +) diff --git a/src/util/disk_cache.c b/src/util/disk_cache.c index 0aa2646a9bb..bd784d38e21 100644 --- a/src/util/disk_cache.c +++ b/src/util/disk_cache.c @@ -389,8 +389,10 @@ disk_cache_create(const char *gpu_name, const char *driver_id, /* Create driver id keys */ size_t id_size = strlen(driver_id) + 1; + size_t key_size = strlen(DISK_CACHE_KEY) + 1; size_t gpu_name_size = strlen(gpu_name) + 1; cache->driver_keys_blob_size += id_size; + cache->driver_keys_blob_size += key_size; cache->driver_keys_blob_size += gpu_name_size; /* We sometimes store entire structs that contains a pointers in the cache, @@ -411,6 +413,7 @@ disk_cache_create(const char *gpu_name, const char *driver_id, uint8_t *drv_key_blob = cache->driver_keys_blob; DRV_KEY_CPY(drv_key_blob, &cache_version, cv_size) DRV_KEY_CPY(drv_key_blob, driver_id, id_size) + DRV_KEY_CPY(drv_key_blob, DISK_CACHE_KEY, key_size) DRV_KEY_CPY(drv_key_blob, gpu_name, gpu_name_size) DRV_KEY_CPY(drv_key_blob, &ptr_size, ptr_size_size) DRV_KEY_CPY(drv_key_blob, &driver_flags, driver_flags_size) diff --git a/src/util/meson.build b/src/util/meson.build index 397c2228129..77013563e5d 100644 --- a/src/util/meson.build +++ b/src/util/meson.build @@ -120,7 +120,12 @@ libmesa_util = static_library( [files_mesa_util, format_srgb], include_directories : inc_common, dependencies : [dep_zlib, dep_clock, dep_thread, dep_atomic, dep_m], - c_args : [c_msvc_compat_args, c_vis_args], + c_args : [ + c_msvc_compat_args, c_vis_args, + '-DDISK_CACHE_KEY="@0@"'.format( + get_option('disk-cache-key') + ), + ], build_by_default : false ) -- 2.19.2