From f234099d6d7e47bee2ebf5960471fff7d5ca7d82 Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Tue, 11 Feb 2025 17:40:06 +0100 Subject: [PATCH] radv: rename radv_image::bindings::bo_va to addr Signed-off-by: Samuel Pitoiset Part-of: --- src/amd/vulkan/radv_image.c | 8 ++++---- src/amd/vulkan/radv_image.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/amd/vulkan/radv_image.c b/src/amd/vulkan/radv_image.c index cb27e4183c7..ed12cef898f 100644 --- a/src/amd/vulkan/radv_image.c +++ b/src/amd/vulkan/radv_image.c @@ -1291,10 +1291,10 @@ radv_destroy_image(struct radv_device *device, const VkAllocationCallbacks *pAll } for (uint32_t i = 0; i < ARRAY_SIZE(image->bindings); i++) { - if (!image->bindings[i].bo_va) + if (!image->bindings[i].addr) continue; - vk_address_binding_report(&instance->vk, &image->vk.base, image->bindings[i].bo_va + image->bindings[i].offset, + vk_address_binding_report(&instance->vk, &image->vk.base, image->bindings[i].addr + image->bindings[i].offset, image->bindings[i].range, VK_DEVICE_ADDRESS_BINDING_TYPE_UNBIND_EXT); } @@ -1745,13 +1745,13 @@ radv_bind_image_memory(struct radv_device *device, struct radv_image *image, uin image->bindings[bind_idx].bo = bo; image->bindings[bind_idx].offset = offset; - image->bindings[bind_idx].bo_va = radv_buffer_get_va(bo); + image->bindings[bind_idx].addr = radv_buffer_get_va(bo); image->bindings[bind_idx].range = range; radv_rmv_log_image_bind(device, bind_idx, radv_image_to_handle(image)); vk_address_binding_report(&instance->vk, &image->vk.base, - image->bindings[bind_idx].bo_va + image->bindings[bind_idx].offset, + image->bindings[bind_idx].addr + image->bindings[bind_idx].offset, image->bindings[bind_idx].range, VK_DEVICE_ADDRESS_BINDING_TYPE_BIND_EXT); } diff --git a/src/amd/vulkan/radv_image.h b/src/amd/vulkan/radv_image.h index 0456c663aff..2b7569ec2fd 100644 --- a/src/amd/vulkan/radv_image.h +++ b/src/amd/vulkan/radv_image.h @@ -34,7 +34,7 @@ struct radv_image_binding { /* Set when bound */ struct radeon_winsys_bo *bo; VkDeviceSize offset; - uint64_t bo_va; + uint64_t addr; uint64_t range; };