RPCS3/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-12-06 07:12:28 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

vk: Reduce number of barriers for each copy transfer sequence

Browse source 
- Sometimes the same source image is copied more than once
This commit is contained in:
kd-11 2025-11-09 02:12:38 +03:00 committed by kd-11
parent 864bb9f0db
commit 1af5afdaab
1 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
rpcs3/Emu/RSX/VK/VKTextureCache.cpp
View file

@ -403,6 +403,8 @@ namespace vk
const auto dst_aspect = dst->aspect(); const auto dst_aspect = dst->aspect();
const auto dst_bpp = vk::get_format_texel_width(dst->format()); const auto dst_bpp = vk::get_format_texel_width(dst->format());
std::unordered_set<decltype(sections_to_transfer.front().src)> processed_input_images;
for (const auto& section : sections_to_transfer) for (const auto& section : sections_to_transfer)
{ {
if (!section.src) if (!section.src)
@ -436,11 +438,15 @@ namespace vk
const bool typeless = section.src->aspect() != dst_aspect || const bool typeless = section.src->aspect() != dst_aspect ||
!formats_are_bitcast_compatible(dst, section.src); !formats_are_bitcast_compatible(dst, section.src);
// Avoid inserting unnecessary barrier GENERAL->TRANSFER_SRC->GENERAL in active render targets if (!processed_input_images.contains(section.src))
const auto preferred_layout = (section.src->current_layout != VK_IMAGE_LAYOUT_GENERAL) ? {
VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL : VK_IMAGE_LAYOUT_GENERAL; // Avoid inserting unnecessary barrier GENERAL->TRANSFER_SRC->GENERAL in active render targets
const auto preferred_layout = (section.src->current_layout != VK_IMAGE_LAYOUT_GENERAL) ?
VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL : VK_IMAGE_LAYOUT_GENERAL;
section.src->push_layout(cmd, preferred_layout); section.src->push_layout(cmd, preferred_layout);
processed_input_images.insert(section.src);
}
auto src_image = section.src; auto src_image = section.src;
auto src_x = section.src_x; auto src_x = section.src_x;
@ -541,8 +547,12 @@ namespace vk
vkCmdCopyImage(cmd, _dst->value, _dst->current_layout, dst->value, dst->current_layout, 1, &copy_rgn); vkCmdCopyImage(cmd, _dst->value, _dst->current_layout, dst->value, dst->current_layout, 1, &copy_rgn);
} }
} }
}
section.src->pop_layout(cmd); // Pop unique image layouts here
for (auto& image : processed_input_images)
{
image->pop_layout(cmd);
} }
} }