diff --git a/src/amd/vulkan/meta/radv_meta_buffer.c b/src/amd/vulkan/meta/radv_meta_buffer.c index 4363ca2c6ff..b2b1f183d9c 100644 --- a/src/amd/vulkan/meta/radv_meta_buffer.c +++ b/src/amd/vulkan/meta/radv_meta_buffer.c @@ -121,7 +121,7 @@ get_copy_pipeline(struct radv_device *device, VkPipeline *pipeline_out, VkPipeli } static void -fill_buffer_shader(struct radv_cmd_buffer *cmd_buffer, uint64_t va, uint64_t size, uint32_t data) +radv_compute_fill_memory(struct radv_cmd_buffer *cmd_buffer, uint64_t va, uint64_t size, uint32_t data) { struct radv_device *device = radv_cmd_buffer_device(cmd_buffer); struct radv_meta_saved_state saved_state; @@ -156,7 +156,7 @@ fill_buffer_shader(struct radv_cmd_buffer *cmd_buffer, uint64_t va, uint64_t siz } static void -copy_buffer_shader(struct radv_cmd_buffer *cmd_buffer, uint64_t src_va, uint64_t dst_va, uint64_t size) +radv_compute_copy_memory(struct radv_cmd_buffer *cmd_buffer, uint64_t src_va, uint64_t dst_va, uint64_t size) { struct radv_device *device = radv_cmd_buffer_device(cmd_buffer); struct radv_meta_saved_state saved_state; @@ -204,15 +204,15 @@ radv_fill_buffer(struct radv_cmd_buffer *cmd_buffer, const struct radv_image *im radv_cs_add_buffer(device->ws, cmd_buffer->cs, bo); if (cmd_buffer->qf == RADV_QUEUE_TRANSFER) { - radv_sdma_fill_buffer(device, cmd_buffer->cs, va, size, value); + radv_sdma_fill_memory(device, cmd_buffer->cs, va, size, value); } else if (size >= RADV_BUFFER_OPS_CS_THRESHOLD) { - fill_buffer_shader(cmd_buffer, va, size, value); + radv_compute_fill_memory(cmd_buffer, va, size, value); flush_bits = RADV_CMD_FLAG_CS_PARTIAL_FLUSH | RADV_CMD_FLAG_INV_VCACHE | radv_src_access_flush(cmd_buffer, VK_PIPELINE_STAGE_2_COMPUTE_SHADER_BIT, VK_ACCESS_2_SHADER_WRITE_BIT, 0, image, NULL); } else if (size) - radv_cp_dma_clear_buffer(cmd_buffer, va, size, value); + radv_cp_dma_fill_memory(cmd_buffer, va, size, value); return flush_bits; } @@ -228,11 +228,11 @@ radv_copy_buffer(struct radv_cmd_buffer *cmd_buffer, struct radeon_winsys_bo *sr radv_cs_add_buffer(device->ws, cmd_buffer->cs, dst_bo); if (cmd_buffer->qf == RADV_QUEUE_TRANSFER) - radv_sdma_copy_buffer(device, cmd_buffer->cs, src_va, dst_va, size); + radv_sdma_copy_memory(device, cmd_buffer->cs, src_va, dst_va, size); else if (use_compute) - copy_buffer_shader(cmd_buffer, src_va, dst_va, size); + radv_compute_copy_memory(cmd_buffer, src_va, dst_va, size); else if (size) - radv_cp_dma_buffer_copy(cmd_buffer, src_va, dst_va, size); + radv_cp_dma_copy_memory(cmd_buffer, src_va, dst_va, size); } VKAPI_ATTR void VKAPI_CALL diff --git a/src/amd/vulkan/radv_cp_dma.c b/src/amd/vulkan/radv_cp_dma.c index 7c3927513cd..80cbce03e57 100644 --- a/src/amd/vulkan/radv_cp_dma.c +++ b/src/amd/vulkan/radv_cp_dma.c @@ -218,7 +218,7 @@ radv_cp_dma_realign_engine(struct radv_cmd_buffer *cmd_buffer, unsigned size) } void -radv_cp_dma_buffer_copy(struct radv_cmd_buffer *cmd_buffer, uint64_t src_va, uint64_t dest_va, uint64_t size) +radv_cp_dma_copy_memory(struct radv_cmd_buffer *cmd_buffer, uint64_t src_va, uint64_t dest_va, uint64_t size) { struct radv_device *device = radv_cmd_buffer_device(cmd_buffer); const struct radv_physical_device *pdev = radv_device_physical(device); @@ -296,7 +296,7 @@ radv_cp_dma_buffer_copy(struct radv_cmd_buffer *cmd_buffer, uint64_t src_va, uin } void -radv_cp_dma_clear_buffer(struct radv_cmd_buffer *cmd_buffer, uint64_t va, uint64_t size, unsigned value) +radv_cp_dma_fill_memory(struct radv_cmd_buffer *cmd_buffer, uint64_t va, uint64_t size, unsigned value) { struct radv_device *device = radv_cmd_buffer_device(cmd_buffer); const struct radv_physical_device *pdev = radv_device_physical(device); diff --git a/src/amd/vulkan/radv_cp_dma.h b/src/amd/vulkan/radv_cp_dma.h index 14c71a0e1b9..ce5cbf05243 100644 --- a/src/amd/vulkan/radv_cp_dma.h +++ b/src/amd/vulkan/radv_cp_dma.h @@ -23,9 +23,9 @@ void radv_cs_cp_dma_prefetch(const struct radv_device *device, struct radeon_cmd void radv_cp_dma_prefetch(struct radv_cmd_buffer *cmd_buffer, uint64_t va, unsigned size); -void radv_cp_dma_buffer_copy(struct radv_cmd_buffer *cmd_buffer, uint64_t src_va, uint64_t dest_va, uint64_t size); +void radv_cp_dma_copy_memory(struct radv_cmd_buffer *cmd_buffer, uint64_t src_va, uint64_t dest_va, uint64_t size); -void radv_cp_dma_clear_buffer(struct radv_cmd_buffer *cmd_buffer, uint64_t va, uint64_t size, unsigned value); +void radv_cp_dma_fill_memory(struct radv_cmd_buffer *cmd_buffer, uint64_t va, uint64_t size, unsigned value); void radv_cp_dma_wait_for_idle(struct radv_cmd_buffer *cmd_buffer); diff --git a/src/amd/vulkan/radv_sdma.c b/src/amd/vulkan/radv_sdma.c index 9dfb76f91c4..de1bc0e4410 100644 --- a/src/amd/vulkan/radv_sdma.c +++ b/src/amd/vulkan/radv_sdma.c @@ -331,7 +331,7 @@ radv_sdma_emit_nop(const struct radv_device *device, struct radeon_cmdbuf *cs) } void -radv_sdma_copy_buffer(const struct radv_device *device, struct radeon_cmdbuf *cs, uint64_t src_va, uint64_t dst_va, +radv_sdma_copy_memory(const struct radv_device *device, struct radeon_cmdbuf *cs, uint64_t src_va, uint64_t dst_va, uint64_t size) { if (size == 0) @@ -376,7 +376,7 @@ radv_sdma_copy_buffer(const struct radv_device *device, struct radeon_cmdbuf *cs } void -radv_sdma_fill_buffer(const struct radv_device *device, struct radeon_cmdbuf *cs, const uint64_t va, +radv_sdma_fill_memory(const struct radv_device *device, struct radeon_cmdbuf *cs, const uint64_t va, const uint64_t size, const uint32_t value) { const struct radv_physical_device *pdev = radv_device_physical(device); @@ -664,7 +664,7 @@ radv_sdma_copy_buffer_image_unaligned(const struct radv_device *device, struct r const uint64_t buf_va = buf->va + slice * buf_slice_pitch_blocks * img.bpp + (row + r) * buf_pitch_blocks * img.bpp; const uint64_t tmp_va = tmp.va + r * info.aligned_row_pitch * img.bpp; - radv_sdma_copy_buffer(device, cs, to_image ? buf_va : tmp_va, to_image ? tmp_va : buf_va, + radv_sdma_copy_memory(device, cs, to_image ? buf_va : tmp_va, to_image ? tmp_va : buf_va, info.extent_horizontal_blocks * img.bpp); } diff --git a/src/amd/vulkan/radv_sdma.h b/src/amd/vulkan/radv_sdma.h index 5c4ba15b761..b845019ab5e 100644 --- a/src/amd/vulkan/radv_sdma.h +++ b/src/amd/vulkan/radv_sdma.h @@ -74,9 +74,9 @@ bool radv_sdma_use_t2t_scanline_copy(const struct radv_device *device, const str void radv_sdma_copy_image_t2t_scanline(const struct radv_device *device, struct radeon_cmdbuf *cs, const struct radv_sdma_surf *src, const struct radv_sdma_surf *dst, const VkExtent3D extent, struct radeon_winsys_bo *temp_bo); -void radv_sdma_copy_buffer(const struct radv_device *device, struct radeon_cmdbuf *cs, uint64_t src_va, uint64_t dst_va, +void radv_sdma_copy_memory(const struct radv_device *device, struct radeon_cmdbuf *cs, uint64_t src_va, uint64_t dst_va, uint64_t size); -void radv_sdma_fill_buffer(const struct radv_device *device, struct radeon_cmdbuf *cs, const uint64_t va, +void radv_sdma_fill_memory(const struct radv_device *device, struct radeon_cmdbuf *cs, const uint64_t va, const uint64_t size, const uint32_t value); #ifdef __cplusplus diff --git a/src/amd/vulkan/radv_shader.c b/src/amd/vulkan/radv_shader.c index 53c15deedb4..0b0ac1404ed 100644 --- a/src/amd/vulkan/radv_shader.c +++ b/src/amd/vulkan/radv_shader.c @@ -2479,7 +2479,7 @@ radv_shader_dma_get_submission(struct radv_device *device, struct radeon_winsys_ goto fail; } - radv_sdma_copy_buffer(device, cs, radv_buffer_get_va(submission->bo), va, size); + radv_sdma_copy_memory(device, cs, radv_buffer_get_va(submission->bo), va, size); radv_cs_add_buffer(ws, cs, submission->bo); radv_cs_add_buffer(ws, cs, bo);