From 4db07aeb1c0a6115c82a3189b20d4417e5edd87f Mon Sep 17 00:00:00 2001
From: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Date: Thu, 24 Oct 2024 11:16:19 -0400
Subject: [PATCH] vk/sampler: split out sampler init from create

no functional changes

Konstantin Seurer <konstantin.seurer@gmail.com>

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32931>
---
 src/vulkan/runtime/vk_sampler.c | 31 ++++++++++++++++++-------------
 src/vulkan/runtime/vk_sampler.h |  3 +++
 2 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/src/vulkan/runtime/vk_sampler.c b/src/vulkan/runtime/vk_sampler.c
index bda852ebf90..b80b669a19a 100644
--- a/src/vulkan/runtime/vk_sampler.c
+++ b/src/vulkan/runtime/vk_sampler.c
@@ -87,20 +87,9 @@ vk_sampler_border_color_value(const VkSamplerCreateInfo *pCreateInfo,
    }
 }
 
-void *
-vk_sampler_create(struct vk_device *device,
-                  const VkSamplerCreateInfo *pCreateInfo,
-                  const VkAllocationCallbacks *alloc,
-                  size_t size)
+void
+vk_sampler_init(const VkSamplerCreateInfo *pCreateInfo, struct vk_sampler *sampler)
 {
-   struct vk_sampler *sampler;
-
-   sampler = vk_object_zalloc(device, alloc, size, VK_OBJECT_TYPE_SAMPLER);
-   if (!sampler)
-      return NULL;
-
-   assert(pCreateInfo->sType == VK_STRUCTURE_TYPE_SAMPLER_CREATE_INFO);
-
    sampler->format = VK_FORMAT_UNDEFINED;
    sampler->border_color = pCreateInfo->borderColor;
    sampler->reduction_mode = VK_SAMPLER_REDUCTION_MODE_WEIGHTED_AVERAGE;
@@ -156,6 +145,22 @@ vk_sampler_create(struct vk_device *device,
          break;
       }
    }
+}
+
+void *
+vk_sampler_create(struct vk_device *device,
+                  const VkSamplerCreateInfo *pCreateInfo,
+                  const VkAllocationCallbacks *alloc,
+                  size_t size)
+{
+   struct vk_sampler *sampler;
+
+   sampler = vk_object_zalloc(device, alloc, size, VK_OBJECT_TYPE_SAMPLER);
+   if (!sampler)
+      return NULL;
+
+   assert(pCreateInfo->sType == VK_STRUCTURE_TYPE_SAMPLER_CREATE_INFO);
+   vk_sampler_init(pCreateInfo, sampler);
 
    return sampler;
 }
diff --git a/src/vulkan/runtime/vk_sampler.h b/src/vulkan/runtime/vk_sampler.h
index 541b02916c2..c64b183b20b 100644
--- a/src/vulkan/runtime/vk_sampler.h
+++ b/src/vulkan/runtime/vk_sampler.h
@@ -91,6 +91,9 @@ void vk_sampler_destroy(struct vk_device *device,
                         const VkAllocationCallbacks *alloc,
                         struct vk_sampler *sampler);
 
+void
+vk_sampler_init(const VkSamplerCreateInfo *pCreateInfo, struct vk_sampler *sampler);
+
 #ifdef __cplusplus
 }
 #endif