diff --git a/src/amd/vulkan/radv_buffer_view.c b/src/amd/vulkan/radv_buffer_view.c index 7653203e7d0..2d8de1a80b9 100644 --- a/src/amd/vulkan/radv_buffer_view.c +++ b/src/amd/vulkan/radv_buffer_view.c @@ -57,30 +57,11 @@ radv_make_texel_buffer_descriptor(struct radv_device *device, uint64_t va, VkFor ac_build_buffer_descriptor(pdev->info.gfx_level, &ac_state, state); } -void -radv_buffer_view_init(struct radv_buffer_view *view, struct radv_device *device, - const VkBufferViewCreateInfo *pCreateInfo) -{ - VK_FROM_HANDLE(radv_buffer, buffer, pCreateInfo->buffer); - - vk_buffer_view_init(&device->vk, &view->vk, pCreateInfo); - - view->bo = buffer->bo; - - radv_make_texel_buffer_descriptor(device, buffer->addr, view->vk.format, view->vk.offset, view->vk.range, - view->state); -} - -void -radv_buffer_view_finish(struct radv_buffer_view *view) -{ - vk_buffer_view_finish(&view->vk); -} - VKAPI_ATTR VkResult VKAPI_CALL radv_CreateBufferView(VkDevice _device, const VkBufferViewCreateInfo *pCreateInfo, const VkAllocationCallbacks *pAllocator, VkBufferView *pView) { + VK_FROM_HANDLE(radv_buffer, buffer, pCreateInfo->buffer); VK_FROM_HANDLE(radv_device, device, _device); struct radv_buffer_view *view; @@ -88,7 +69,12 @@ radv_CreateBufferView(VkDevice _device, const VkBufferViewCreateInfo *pCreateInf if (!view) return vk_error(device, VK_ERROR_OUT_OF_HOST_MEMORY); - radv_buffer_view_init(view, device, pCreateInfo); + vk_buffer_view_init(&device->vk, &view->vk, pCreateInfo); + + view->bo = buffer->bo; + + radv_make_texel_buffer_descriptor(device, buffer->addr, view->vk.format, view->vk.offset, view->vk.range, + view->state); *pView = radv_buffer_view_to_handle(view); @@ -104,6 +90,6 @@ radv_DestroyBufferView(VkDevice _device, VkBufferView bufferView, const VkAlloca if (!view) return; - radv_buffer_view_finish(view); + vk_buffer_view_finish(&view->vk); vk_free2(&device->vk.alloc, pAllocator, view); } diff --git a/src/amd/vulkan/radv_buffer_view.h b/src/amd/vulkan/radv_buffer_view.h index e150cf0e442..38a76b0ff8c 100644 --- a/src/amd/vulkan/radv_buffer_view.h +++ b/src/amd/vulkan/radv_buffer_view.h @@ -23,10 +23,6 @@ struct radv_buffer_view { VK_DEFINE_NONDISP_HANDLE_CASTS(radv_buffer_view, vk.base, VkBufferView, VK_OBJECT_TYPE_BUFFER_VIEW) -void radv_buffer_view_init(struct radv_buffer_view *view, struct radv_device *device, - const VkBufferViewCreateInfo *pCreateInfo); -void radv_buffer_view_finish(struct radv_buffer_view *view); - void radv_make_texel_buffer_descriptor(struct radv_device *device, uint64_t va, VkFormat vk_format, unsigned offset, unsigned range, uint32_t *state);