diff options
| author | Timothy Arceri <[email protected]> | 2017-03-15 12:40:53 +1100 |
|---|---|---|
| committer | Timothy Arceri <[email protected]> | 2017-03-17 16:17:10 +1100 |
| commit | 4ffdab78b9a497a8b597466bb6151837f71b0c6a (patch) | |
| tree | d6eb2a72bc8efbf1adcf690e112ec1733c26fe5b /src | |
| parent | 124ec417f968bfb081b238fdcde04b9aaf9d6a2d (diff) | |
radv: move cache check inside insert and search functions
This will allow us to use fallback in-memory and on-disk caches
should the app not provide a pipeline cache.
Reviewed-by: Bas Nieuwenhuizen <[email protected]>
Diffstat (limited to 'src')
| -rw-r--r-- | src/amd/vulkan/radv_pipeline.c | 28 | ||||
| -rw-r--r-- | src/amd/vulkan/radv_pipeline_cache.c | 8 |
2 files changed, 20 insertions, 16 deletions
diff --git a/src/amd/vulkan/radv_pipeline.c b/src/amd/vulkan/radv_pipeline.c index df763964970..13ae87c3c49 100644 --- a/src/amd/vulkan/radv_pipeline.c +++ b/src/amd/vulkan/radv_pipeline.c @@ -528,21 +528,19 @@ radv_pipeline_compile(struct radv_pipeline *pipeline, radv_hash_shader(gs_copy_sha1, module, entrypoint, spec_info, layout, key, 1); - if (cache) { - variant = radv_create_shader_variant_from_pipeline_cache(pipeline->device, - cache, - sha1); + variant = radv_create_shader_variant_from_pipeline_cache(pipeline->device, + cache, + sha1); - if (stage == MESA_SHADER_GEOMETRY) { - pipeline->gs_copy_shader = - radv_create_shader_variant_from_pipeline_cache( - pipeline->device, - cache, - gs_copy_sha1); - } - if (variant) - return variant; + if (stage == MESA_SHADER_GEOMETRY) { + pipeline->gs_copy_shader = + radv_create_shader_variant_from_pipeline_cache( + pipeline->device, + cache, + gs_copy_sha1); } + if (variant) + return variant; nir = radv_shader_compile_to_nir(pipeline->device, module, entrypoint, stage, @@ -559,7 +557,7 @@ radv_pipeline_compile(struct radv_pipeline *pipeline, pipeline->gs_copy_shader = radv_pipeline_create_gs_copy_shader( pipeline, nir, &gs_copy_code, &gs_copy_code_size, dump); - if (pipeline->gs_copy_shader && cache) { + if (pipeline->gs_copy_shader) { pipeline->gs_copy_shader = radv_pipeline_cache_insert_shader(cache, gs_copy_sha1, @@ -571,7 +569,7 @@ radv_pipeline_compile(struct radv_pipeline *pipeline, if (!module->nir) ralloc_free(nir); - if (variant && cache) + if (variant) variant = radv_pipeline_cache_insert_shader(cache, sha1, variant, code, code_size); diff --git a/src/amd/vulkan/radv_pipeline_cache.c b/src/amd/vulkan/radv_pipeline_cache.c index 83bf3cb6af4..5f6355f0d1a 100644 --- a/src/amd/vulkan/radv_pipeline_cache.c +++ b/src/amd/vulkan/radv_pipeline_cache.c @@ -152,7 +152,10 @@ radv_create_shader_variant_from_pipeline_cache(struct radv_device *device, struct radv_pipeline_cache *cache, const unsigned char *sha1) { - struct cache_entry *entry = radv_pipeline_cache_search(cache, sha1); + struct cache_entry *entry = NULL; + + if (cache) + entry = radv_pipeline_cache_search(cache, sha1); if (!entry) return NULL; @@ -260,6 +263,9 @@ radv_pipeline_cache_insert_shader(struct radv_pipeline_cache *cache, struct radv_shader_variant *variant, const void *code, unsigned code_size) { + if (!cache) + return variant; + pthread_mutex_lock(&cache->mutex); struct cache_entry *entry = radv_pipeline_cache_search_unlocked(cache, sha1); if (entry) { |