From 09d224685dd4da8f78d2ecc2b4225b01678c7e29 Mon Sep 17 00:00:00 2001 From: Valentine Burley Date: Mon, 27 May 2024 23:48:23 +0200 Subject: [PATCH] tu: Drop tu_buffer_view_init helper function Simplify the code by inlining the logic from tu_buffer_view_init directly into tu_CreateBufferView. Signed-off-by: Valentine Burley Part-of: --- src/freedreno/vulkan/tu_image.cc | 25 +++++++------------------ src/freedreno/vulkan/tu_image.h | 5 ----- 2 files changed, 7 insertions(+), 23 deletions(-) diff --git a/src/freedreno/vulkan/tu_image.cc b/src/freedreno/vulkan/tu_image.cc index 69c37d7d8e8..3ddd338df87 100644 --- a/src/freedreno/vulkan/tu_image.cc +++ b/src/freedreno/vulkan/tu_image.cc @@ -1086,23 +1086,6 @@ tu_DestroyImageView(VkDevice _device, vk_object_free(&device->vk, pAllocator, iview); } -void -tu_buffer_view_init(struct tu_buffer_view *view, - struct tu_device *device, - const VkBufferViewCreateInfo *pCreateInfo) -{ - VK_FROM_HANDLE(tu_buffer, buffer, pCreateInfo->buffer); - - view->buffer = buffer; - - uint8_t swiz[4] = { PIPE_SWIZZLE_X, PIPE_SWIZZLE_Y, PIPE_SWIZZLE_Z, - PIPE_SWIZZLE_W }; - - fdl6_buffer_view_init( - view->descriptor, tu_vk_format_to_pipe_format(view->vk.format), - swiz, buffer->iova + view->vk.offset, view->vk.range); -} - VKAPI_ATTR VkResult VKAPI_CALL tu_CreateBufferView(VkDevice _device, const VkBufferViewCreateInfo *pCreateInfo, @@ -1110,6 +1093,7 @@ tu_CreateBufferView(VkDevice _device, VkBufferView *pView) { VK_FROM_HANDLE(tu_device, device, _device); + VK_FROM_HANDLE(tu_buffer, buffer, pCreateInfo->buffer); struct tu_buffer_view *view; view = (struct tu_buffer_view *) vk_buffer_view_create( @@ -1118,7 +1102,12 @@ tu_CreateBufferView(VkDevice _device, if (!view) return vk_error(device, VK_ERROR_OUT_OF_HOST_MEMORY); - tu_buffer_view_init(view, device, pCreateInfo); + uint8_t swiz[4] = { PIPE_SWIZZLE_X, PIPE_SWIZZLE_Y, PIPE_SWIZZLE_Z, + PIPE_SWIZZLE_W }; + + fdl6_buffer_view_init( + view->descriptor, tu_vk_format_to_pipe_format(view->vk.format), + swiz, buffer->iova + view->vk.offset, view->vk.range); *pView = tu_buffer_view_to_handle(view); diff --git a/src/freedreno/vulkan/tu_image.h b/src/freedreno/vulkan/tu_image.h index 66a119cf4d7..cef50136b9d 100644 --- a/src/freedreno/vulkan/tu_image.h +++ b/src/freedreno/vulkan/tu_image.h @@ -117,11 +117,6 @@ ubwc_possible(struct tu_device *device, VkSampleCountFlagBits samples, bool use_z24uint_s8uint); -void -tu_buffer_view_init(struct tu_buffer_view *view, - struct tu_device *device, - const VkBufferViewCreateInfo *pCreateInfo); - struct tu_frag_area { float width; float height;