mirrors/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-04-20 11:36:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

vk: Improve handling of texture cache temporary resources

Browse source 
- Temp resources from the texture cache are used to hold composite objects being sent to the GPU and can waste a lot of memory.
- Remove them if we run out of memory as they can linger around for a long time.
This commit is contained in:
kd-11 2021-07-14 20:09:16 +03:00 • committed by kd-11
parent d906ccc77e
commit 2524c35638
3 changed files with 41 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
rpcs3/Emu/RSX/Common/texture_cache.h
View file

@ -1429,7 +1429,7 @@ namespace rsx
m_storage.purge_unreleased_sections();
}
bool handle_memory_pressure(problem_severity severity)
virtual bool handle_memory_pressure(problem_severity severity)
{
if (m_storage.m_unreleased_texture_objects)
{

40
rpcs3/Emu/RSX/VK/VKTextureCache.cpp
View file

@ -450,13 +450,13 @@ namespace vk
std::unique_ptr<vk::viewable_image> texture_cache::find_temporary_image(VkFormat format, u16 w, u16 h, u16 d, u8 mipmaps)
{
//const auto current_frame = vk::get_current_frame_id();
for (auto& e : m_temporary_storage)
{
if (e.can_reuse && e.matches(format, w, h, d, mipmaps, 0))
{
m_temporary_memory_size -= e.block_size;
e.block_size = 0;
e.can_reuse = false;
return std::move(e.combined_image);
}
}
@ -466,13 +466,13 @@ namespace vk
std::unique_ptr<vk::viewable_image> texture_cache::find_temporary_cubemap(VkFormat format, u16 size)
{
//const auto current_frame = vk::get_current_frame_id();
for (auto& e : m_temporary_storage)
{
if (e.can_reuse && e.matches(format, size, size, 1, 1, VK_IMAGE_CREATE_CUBE_COMPATIBLE_BIT))
{
m_temporary_memory_size -= e.block_size;
e.block_size = 0;
e.can_reuse = false;
return std::move(e.combined_image);
}
}
@ -1092,6 +1092,42 @@ namespace vk
return false;
}
bool texture_cache::handle_memory_pressure(rsx::problem_severity severity)
{
bool any_released = baseclass::handle_memory_pressure(severity);
if (severity <= rsx::problem_severity::low || !m_temporary_memory_size)
{
// Nothing left to do
return any_released;
}
constexpr u64 _1M = 0x100000;
if (severity <= rsx::problem_severity::moderate && m_temporary_memory_size < (64 * _1M))
{
// Some memory is consumed by the temporary resources, but no need to panic just yet
return any_released;
}
// Nuke temporary resources. They will still be visible to the GPU.
auto gc = vk::get_resource_manager();
u64 actual_released_memory = 0;
for (auto& entry : m_temporary_storage)
{
actual_released_memory += entry.combined_image->memory->size();
gc->dispose(entry.combined_image);
m_temporary_memory_size -= entry.block_size;
}
ensure(m_temporary_memory_size == 0);
m_temporary_storage.clear();
m_temporary_subresource_cache.clear();
rsx_log.warning("Texture cache released %lluM of temporary resources.", (actual_released_memory / _1M));
return any_released || (actual_released_memory > 0);
}
void texture_cache::on_frame_end()
{
trim_sections();

2
rpcs3/Emu/RSX/VK/VKTextureCache.h
View file

@ -503,6 +503,8 @@ namespace vk
u32 get_unreleased_textures_count() const override;
bool handle_memory_pressure(rsx::problem_severity severity) override;
u32 get_temporary_memory_in_use() const;
bool is_overallocated() const;