diff options
author | Dave Airlie <[email protected]> | 2017-03-20 13:24:02 +1000 |
---|---|---|
committer | Dave Airlie <[email protected]> | 2017-03-20 13:41:31 +1000 |
commit | 10c2b588c4bba94b329585734bfbdcd63accde90 (patch) | |
tree | 0a227337d57fad8579c630386fc284e5a798056a /src/amd/vulkan/radv_pipeline_cache.c | |
parent | 72fa447d45ed5401b6964c071013d8ecc4680b16 (diff) |
Revert "radv: fallback to an in-memory cache when no pipline cache is provided"
This reverts commit 2845a108a9a8bd4b0e6e9b590c976452fb99eb10.
This break VK-GL-CTS randomly.
./deqp-vk --deqp-case=dEQP-VK.texture.filtering.3d.formats.r4g4b4a4*
bounces around here from 6/6 to 3/6 or 4/6 to hanging.
Signed-off-by: Dave Airlie <[email protected]>
Diffstat (limited to 'src/amd/vulkan/radv_pipeline_cache.c')
-rw-r--r-- | src/amd/vulkan/radv_pipeline_cache.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/amd/vulkan/radv_pipeline_cache.c b/src/amd/vulkan/radv_pipeline_cache.c index 1fb8450021b..5f6355f0d1a 100644 --- a/src/amd/vulkan/radv_pipeline_cache.c +++ b/src/amd/vulkan/radv_pipeline_cache.c @@ -156,8 +156,6 @@ radv_create_shader_variant_from_pipeline_cache(struct radv_device *device, if (cache) entry = radv_pipeline_cache_search(cache, sha1); - else - entry = radv_pipeline_cache_search(device->mem_cache, sha1); if (!entry) return NULL; @@ -260,14 +258,13 @@ radv_pipeline_cache_add_entry(struct radv_pipeline_cache *cache, } struct radv_shader_variant * -radv_pipeline_cache_insert_shader(struct radv_device *device, - struct radv_pipeline_cache *cache, +radv_pipeline_cache_insert_shader(struct radv_pipeline_cache *cache, const unsigned char *sha1, struct radv_shader_variant *variant, const void *code, unsigned code_size) { if (!cache) - cache = device->mem_cache; + return variant; pthread_mutex_lock(&cache->mutex); struct cache_entry *entry = radv_pipeline_cache_search_unlocked(cache, sha1); |