From 788cfe061bc2e564aaeaf7ea23f5cc951b85623a Mon Sep 17 00:00:00 2001
From: Emma Anholt <emma@anholt.net>
Date: Tue, 25 Apr 2023 13:20:53 -0700
Subject: [PATCH] vulkan: Actually increment the count of objects in
 GetPipelineCacheData.

Otherwise a load of the cache won't load any of the objects in it!

Fixes: 591da9877900 ("vulkan: Add a common VkPipelineCache implementation")
Reviewed-by: Faith Ekstrand <faith.ekstrand@collabora.com>
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22700>
(cherry picked from commit c93b179d76adadfb44a5d6e7a878c719943a9dc2)
---
 .pick_status.json                      | 2 +-
 src/vulkan/runtime/vk_pipeline_cache.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.pick_status.json b/.pick_status.json
index 0e27879ddf9..1b2e7093725 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -112,7 +112,7 @@
         "description": "vulkan: Actually increment the count of objects in GetPipelineCacheData.",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "591da9877900c56434f9e23e0ad0058b118b0be8"
     },
diff --git a/src/vulkan/runtime/vk_pipeline_cache.c b/src/vulkan/runtime/vk_pipeline_cache.c
index 27a246496e9..964a4faef66 100644
--- a/src/vulkan/runtime/vk_pipeline_cache.c
+++ b/src/vulkan/runtime/vk_pipeline_cache.c
@@ -783,6 +783,8 @@ vk_common_GetPipelineCacheData(VkDevice _device,
 
          assert(data_size_resv >= 0);
          blob_overwrite_uint32(&blob, data_size_resv, data_size);
+
+         count++;
       }
    }