mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-20 04:33:57 +00:00
89023c38fc
I made a mistake merge. Reverting it inc778945806undid the state on master, but now I realize it crippled the git merge mechanism. As the merge contained a mix of commits from `master..staging-next` and other commits from `staging-next..staging`, it got the `staging-next` branch into a state that was difficult to recover. I reconstructed the "desired" state of staging-next tree by: - checking out the last commit of the problematic range:4effe769e2- `git rebase -i --preserve-merges a8a018ddc0` - dropping the mistaken merge commit and its revert from that range (while keeping reapplication from4effe769e2) - merging the last unaffected staging-next commit (803ca85c20) - fortunately no other commits have been pushed to staging-next yet - applying a diff on staging-next to get it into that state
75 lines
2.5 KiB
Diff
75 lines
2.5 KiB
Diff
From 980164fd92f5c2302624cd046d30ff21e6e4ba8a Mon Sep 17 00:00:00 2001
|
|
From: David McFarland <corngood@gmail.com>
|
|
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 2d39d13b6ad..daf06480a60 100644
|
|
--- a/meson_options.txt
|
|
+++ b/meson_options.txt
|
|
@@ -368,6 +368,12 @@ option(
|
|
value : true,
|
|
description : 'Enable direct rendering in GLX and EGL for DRI',
|
|
)
|
|
+option(
|
|
+ 'disk-cache-key',
|
|
+ type : 'string',
|
|
+ value : '',
|
|
+ description : 'Mesa cache key.'
|
|
+)
|
|
option(
|
|
'prefer-iris',
|
|
type : 'boolean',
|
|
diff --git a/src/util/disk_cache.c b/src/util/disk_cache.c
|
|
index a92d621927a..3bd65c6890c 100644
|
|
--- a/src/util/disk_cache.c
|
|
+++ b/src/util/disk_cache.c
|
|
@@ -401,8 +401,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,
|
|
@@ -423,6 +425,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 0893f64793b..d46ce85a85f 100644
|
|
--- a/src/util/meson.build
|
|
+++ b/src/util/meson.build
|
|
@@ -179,7 +179,12 @@ _libmesa_util = static_library(
|
|
include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
|
|
dependencies : deps_for_libmesa_util,
|
|
link_with: libmesa_format,
|
|
- c_args : [c_msvc_compat_args],
|
|
+ c_args : [
|
|
+ c_msvc_compat_args,
|
|
+ '-DDISK_CACHE_KEY="@0@"'.format(
|
|
+ get_option('disk-cache-key')
|
|
+ ),
|
|
+ ],
|
|
gnu_symbol_visibility : 'hidden',
|
|
build_by_default : false
|
|
)
|
|
--
|
|
2.28.0
|
|
|