Impaczus/rpcs3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rsx: Properly account for memory sizes of reused surfaces

Browse Source
This commit is contained in:
kd-11
2020-06-02 20:50:45 +03:00
committed by kd-11
parent b353bf6c56
commit 26b2e4253d
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rpcs3/Emu/RSX/Common/surface_store.h
+7 -6
View File
@@ -113,14 +113,15 @@ namespace rsx
} }
} }
const bool is_new_surface = !sink; if (sink)
Traits::clone_surface(cmd, sink, region.source, new_address, region);
if (is_new_surface)
{ {
allocate_rsx_memory(Traits::get(sink)); // Memory requirements can be altered when cloning
free_rsx_memory(Traits::get(sink));
} }
Traits::clone_surface(cmd, sink, region.source, new_address, region);
allocate_rsx_memory(Traits::get(sink));
if (invalidated) [[unlikely]] if (invalidated) [[unlikely]]
{ {
// Halfplement the merge by crude inheritance. Should recursively split the memory blocks instead. // Halfplement the merge by crude inheritance. Should recursively split the memory blocks instead.
@@ -509,9 +510,9 @@ namespace rsx
} }
new_surface = Traits::get(new_surface_storage); new_surface = Traits::get(new_surface_storage);
allocate_rsx_memory(new_surface);
Traits::invalidate_surface_contents(command_list, new_surface, address, pitch); Traits::invalidate_surface_contents(command_list, new_surface, address, pitch);
Traits::prepare_surface_for_drawing(command_list, new_surface); Traits::prepare_surface_for_drawing(command_list, new_surface);
allocate_rsx_memory(new_surface);
break; break;
} }
} }