From cdbd86c17625b8803eb4d243eacb3369f720e903 Mon Sep 17 00:00:00 2001
From: Faith Ekstrand <faith.ekstrand@collabora.com>
Date: Wed, 27 Sep 2023 15:09:53 -0500
Subject: [PATCH] nvk: Add a default pipeline cache

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25443>
---
 src/nouveau/vulkan/nvk_device.c | 15 ++++++++++++++-
 src/nouveau/vulkan/nvk_device.h |  3 +++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/nouveau/vulkan/nvk_device.c b/src/nouveau/vulkan/nvk_device.c
index 960703c9895..58b133f13c3 100644
--- a/src/nouveau/vulkan/nvk_device.c
+++ b/src/nouveau/vulkan/nvk_device.c
@@ -9,6 +9,7 @@
 #include "nvk_instance.h"
 #include "nvk_physical_device.h"
 
+#include "vk_pipeline_cache.h"
 #include "vulkan/wsi/wsi_common.h"
 
 #include "nouveau_context.h"
@@ -241,14 +242,25 @@ nvk_CreateDevice(VkPhysicalDevice physicalDevice,
    if (result != VK_SUCCESS)
       goto fail_vab_memory;
 
+   struct vk_pipeline_cache_create_info cache_info = {
+      .weak_ref = true,
+   };
+   dev->mem_cache = vk_pipeline_cache_create(&dev->vk, &cache_info, NULL);
+   if (dev->mem_cache == NULL) {
+      result = VK_ERROR_OUT_OF_HOST_MEMORY;
+      goto fail_queue;
+   }
+
    result = nvk_device_init_meta(dev);
    if (result != VK_SUCCESS)
-      goto fail_queue;
+      goto fail_mem_cache;
 
    *pDevice = nvk_device_to_handle(dev);
 
    return VK_SUCCESS;
 
+fail_mem_cache:
+   vk_pipeline_cache_destroy(dev->mem_cache, NULL);
 fail_queue:
    nvk_queue_finish(dev, &dev->queue);
 fail_vab_memory:
@@ -286,6 +298,7 @@ nvk_DestroyDevice(VkDevice _device, const VkAllocationCallbacks *pAllocator)
 
    nvk_device_finish_meta(dev);
 
+   vk_pipeline_cache_destroy(dev->mem_cache, NULL);
    nvk_queue_finish(dev, &dev->queue);
    if (dev->vab_memory)
       nouveau_ws_bo_destroy(dev->vab_memory);
diff --git a/src/nouveau/vulkan/nvk_device.h b/src/nouveau/vulkan/nvk_device.h
index f2cf612c3a3..a2bfe7495fc 100644
--- a/src/nouveau/vulkan/nvk_device.h
+++ b/src/nouveau/vulkan/nvk_device.h
@@ -16,6 +16,7 @@
 
 struct novueau_ws_context;
 struct nvk_physical_device;
+struct vk_pipeline_cache;
 
 struct nvk_slm_area {
    simple_mtx_t mutex;
@@ -46,6 +47,8 @@ struct nvk_device {
 
    struct nvk_queue queue;
 
+   struct vk_pipeline_cache *mem_cache;
+
    struct vk_meta_device meta;
 };