fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 00:58:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Revert "radv: fallback to an in-memory cache when no pipline cache is provided"

Browse source 
This reverts commit 2845a108a9.

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 <airlied@redhat.com>
This commit is contained in:
Dave Airlie 2017-03-20 13:24:02 +10:00
parent 72fa447d45
commit 10c2b588c4
3 changed files with 6 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/amd/vulkan/radv_pipeline.c
View file

@ -564,8 +564,7 @@ radv_pipeline_compile(struct radv_pipeline *pipeline,
if (pipeline->gs_copy_shader) {
pipeline->gs_copy_shader =
radv_pipeline_cache_insert_shader(pipeline->device,
cache,
radv_pipeline_cache_insert_shader(cache,
gs_copy_sha1,
pipeline->gs_copy_shader,
gs_copy_code,
@ -576,10 +575,8 @@ radv_pipeline_compile(struct radv_pipeline *pipeline,
ralloc_free(nir);
if (variant)
variant = radv_pipeline_cache_insert_shader(pipeline->device,
cache, sha1,
variant, code,
code_size);
variant = radv_pipeline_cache_insert_shader(cache, sha1, variant,
code, code_size);
if (code)
free(code);

7
src/amd/vulkan/radv_pipeline_cache.c
View file

@ -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);

3
src/amd/vulkan/radv_private.h
View file

@ -316,8 +316,7 @@ radv_create_shader_variant_from_pipeline_cache(struct radv_device *device,
const unsigned char *sha1);
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);