diff --git a/rpcs3/Emu/RSX/VK/VKDMA.cpp b/rpcs3/Emu/RSX/VK/VKDMA.cpp index 44893ac31f..bccf1e5566 100644 --- a/rpcs3/Emu/RSX/VK/VKDMA.cpp +++ b/rpcs3/Emu/RSX/VK/VKDMA.cpp @@ -157,7 +157,7 @@ namespace vk return inheritance_info.parent->head(); } - void dma_block::set_parent(const command_buffer& cmd, dma_block* parent) + void dma_block::set_parent(dma_block* parent) { ensure(parent); ensure(parent->base_address < base_address); @@ -178,7 +178,7 @@ namespace vk } } - void dma_block::extend(const command_buffer& cmd, const render_device& dev, usz new_size) + void dma_block::extend(const render_device& dev, usz new_size) { ensure(allocated_memory); if (new_size <= allocated_memory->size()) @@ -278,7 +278,7 @@ namespace vk block->init(*g_render_device, base_address, expected_length); } - std::pair map_dma(const command_buffer& cmd, u32 local_address, u32 length) + std::pair map_dma(u32 local_address, u32 length) { // Not much contention expected here, avoid searching twice std::lock_guard lock(g_dma_mutex); @@ -338,7 +338,7 @@ namespace vk else if (entry) { ensure((entry->end() & s_dma_block_mask) <= last_block); - entry->set_parent(cmd, block_head); + entry->set_parent(block_head); } else { diff --git a/rpcs3/Emu/RSX/VK/VKDMA.h b/rpcs3/Emu/RSX/VK/VKDMA.h index e265283bb6..55d016c9e6 100644 --- a/rpcs3/Emu/RSX/VK/VKDMA.h +++ b/rpcs3/Emu/RSX/VK/VKDMA.h @@ -4,7 +4,7 @@ namespace vk { - std::pair map_dma(const command_buffer& cmd, u32 local_address, u32 length); + std::pair map_dma(u32 local_address, u32 length); void load_dma(u32 local_address, u32 length); void flush_dma(u32 local_address, u32 length); void unmap_dma(u32 local_address, u32 length); @@ -46,8 +46,8 @@ namespace vk dma_block* head(); const dma_block* head() const; - virtual void set_parent(const command_buffer& cmd, dma_block* parent); - virtual void extend(const command_buffer& cmd, const render_device& dev, usz new_size); + virtual void set_parent(dma_block* parent); + virtual void extend(const render_device& dev, usz new_size); }; class dma_block_EXT: public dma_block diff --git a/rpcs3/Emu/RSX/VK/VKTexture.cpp b/rpcs3/Emu/RSX/VK/VKTexture.cpp index c414c43b17..84702a9d94 100644 --- a/rpcs3/Emu/RSX/VK/VKTexture.cpp +++ b/rpcs3/Emu/RSX/VK/VKTexture.cpp @@ -906,7 +906,7 @@ namespace vk src_address = uptr(base_addr) - uptr(vm::g_base_addr); } - auto dma_mapping = vk::map_dma(cmd, static_cast(src_address), static_cast(data_length)); + auto dma_mapping = vk::map_dma(static_cast(src_address), static_cast(data_length)); ensure(dma_mapping.second->size() >= (dma_mapping.first + data_length)); vk::load_dma(::narrow(src_address), data_length); diff --git a/rpcs3/Emu/RSX/VK/VKTextureCache.cpp b/rpcs3/Emu/RSX/VK/VKTextureCache.cpp index 3add9ef1db..28e51ff007 100644 --- a/rpcs3/Emu/RSX/VK/VKTextureCache.cpp +++ b/rpcs3/Emu/RSX/VK/VKTextureCache.cpp @@ -45,7 +45,7 @@ namespace vk const auto task_length = transfer_pitch * src_area.height(); auto working_buffer = vk::get_scratch_buffer(task_length); - auto final_mapping = vk::map_dma(cmd, valid_range.start, section_length); + auto final_mapping = vk::map_dma(valid_range.start, section_length); VkBufferImageCopy region = {}; region.imageSubresource = { src->aspect(), 0, 0, 1 }; @@ -129,7 +129,7 @@ namespace vk region.imageOffset = { src_area.x1, src_area.y1, 0 }; region.imageExtent = { transfer_width, transfer_height, 1 }; - auto mapping = vk::map_dma(cmd, valid_range.start, valid_range.length()); + auto mapping = vk::map_dma(valid_range.start, valid_range.length()); region.bufferOffset = mapping.first; vkCmdCopyImageToBuffer(cmd, src->value, src->current_layout, mapping.second->value, 1, ®ion); } diff --git a/rpcs3/Emu/RSX/VK/VKTextureCache.h b/rpcs3/Emu/RSX/VK/VKTextureCache.h index f2d0143fbe..b00ae1b3e2 100644 --- a/rpcs3/Emu/RSX/VK/VKTextureCache.h +++ b/rpcs3/Emu/RSX/VK/VKTextureCache.h @@ -911,7 +911,7 @@ namespace vk if (memory_load) { - vk::map_dma(cmd, rsx_range.start, rsx_range.length()); + vk::map_dma(rsx_range.start, rsx_range.length()); vk::load_dma(rsx_range.start, rsx_range.length()); }