Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

vk: Improved OOM handling #13967

Merged
merged 3 commits into from Jun 9, 2023
Merged

vk: Improved OOM handling #13967

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e525c77
vk: Improved OOM handling
kd-11 Jun 6, 2023
45f3864
vk: Cleaner approach to object lifetime management
kd-11 Jun 6, 2023
2c7f70d
Merge branch 'master' into surface-cache-trim
kd-11 Jun 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 12 additions & 6 deletions rpcs3/Emu/RSX/VK/VKRenderTargets.cpp
View file
Open in desktop
Expand Up @@ -190,18 +190,24 @@ namespace vk
return false;
}

if (rtt->resolve_surface && memory_pressure >= rsx::problem_severity::moderate)
{
// We do not need to keep resolve targets around.
vk::get_resource_manager()->dispose(rtt->resolve_surface);
}

if (rtt->frame_tag >= last_finished_frame)
{
// RTT itself still in use by the frame.
return false;
}

if (!rtt->old_contents.empty())
{
rtt->clear_rw_barrier();
}

if (rtt->resolve_surface && memory_pressure >= rsx::problem_severity::moderate)
{
// We do not need to keep resolve targets around.
// TODO: We should surrender this to an image cache immediately for reuse.
vk::get_resource_manager()->dispose(rtt->resolve_surface);
}

switch (memory_pressure)
{
case rsx::problem_severity::low:
Expand Down