AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

radv/rmv: fix logging sparse residency

Browse Source 
The offset should be the sparse image/buffer offset.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28367>
This commit is contained in:
Samuel Pitoiset
2024-03-25 16:39:23 +01:00
parent 13ad10bd26
commit b7d21220e8
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/amd/vulkan/radv_queue.c
+9 -7
View File
@@ -91,9 +91,9 @@ radv_sparse_buffer_bind_memory(struct radv_device *device, const VkSparseBufferM
return result;
if (bind->pBinds[i].memory)
radv_rmv_log_sparse_add_residency(device, buffer->bo, memoryOffset);
radv_rmv_log_sparse_add_residency(device, buffer->bo, resourceOffset);
else
radv_rmv_log_sparse_remove_residency(device, buffer->bo, memoryOffset);
radv_rmv_log_sparse_remove_residency(device, buffer->bo, resourceOffset);
}
mem = cur_mem;
resourceOffset = bind->pBinds[i].resourceOffset;
@@ -105,9 +105,9 @@ radv_sparse_buffer_bind_memory(struct radv_device *device, const VkSparseBufferM
memoryOffset);
if (mem)
radv_rmv_log_sparse_add_residency(device, buffer->bo, memoryOffset);
radv_rmv_log_sparse_add_residency(device, buffer->bo, resourceOffset);
else
radv_rmv_log_sparse_remove_residency(device, buffer->bo, memoryOffset);
radv_rmv_log_sparse_remove_residency(device, buffer->bo, resourceOffset);
}
return result;
@@ -210,16 +210,18 @@ radv_sparse_image_bind_memory(struct radv_device *device, const VkSparseImageMem
for (unsigned z = 0; z < bind_extent.depth;
z += surface->prt_tile_depth, offset += depth_pitch * surface->prt_tile_depth) {
for (unsigned y = 0; y < bind_extent.height; y += surface->prt_tile_height) {
uint64_t bo_offset = offset + (uint64_t)img_y_increment * y;
result = device->ws->buffer_virtual_bind(
device->ws, image->bindings[0].bo, offset + (uint64_t)img_y_increment * y, size, mem ? mem->bo : NULL,
device->ws, image->bindings[0].bo, bo_offset, size, mem ? mem->bo : NULL,
mem_offset + (uint64_t)mem_y_increment * y + mem_z_increment * z);
if (result != VK_SUCCESS)
return result;
if (bind->pBinds[i].memory)
radv_rmv_log_sparse_add_residency(device, image->bindings[0].bo, offset);
radv_rmv_log_sparse_add_residency(device, image->bindings[0].bo, bo_offset);
else
radv_rmv_log_sparse_remove_residency(device, image->bindings[0].bo, offset);
radv_rmv_log_sparse_remove_residency(device, image->bindings[0].bo, bo_offset);
}
}
}