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

rsx: Preserve pixel data when splitting sections

Browse Source 
- Ironically rhis data leak is caused by trying to fix another type of data leak
This commit is contained in:
kd-11 2020-01-29 16:29:00 +03:00 committed by kd-11
parent 8ef69429d8
commit c9e35926f5
1 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
rpcs3/Emu/RSX/Common/surface_store.h
View File

@ -94,6 +94,7 @@ namespace rsx
}
surface_storage_type sink;
surface_type invalidated = 0;
if (const auto found = data.find(new_address);
found != data.end())
{
@ -104,17 +105,45 @@ namespace rsx
}
else
{
// TODO: Merge the 2 regions
invalidated_resources.push_back(std::move(found->second));
data.erase(new_address);
auto &old = invalidated_resources.back();
Traits::notify_surface_invalidated(old);
if (Traits::surface_is_pitch_compatible(old, prev_surface->get_rsx_pitch()))
{
if (UNLIKELY(old->last_use_tag >= prev_surface->last_use_tag))
{
invalidated = Traits::get(old);
}
}
}
}
Traits::clone_surface(cmd, sink, region.source, new_address, region);
if (UNLIKELY(invalidated))
{
// Halfplement the merge by crude inheritance. Should recursively split the memory blocks instead.
if (LIKELY(sink->old_contents.empty()))
{
sink->set_old_contents(invalidated);
}
else
{
const auto existing = sink->get_normalized_memory_area();
const auto incoming = invalidated->get_normalized_memory_area();
deferred_clipped_region<surface_type> region{};
region.source = invalidated;
region.target = Traits::get(sink);
region.width = std::min(existing.x2, incoming.x2);
region.height = std::min(existing.y2, incoming.y2);
sink->set_old_contents_region(region, true);
}
}
verify(HERE), region.target == Traits::get(sink);
orphaned_surfaces.push_back(region.target);
data[new_address] = std::move(sink);