mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-03-17 01:21:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

rsx: Fix texture cache memory usage statistics

Browse Source
This commit is contained in:
kd-11 2017-11-28 13:53:09 +03:00
parent 17340c44cc
commit 6c9c300fe0
1 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
rpcs3/Emu/RSX/Common/texture_cache.h
View File

@ -692,9 +692,11 @@ namespace rsx
{ {
if (best_fit.first->exists()) if (best_fit.first->exists())
{ {
if (best_fit.first->get_context() != rsx::texture_upload_context::framebuffer_storage)
m_texture_memory_in_use -= best_fit.first->get_section_size();
m_unreleased_texture_objects--; m_unreleased_texture_objects--;
free_texture_section(*best_fit.first); free_texture_section(*best_fit.first);
m_texture_memory_in_use -= best_fit.first->get_section_size();
} }
best_fit.second->notify(rsx_address, rsx_size); best_fit.second->notify(rsx_address, rsx_size);
@ -707,9 +709,11 @@ namespace rsx
{ {
if (tex.exists()) if (tex.exists())
{ {
if (tex.get_context() != rsx::texture_upload_context::framebuffer_storage)
m_texture_memory_in_use -= tex.get_section_size();
m_unreleased_texture_objects--; m_unreleased_texture_objects--;
free_texture_section(tex); free_texture_section(tex);
m_texture_memory_in_use -= tex.get_section_size();
} }
range_data.notify(rsx_address, rsx_size); range_data.notify(rsx_address, rsx_size);
@ -748,21 +752,21 @@ namespace rsx
writer_lock lock(m_cache_mutex); writer_lock lock(m_cache_mutex);
section_storage_type& region = find_cached_texture(memory_address, memory_size, false); section_storage_type& region = find_cached_texture(memory_address, memory_size, false);
if (region.get_context() != texture_upload_context::framebuffer_storage &&
region.exists())
{
//This space was being used for other purposes other than framebuffer storage
//Delete used resources before attaching it to framebuffer memory
free_texture_section(region);
m_texture_memory_in_use -= region.get_section_size();
}
if (!region.is_locked()) if (!region.is_locked())
{ {
region.reset(memory_address, memory_size); region.reset(memory_address, memory_size);
region.set_dirty(false); region.set_dirty(false);
no_access_range = region.get_min_max(no_access_range); no_access_range = region.get_min_max(no_access_range);
} }
else
{
if (region.get_context() != texture_upload_context::framebuffer_storage)
{
//This space was being used for other purposes other than framebuffer storage
//Delete used resources before attaching it to framebuffer memory
free_texture_section(region);
}
}
region.protect(utils::protection::no); region.protect(utils::protection::no);
region.create(width, height, 1, 1, nullptr, image, pitch, false, std::forward<Args>(extras)...); region.create(width, height, 1, 1, nullptr, image, pitch, false, std::forward<Args>(extras)...);
@ -1013,8 +1017,12 @@ namespace rsx
if (!tex.is_dirty()) if (!tex.is_dirty())
continue; continue;
free_texture_section(tex); if (tex.exists() &&
m_texture_memory_in_use -= tex.get_section_size(); tex.get_context() != rsx::texture_upload_context::framebuffer_storage)
{
free_texture_section(tex);
m_texture_memory_in_use -= tex.get_section_size();
}
} }
} }