mirrors/rpcs3
0
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-08-12 02:59:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

rsx: Fix invalid reference when purging unlocked sections

Browse source
This commit is contained in:
kd-11 2021-07-13 23:34:07 +03:00 • committed by kd-11
commit 71a5e5333a
1 changed files with 21 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

44
rpcs3/Emu/RSX/Common/texture_cache_utils.h
View file

@ -556,15 +556,13 @@ namespace rsx
void purge_unreleased_sections() void purge_unreleased_sections()
{ {
// We will be iterating through m_in_use
// do not allow the callbacks to touch m_in_use to avoid invalidating the iterator
m_purging = true; m_purging = true;
std::vector<section_storage_type*> textures_to_remove;
// Reclaims all graphics memory consumed by dirty textures // Reclaims all graphics memory consumed by dirty textures
for (auto it = m_in_use.begin(); it != m_in_use.end();) // Do not destroy anything while iterating or you will end up with stale iterators
for (auto& block : m_in_use)
{ {
auto *block = *it;
if (block->get_unreleased_count() > 0) if (block->get_unreleased_count() > 0)
{ {
for (auto& tex : *block) for (auto& tex : *block)
@ -573,19 +571,14 @@ namespace rsx
continue; continue;
ensure(!tex.is_locked()); ensure(!tex.is_locked());
textures_to_remove.push_back(&tex);
tex.destroy(); }
} }
} }
if (block->get_exists_count() == 0) for (auto& tex : textures_to_remove)
{ {
it = m_in_use.erase(it); tex->destroy();
}
else
{
it++;
}
} }
m_purging = false; m_purging = false;
@ -595,11 +588,11 @@ namespace rsx
bool purge_unlocked_sections() bool purge_unlocked_sections()
{ {
// Reclaims all graphics memory consumed by unlocked textures // Reclaims all graphics memory consumed by unlocked textures
bool any_released = false; // Do not destroy anything while iterating or you will end up with stale iterators
for (auto it = m_in_use.begin(); it != m_in_use.end();) std::vector<section_storage_type*> textures_to_remove;
{
auto* block = *it;
for (auto& block : m_in_use)
{
if (block->get_exists_count() > block->get_locked_count()) if (block->get_exists_count() > block->get_locked_count())
{ {
for (auto& tex : *block) for (auto& tex : *block)
@ -612,22 +605,17 @@ namespace rsx
} }
ensure(!tex.is_locked() && tex.exists()); ensure(!tex.is_locked() && tex.exists());
tex.destroy(); textures_to_remove.push_back(&tex);
any_released = true; }
} }
} }
if (block->get_exists_count() == 0) for (auto& tex : textures_to_remove)
{ {
it = m_in_use.erase(it); tex->destroy();
}
else
{
it++;
}
} }
return any_released; return !textures_to_remove.empty();
} }
void trim_sections() void trim_sections()