diff options
| author | Samuel Pitoiset <samuel.pitoiset@gmail.com> | 2021-11-16 19:07:55 +0100 |
|---|---|---|
| committer | Samuel Pitoiset <samuel.pitoiset@gmail.com> | 2021-11-17 08:15:53 +0100 |
| commit | ffbad81305bfbafb23c07a20bab8a138bbafa6a5 (patch) | |
| tree | 29cbf04f1b771df786578615b81b3b98c76e2780 | |
| parent | 836a4b58363d801ee628225b8ddfe4bf71223aa0 (diff) | |
radv: simplify re-using cache entries in radv_pipeline_cache_insert_shaders()
If entry->shaders[i] is NULL, shaders[i] should be also NULL, so the
else condition is a no-op.
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13823>
| -rw-r--r-- | src/amd/vulkan/radv_pipeline_cache.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/amd/vulkan/radv_pipeline_cache.c b/src/amd/vulkan/radv_pipeline_cache.c index 87fe7f5c7d8..ab2e1540b5a 100644 --- a/src/amd/vulkan/radv_pipeline_cache.c +++ b/src/amd/vulkan/radv_pipeline_cache.c @@ -402,14 +402,13 @@ radv_pipeline_cache_insert_shaders(struct radv_device *device, struct radv_pipel struct cache_entry *entry = radv_pipeline_cache_search_unlocked(cache, sha1); if (entry) { for (int i = 0; i < MESA_VULKAN_SHADER_STAGES; ++i) { - if (entry->shaders[i]) { - radv_shader_destroy(cache->device, shaders[i]); - shaders[i] = entry->shaders[i]; - } else { - entry->shaders[i] = shaders[i]; - } - if (shaders[i]) - p_atomic_inc(&shaders[i]->ref_count); + if (!entry->shaders[i]) + continue; + + radv_shader_destroy(cache->device, shaders[i]); + + shaders[i] = entry->shaders[i]; + p_atomic_inc(&shaders[i]->ref_count); } radv_pipeline_cache_unlock(cache); return; |