radv: rename radv_buffer::bo_va to addr

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/33475>
This commit is contained in:
Samuel Pitoiset 2025-02-10 10:25:04 +01:00 committed by Marge Bot
parent f70af40c5d
commit e7e43f1437
2 changed files with 9 additions and 9 deletions

View file

@ -51,8 +51,8 @@ radv_destroy_buffer(struct radv_device *device, const VkAllocationCallbacks *pAl
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->range,
if (buffer->addr)
vk_address_binding_report(&instance->vk, &buffer->vk.base, buffer->addr + buffer->offset, buffer->range,
VK_DEVICE_ADDRESS_BINDING_TYPE_UNBIND_EXT);
radv_rmv_log_resource_destroy(device, (uint64_t)radv_buffer_to_handle(buffer));
@ -83,7 +83,7 @@ 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->addr = 0;
buffer->range = 0;
uint64_t replay_address = 0;
@ -93,7 +93,7 @@ radv_create_buffer(struct radv_device *device, const VkBufferCreateInfo *pCreate
replay_address = replay_info->opaqueCaptureAddress;
if (pCreateInfo->flags & VK_BUFFER_CREATE_DEVICE_ADDRESS_CAPTURE_REPLAY_BIT)
buffer->bo_va = replay_address;
buffer->addr = replay_address;
if (pCreateInfo->flags & VK_BUFFER_CREATE_SPARSE_BINDING_BIT) {
enum radeon_bo_flag flags = RADEON_FLAG_VIRTUAL;
@ -110,7 +110,7 @@ radv_create_buffer(struct radv_device *device, const VkBufferCreateInfo *pCreate
return vk_error(device, result);
}
buffer->bo_va = radv_buffer_get_va(buffer->bo);
buffer->addr = radv_buffer_get_va(buffer->bo);
}
*pBuffer = radv_buffer_to_handle(buffer);
@ -175,7 +175,7 @@ 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->addr = radv_buffer_get_va(mem->bo);
buffer->range = reqs.memoryRequirements.size;
radv_rmv_log_buffer_bind(device, pBindInfos[i].buffer);
@ -257,14 +257,14 @@ VKAPI_ATTR VkDeviceAddress VKAPI_CALL
radv_GetBufferDeviceAddress(VkDevice device, const VkBufferDeviceAddressInfo *pInfo)
{
VK_FROM_HANDLE(radv_buffer, buffer, pInfo->buffer);
return buffer->bo_va + buffer->offset;
return buffer->addr + buffer->offset;
}
VKAPI_ATTR uint64_t VKAPI_CALL
radv_GetBufferOpaqueCaptureAddress(VkDevice device, const VkBufferDeviceAddressInfo *pInfo)
{
VK_FROM_HANDLE(radv_buffer, buffer, pInfo->buffer);
return buffer->bo_va + buffer->offset;
return buffer->addr + buffer->offset;
}
VkResult

View file

@ -24,7 +24,7 @@ struct radv_buffer {
/* Set when bound */
struct radeon_winsys_bo *bo;
VkDeviceSize offset;
uint64_t bo_va;
uint64_t addr;
uint64_t range;
};