Mesa (main): radv: simplify re-using cache entries in radv_pipeline_cache_insert_shaders()

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: ffbad81305bfbafb23c07a20bab8a138bbafa6a5
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=ffbad81305bfbafb23c07a20bab8a138bbafa6a5

Author: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Date:   Tue Nov 16 19:07:55 2021 +0100

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 at gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13823>

---

 src/amd/vulkan/radv_pipeline_cache.c | 15 +++++++--------
 1 file 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;