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

vk: Improve spill robustness

Browse source 
- Removes some incorrect checks that asserted incorrectly
- Make the collapsible check recursive
This commit is contained in:
kd-11 2023-05-13 02:27:08 +03:00 • committed by kd-11
parent b6cdf18165
commit db70cd058a
1 changed files with 22 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

44
rpcs3/Emu/RSX/VK/VKRenderTargets.cpp
View file

@ -47,12 +47,6 @@ namespace vk
bool surface_cache::can_collapse_surface(const std::unique_ptr<vk::render_target>& surface, rsx::problem_severity severity) bool surface_cache::can_collapse_surface(const std::unique_ptr<vk::render_target>& surface, rsx::problem_severity severity)
{ {
if (surface->samples() == 1)
{
// No internal allocations needed for non-MSAA images
return true;
}
if (severity < rsx::problem_severity::fatal && if (severity < rsx::problem_severity::fatal &&
vk::vmm_determine_memory_load_severity() < rsx::problem_severity::fatal) vk::vmm_determine_memory_load_severity() < rsx::problem_severity::fatal)
{ {
@ -61,27 +55,21 @@ namespace vk
} }
// Check if we need to do any allocations. Do not collapse in such a situation otherwise // Check if we need to do any allocations. Do not collapse in such a situation otherwise
if (!surface->resolve_surface) if (surface->samples() > 1 && !surface->resolve_surface)
{ {
return false; return false;
} }
else
{
// Resolve target does exist. Scan through the entire collapse chain // Resolve target does exist. Scan through the entire collapse chain
for (auto& region : surface->old_contents) for (auto& region : surface->old_contents)
{ {
if (region.source->samples() == 1) // FIXME: This is just lazy
{ auto proxy = std::unique_ptr<vk::render_target>(vk::as_rtt(region.source));
// Not MSAA const bool collapsible = can_collapse_surface(proxy, severity);
continue; proxy.release();
}
if (vk::as_rtt(region.source)->resolve_surface) if (!collapsible)
{ {
// Has a resolve target.
continue;
}
return false; return false;
} }
} }
@ -135,9 +123,9 @@ namespace vk
// 1. Spill an strip any 'invalidated resources'. At this point it doesn't matter and we donate to the resolve cache which is a plus. // 1. Spill an strip any 'invalidated resources'. At this point it doesn't matter and we donate to the resolve cache which is a plus.
for (auto& surface : invalidated_resources) for (auto& surface : invalidated_resources)
{ {
if (!surface->value) if (!surface->value && !surface->resolve_surface)
{ {
ensure(!surface->resolve_surface); // Unspilled resources can have no value but have a resolve surface used for read
continue; continue;
} }
@ -536,8 +524,6 @@ namespace vk
bool render_target::spill(vk::command_buffer& cmd, std::vector<std::unique_ptr<vk::viewable_image>>& resolve_cache) bool render_target::spill(vk::command_buffer& cmd, std::vector<std::unique_ptr<vk::viewable_image>>& resolve_cache)
{ {
ensure(value);
u64 element_size; u64 element_size;
switch (const auto fmt = format()) switch (const auto fmt = format())
{ {
@ -556,6 +542,7 @@ namespace vk
vk::viewable_image* src = nullptr; vk::viewable_image* src = nullptr;
if (samples() == 1) [[likely]] if (samples() == 1) [[likely]]
{ {
ensure(value);
src = this; src = this;
} }
else if (resolve_surface) else if (resolve_surface)
@ -716,7 +703,11 @@ namespace vk
else else
{ {
content = vk::get_typeless_helper(format(), format_class(), subres.width_in_block, subres.height_in_block); content = vk::get_typeless_helper(format(), format_class(), subres.width_in_block, subres.height_in_block);
content->change_layout(cmd, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL); if (content->current_layout == VK_IMAGE_LAYOUT_UNDEFINED)
{
content->change_layout(cmd, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL);
}
content->push_layout(cmd, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL);
} }
// Load Cell data into temp buffer // Load Cell data into temp buffer
@ -726,12 +717,15 @@ namespace vk
if (content != final_dst) if (content != final_dst)
{ {
// Avoid layout push/pop on scratch memory by setting explicit layout here // Avoid layout push/pop on scratch memory by setting explicit layout here
content->change_layout(cmd, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL); content->pop_layout(cmd);
content->push_layout(cmd, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL);
vk::copy_scaled_image(cmd, content, final_dst, vk::copy_scaled_image(cmd, content, final_dst,
{ 0, 0, subres.width_in_block, subres.height_in_block }, { 0, 0, subres.width_in_block, subres.height_in_block },
{ 0, 0, static_cast<s32>(final_dst->width()), static_cast<s32>(final_dst->height()) }, { 0, 0, static_cast<s32>(final_dst->width()), static_cast<s32>(final_dst->height()) },
1, true, aspect() == VK_IMAGE_ASPECT_COLOR_BIT ? VK_FILTER_LINEAR : VK_FILTER_NEAREST); 1, true, aspect() == VK_IMAGE_ASPECT_COLOR_BIT ? VK_FILTER_LINEAR : VK_FILTER_NEAREST);
content->pop_layout(cmd);
} }
final_dst->pop_layout(cmd); final_dst->pop_layout(cmd);