From db1fde16d714b5d9e9fa40bbd999ed2cecd12a6a Mon Sep 17 00:00:00 2001 From: Boris Brezillon Date: Fri, 15 Dec 2023 13:03:35 +0100 Subject: [PATCH] panvk: Make panvk_device_memory inherit from vk_device_memory Signed-off-by: Boris Brezillon Reviewed-by: Erik Faye-Lund Part-of: --- src/panfrost/vulkan/panvk_device.c | 6 +++--- src/panfrost/vulkan/panvk_private.h | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/panfrost/vulkan/panvk_device.c b/src/panfrost/vulkan/panvk_device.c index c99bdec19b3..d39e9b24e60 100644 --- a/src/panfrost/vulkan/panvk_device.c +++ b/src/panfrost/vulkan/panvk_device.c @@ -1229,8 +1229,8 @@ panvk_AllocateMemory(VkDevice _device, can_be_exported = true; } - mem = vk_object_zalloc(&device->vk, pAllocator, sizeof(*mem), - VK_OBJECT_TYPE_DEVICE_MEMORY); + mem = vk_device_memory_create(&device->vk, pAllocateInfo, pAllocator, + sizeof(*mem)); if (mem == NULL) return vk_error(device, VK_ERROR_OUT_OF_HOST_MEMORY); @@ -1316,7 +1316,7 @@ panvk_FreeMemory(VkDevice _device, VkDeviceMemory _mem, assert(!ret); pan_kmod_bo_put(mem->bo); - vk_object_free(&device->vk, pAllocator, mem); + vk_device_memory_destroy(&device->vk, pAllocator, &mem->vk); } VKAPI_ATTR VkResult VKAPI_CALL diff --git a/src/panfrost/vulkan/panvk_private.h b/src/panfrost/vulkan/panvk_private.h index 6ec0860d291..32fc154721b 100644 --- a/src/panfrost/vulkan/panvk_private.h +++ b/src/panfrost/vulkan/panvk_private.h @@ -55,6 +55,7 @@ #include "vk_command_pool.h" #include "vk_descriptor_set_layout.h" #include "vk_device.h" +#include "vk_device_memory.h" #include "vk_image.h" #include "vk_instance.h" #include "vk_log.h" @@ -331,7 +332,7 @@ struct panvk_cmd_event_op { }; struct panvk_device_memory { - struct vk_object_base base; + struct vk_device_memory vk; struct pan_kmod_bo *bo; struct { mali_ptr dev; @@ -1062,7 +1063,7 @@ VK_DEFINE_NONDISP_HANDLE_CASTS(panvk_descriptor_set, base, VkDescriptorSet, VK_DEFINE_NONDISP_HANDLE_CASTS(panvk_descriptor_set_layout, vk.base, VkDescriptorSetLayout, VK_OBJECT_TYPE_DESCRIPTOR_SET_LAYOUT) -VK_DEFINE_NONDISP_HANDLE_CASTS(panvk_device_memory, base, VkDeviceMemory, +VK_DEFINE_NONDISP_HANDLE_CASTS(panvk_device_memory, vk.base, VkDeviceMemory, VK_OBJECT_TYPE_DEVICE_MEMORY) VK_DEFINE_NONDISP_HANDLE_CASTS(panvk_event, base, VkEvent, VK_OBJECT_TYPE_EVENT) VK_DEFINE_NONDISP_HANDLE_CASTS(panvk_image, vk.base, VkImage,