Module: Mesa Branch: main Commit: b6d542d7baaa62c01ce4ec575f45c5858abacd4e URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=b6d542d7baaa62c01ce4ec575f45c5858abacd4e
Author: Samuel Pitoiset <[email protected]> Date: Tue Aug 1 08:38:05 2023 +0200 radv: use vk_buffer_view Signed-off-by: Samuel Pitoiset <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24416> --- src/amd/vulkan/radv_image.c | 7 +++---- src/amd/vulkan/radv_private.h | 6 +++--- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/amd/vulkan/radv_image.c b/src/amd/vulkan/radv_image.c index dcfcfae176c..07fc590eb20 100644 --- a/src/amd/vulkan/radv_image.c +++ b/src/amd/vulkan/radv_image.c @@ -2628,18 +2628,17 @@ radv_buffer_view_init(struct radv_buffer_view *view, struct radv_device *device, RADV_FROM_HANDLE(radv_buffer, buffer, pCreateInfo->buffer); uint64_t va = radv_buffer_get_va(buffer->bo) + buffer->offset; - vk_object_base_init(&device->vk, &view->base, VK_OBJECT_TYPE_BUFFER_VIEW); + vk_buffer_view_init(&device->vk, &view->vk, pCreateInfo); view->bo = buffer->bo; - view->range = vk_buffer_range(&buffer->vk, pCreateInfo->offset, pCreateInfo->range); - radv_make_texel_buffer_descriptor(device, va, pCreateInfo->format, pCreateInfo->offset, view->range, view->state); + radv_make_texel_buffer_descriptor(device, va, view->vk.format, view->vk.offset, view->vk.range, view->state); } void radv_buffer_view_finish(struct radv_buffer_view *view) { - vk_object_base_finish(&view->base); + vk_buffer_view_finish(&view->vk); } VKAPI_ATTR VkResult VKAPI_CALL diff --git a/src/amd/vulkan/radv_private.h b/src/amd/vulkan/radv_private.h index 5ee2b33297d..25e8bfda2e0 100644 --- a/src/amd/vulkan/radv_private.h +++ b/src/amd/vulkan/radv_private.h @@ -55,6 +55,7 @@ #include "util/xmlconfig.h" #include "vk_alloc.h" #include "vk_buffer.h" +#include "vk_buffer_view.h" #include "vk_command_buffer.h" #include "vk_command_pool.h" #include "vk_debug_report.h" @@ -2901,9 +2902,8 @@ void radv_image_view_finish(struct radv_image_view *iview); VkFormat radv_get_aspect_format(struct radv_image *image, VkImageAspectFlags mask); struct radv_buffer_view { - struct vk_object_base base; + struct vk_buffer_view vk; struct radeon_winsys_bo *bo; - uint64_t range; /**< VkBufferViewCreateInfo::range */ uint32_t state[4]; }; void radv_buffer_view_init(struct radv_buffer_view *view, struct radv_device *device, @@ -3646,7 +3646,7 @@ VK_DEFINE_HANDLE_CASTS(radv_instance, vk.base, VkInstance, VK_OBJECT_TYPE_INSTAN VK_DEFINE_HANDLE_CASTS(radv_physical_device, vk.base, VkPhysicalDevice, VK_OBJECT_TYPE_PHYSICAL_DEVICE) VK_DEFINE_HANDLE_CASTS(radv_queue, vk.base, VkQueue, VK_OBJECT_TYPE_QUEUE) VK_DEFINE_NONDISP_HANDLE_CASTS(radv_buffer, vk.base, VkBuffer, VK_OBJECT_TYPE_BUFFER) -VK_DEFINE_NONDISP_HANDLE_CASTS(radv_buffer_view, base, VkBufferView, VK_OBJECT_TYPE_BUFFER_VIEW) +VK_DEFINE_NONDISP_HANDLE_CASTS(radv_buffer_view, vk.base, VkBufferView, VK_OBJECT_TYPE_BUFFER_VIEW) VK_DEFINE_NONDISP_HANDLE_CASTS(radv_descriptor_pool, base, VkDescriptorPool, VK_OBJECT_TYPE_DESCRIPTOR_POOL) VK_DEFINE_NONDISP_HANDLE_CASTS(radv_descriptor_set, header.base, VkDescriptorSet, VK_OBJECT_TYPE_DESCRIPTOR_SET) VK_DEFINE_NONDISP_HANDLE_CASTS(radv_descriptor_set_layout, vk.base, VkDescriptorSetLayout,
