From 3c98a336cf790b7e1cc1df1a74c2084594db82db Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Tue, 11 Feb 2025 16:51:19 +0100 Subject: [PATCH] radv: remove radv_buffer_{init,finish}() helpers Signed-off-by: Samuel Pitoiset Part-of: --- src/amd/vulkan/radv_buffer.c | 23 +---------------------- src/amd/vulkan/radv_buffer.h | 4 ---- 2 files changed, 1 insertion(+), 26 deletions(-) diff --git a/src/amd/vulkan/radv_buffer.c b/src/amd/vulkan/radv_buffer.c index bf721abceb5..c4c52db347b 100644 --- a/src/amd/vulkan/radv_buffer.c +++ b/src/amd/vulkan/radv_buffer.c @@ -21,27 +21,6 @@ #include "vk_debug_utils.h" #include "vk_log.h" -void -radv_buffer_init(struct radv_buffer *buffer, struct radv_device *device, struct radeon_winsys_bo *bo, uint64_t size, - uint64_t offset) -{ - VkBufferCreateInfo createInfo = { - .sType = VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO, - .size = size, - }; - - vk_buffer_init(&device->vk, &buffer->vk, &createInfo); - - buffer->bo = bo; - buffer->addr = radv_buffer_get_va(bo) + offset; -} - -void -radv_buffer_finish(struct radv_buffer *buffer) -{ - vk_buffer_finish(&buffer->vk); -} - static void radv_destroy_buffer(struct radv_device *device, const VkAllocationCallbacks *pAllocator, struct radv_buffer *buffer) { @@ -56,7 +35,7 @@ radv_destroy_buffer(struct radv_device *device, const VkAllocationCallbacks *pAl VK_DEVICE_ADDRESS_BINDING_TYPE_UNBIND_EXT); radv_rmv_log_resource_destroy(device, (uint64_t)radv_buffer_to_handle(buffer)); - radv_buffer_finish(buffer); + vk_buffer_finish(&buffer->vk); vk_free2(&device->vk.alloc, pAllocator, buffer); } diff --git a/src/amd/vulkan/radv_buffer.h b/src/amd/vulkan/radv_buffer.h index 4c726db78a6..65fbb6f2242 100644 --- a/src/amd/vulkan/radv_buffer.h +++ b/src/amd/vulkan/radv_buffer.h @@ -29,10 +29,6 @@ struct radv_buffer { VK_DEFINE_NONDISP_HANDLE_CASTS(radv_buffer, vk.base, VkBuffer, VK_OBJECT_TYPE_BUFFER) -void radv_buffer_init(struct radv_buffer *buffer, struct radv_device *device, struct radeon_winsys_bo *bo, - uint64_t size, uint64_t offset); -void radv_buffer_finish(struct radv_buffer *buffer); - VkResult radv_create_buffer(struct radv_device *device, const VkBufferCreateInfo *pCreateInfo, const VkAllocationCallbacks *pAllocator, VkBuffer *pBuffer, bool is_internal);