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

vk: Minor refactor in OOM handler to skip scans if we already found a match

Browse source
This commit is contained in:
kd-11 2023-05-14 23:40:54 +03:00 • committed by kd-11
parent e06c6b5ac8
commit 57070aa8ff
1 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

17
rpcs3/Emu/RSX/VK/VKGSRender.cpp
View file

@ -1141,23 +1141,30 @@ bool VKGSRender::on_vram_exhausted(rsx::problem_severity severity)
} }
const bool any_cache_relieved = (texture_cache_relieved || surface_cache_relieved); const bool any_cache_relieved = (texture_cache_relieved || surface_cache_relieved);
if (severity <= rsx::problem_severity::moderate) if (severity < rsx::problem_severity::fatal)
{ {
return any_cache_relieved; return any_cache_relieved;
} }
ensure(severity >= rsx::problem_severity::fatal);
if (surface_cache_relieved && !m_samplers_dirty) if (surface_cache_relieved && !m_samplers_dirty)
{ {
// If surface cache was modified destructively, then we must reload samplers touching the surface cache. // If surface cache was modified destructively, then we must reload samplers touching the surface cache.
bool invalidate_samplers = false; bool invalidate_samplers = false;
auto scan_array = [&](const auto& texture_array, const auto& sampler_states) auto scan_array = [&](const auto& texture_array, const auto& sampler_states)
{ {
for (auto i = 0ull; i < texture_array.size() && !invalidate_samplers; ++i) if (invalidate_samplers)
{ {
if (texture_array[i].enabled() && sampler_states[i]) return;
}
for (auto i = 0ull; i < texture_array.size(); ++i)
{ {
invalidate_samplers = (sampler_states[i]->upload_context == rsx::texture_upload_context::framebuffer_storage); if (texture_array[i].enabled() &&
sampler_states[i] &&
sampler_states[i]->upload_context == rsx::texture_upload_context::framebuffer_storage)
{
invalidate_samplers = true;
break;
} }
} }
}; };