From 366b36aefdc4f5a77cbb24dda92c418a24138cb3 Mon Sep 17 00:00:00 2001
From: Faith Ekstrand <faith.ekstrand@collabora.com>
Date: Tue, 17 Jun 2025 15:42:39 -0400
Subject: [PATCH] vulkan: Drop vk_sampler_init()

It's ill-defined at best since it doesn't even initialize the
vk_object_base and its only use was NVK and that use is now gone.

Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/35624>
---
 src/vulkan/runtime/vk_sampler.c | 29 +++++++++++------------------
 src/vulkan/runtime/vk_sampler.h |  3 ---
 2 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/src/vulkan/runtime/vk_sampler.c b/src/vulkan/runtime/vk_sampler.c
index 15b7cac3b28..95d0fc03b9a 100644
--- a/src/vulkan/runtime/vk_sampler.c
+++ b/src/vulkan/runtime/vk_sampler.c
@@ -178,9 +178,18 @@ vk_sampler_state_init(struct vk_sampler_state *state,
    }
 }
 
-void
-vk_sampler_init(const VkSamplerCreateInfo *pCreateInfo, struct vk_sampler *sampler)
+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;
+
    struct vk_sampler_state state;
    vk_sampler_state_init(&state, pCreateInfo);
 
@@ -200,22 +209,6 @@ vk_sampler_init(const VkSamplerCreateInfo *pCreateInfo, struct vk_sampler *sampl
       assert(state.format == conversion->state.format);
       sampler->ycbcr_conversion = conversion;
    }
-}
-
-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 95165d593ba..5c1e7df870e 100644
--- a/src/vulkan/runtime/vk_sampler.h
+++ b/src/vulkan/runtime/vk_sampler.h
@@ -161,9 +161,6 @@ 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