mirrors
/
mesa
mirror of https://gitlab.freedesktop.org/mesa/mesa
1
0
Fork 0
Code Issues 9 Packages Projects Releases Wiki Activity

radv: fix missing unbind report when a buffer is destroyed 

There should be a matching unbound operation with
VK_EXT_device_address_binding_report.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28659>
This commit is contained in:
Samuel Pitoiset 2024-04-10 08:43:34 +02:00 committed by Marge Bot
parent 50060072a7
commit 8d5072bb7f
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/amd/vulkan/radv_buffer.c
View File

@ -44,9 +44,16 @@ radv_buffer_finish(struct radv_buffer *buffer)
static void
radv_destroy_buffer(struct radv_device *device, const VkAllocationCallbacks *pAllocator, struct radv_buffer *buffer)
{
struct radv_physical_device *pdev = radv_device_physical(device);
struct radv_instance *instance = radv_physical_device_instance(pdev);
if ((buffer->vk.create_flags & VK_BUFFER_CREATE_SPARSE_BINDING_BIT) && buffer->bo)
radv_bo_destroy(device, &buffer->vk.base, buffer->bo);
if (buffer->bo_va)
vk_address_binding_report(&instance->vk, &buffer->vk.base, buffer->bo_va + buffer->offset, buffer->bo_size,
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_free2(&device->vk.alloc, pAllocator, buffer);
@ -75,6 +82,8 @@ radv_create_buffer(struct radv_device *device, const VkBufferCreateInfo *pCreate
vk_buffer_init(&device->vk, &buffer->vk, pCreateInfo);
buffer->bo = NULL;
buffer->offset = 0;
buffer->bo_va = 0;
buffer->bo_size = 0;
if (pCreateInfo->flags & VK_BUFFER_CREATE_SPARSE_BINDING_BIT) {
enum radeon_bo_flag flags = RADEON_FLAG_VIRTUAL;
@ -159,6 +168,9 @@ radv_BindBufferMemory2(VkDevice _device, uint32_t bindInfoCount, const VkBindBuf
buffer->bo = mem->bo;
buffer->offset = pBindInfos[i].memoryOffset;
buffer->bo_va = radv_buffer_get_va(mem->bo);
buffer->bo_size = mem->bo->size;
radv_rmv_log_buffer_bind(device, pBindInfos[i].buffer);
vk_address_binding_report(&instance->vk, &buffer->vk.base, radv_buffer_get_va(buffer->bo) + buffer->offset,

2
src/amd/vulkan/radv_buffer.h
View File

@ -23,6 +23,8 @@ struct radv_buffer {
/* Set when bound */
struct radeon_winsys_bo *bo;
VkDeviceSize offset;
uint64_t bo_va;
uint64_t bo_size;
};
VK_DEFINE_NONDISP_HANDLE_CASTS(radv_buffer, vk.base, VkBuffer, VK_OBJECT_TYPE_BUFFER)