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

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

Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
This commit is contained in:
Timothy Arceri 2017-03-15 15:20:48 +11:00
parent 315e8a9321
commit 2845a108a9
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -156,6 +156,8 @@ radv_create_shader_variant_from_pipeline_cache(struct radv_device *device,
if (cache) if (cache)
entry = radv_pipeline_cache_search(cache, sha1); entry = radv_pipeline_cache_search(cache, sha1);
else
entry = radv_pipeline_cache_search(device->mem_cache, sha1);
if (!entry) if (!entry)
return NULL; return NULL;
@ -258,13 +260,14 @@ radv_pipeline_cache_add_entry(struct radv_pipeline_cache *cache,
} }
struct radv_shader_variant * struct radv_shader_variant *
radv_pipeline_cache_insert_shader(struct radv_pipeline_cache *cache, radv_pipeline_cache_insert_shader(struct radv_device *device,
struct radv_pipeline_cache *cache,
const unsigned char *sha1, const unsigned char *sha1,
struct radv_shader_variant *variant, struct radv_shader_variant *variant,
const void *code, unsigned code_size) const void *code, unsigned code_size)
{ {
if (!cache) if (!cache)
return variant; cache = device->mem_cache;
pthread_mutex_lock(&cache->mutex); pthread_mutex_lock(&cache->mutex);
struct cache_entry *entry = radv_pipeline_cache_search_unlocked(cache, sha1); struct cache_entry *entry = radv_pipeline_cache_search_unlocked(cache, sha1);

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

@ -316,7 +316,8 @@ radv_create_shader_variant_from_pipeline_cache(struct radv_device *device,
const unsigned char *sha1); const unsigned char *sha1);
struct radv_shader_variant * struct radv_shader_variant *
radv_pipeline_cache_insert_shader(struct radv_pipeline_cache *cache, radv_pipeline_cache_insert_shader(struct radv_device *device,
struct radv_pipeline_cache *cache,
const unsigned char *sha1, const unsigned char *sha1,
struct radv_shader_variant *variant, struct radv_shader_variant *variant,
const void *code, unsigned code_size); const void *code, unsigned code_size);