mirrors/rpcs3
0
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-08-17 07:50:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

rsx: Fix reference leak when cloning surfaces

Browse source
This commit is contained in:
kd-11 2019-07-15 19:36:29 +03:00 • committed by kd-11
commit 998717659f
2 changed files with 29 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

16
rpcs3/Emu/RSX/GL/GLRenderTargets.h
View file

@ -196,7 +196,7 @@ struct gl_render_target_traits
static static
void clone_surface( void clone_surface(
gl::command_context&, gl::command_context& cmd,
std::unique_ptr<gl::render_target>& sink, gl::render_target* ref, std::unique_ptr<gl::render_target>& sink, gl::render_target* ref,
u32 address, barrier_descriptor_t& prev) u32 address, barrier_descriptor_t& prev)
{ {
@ -227,6 +227,20 @@ struct gl_render_target_traits
prev.target = sink.get(); prev.target = sink.get();
sink->sync_tag(); sink->sync_tag();
if (!sink->old_contents.empty())
{
// Deal with this, likely only needs to clear
if (sink->surface_width > prev.width || sink->surface_height > prev.height)
{
sink->write_barrier(cmd);
}
else
{
sink->clear_rw_barrier();
}
}
sink->set_old_contents_region(prev, false); sink->set_old_contents_region(prev, false);
sink->last_use_tag = ref->last_use_tag; sink->last_use_tag = ref->last_use_tag;
} }

14
rpcs3/Emu/RSX/VK/VKRenderTargets.h
View file

@ -590,6 +590,20 @@ namespace rsx
sink->rsx_pitch = ref->get_rsx_pitch(); sink->rsx_pitch = ref->get_rsx_pitch();
sink->sync_tag(); sink->sync_tag();
if (!sink->old_contents.empty())
{
// Deal with this, likely only needs to clear
if (sink->surface_width > prev.width || sink->surface_height > prev.height)
{
sink->write_barrier(cmd);
}
else
{
sink->clear_rw_barrier();
}
}
sink->set_old_contents_region(prev, false); sink->set_old_contents_region(prev, false);
sink->last_use_tag = ref->last_use_tag; sink->last_use_tag = ref->last_use_tag;
} }