archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-11 09:18:40 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

rsx: Handle in-place image swaps when locking data for WCB/WDB

Browse source 
- Rare, but possible if a surface address is switched from color to depth usage
- In such a case, deref the old image and ref the new one to avoid leaks
This commit is contained in:
kd-11 2022-03-28 23:42:08 +03:00 • committed by kd-11
parent f45343a345
commit e037b5c438
2 changed files with 26 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -67,14 +67,26 @@ namespace gl
public: public:
using baseclass::cached_texture_section; using baseclass::cached_texture_section;
void create(u16 w, u16 h, u16 depth, u16 mipmaps, gl::texture* image, u32 rsx_pitch, bool read_only, void create(u16 w, u16 h, u16 depth, u16 mipmaps, gl::texture* image, u32 rsx_pitch, bool managed,
gl::texture::format gl_format = gl::texture::format::rgba, gl::texture::type gl_type = gl::texture::type::ubyte, bool swap_bytes = false) gl::texture::format gl_format = gl::texture::format::rgba, gl::texture::type gl_type = gl::texture::type::ubyte, bool swap_bytes = false)
{ {
if (vram_texture && !managed_texture && get_protection() == utils::protection::no)
{
// In-place image swap, still locked. Likely a color buffer that got rebound as depth buffer or vice-versa.
gl::as_rtt(vram_texture)->release();
if (!managed)
{
// Incoming is also an external resource, reference it immediately
gl::as_rtt(image)->add_ref();
}
}
auto new_texture = static_cast<gl::viewable_image*>(image); auto new_texture = static_cast<gl::viewable_image*>(image);
ensure(!exists() || !is_managed() || vram_texture == new_texture); ensure(!exists() || !is_managed() || vram_texture == new_texture);
vram_texture = new_texture; vram_texture = new_texture;
if (read_only) if (managed)
{ {
managed_texture.reset(vram_texture); managed_texture.reset(vram_texture);
} }

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

@ -47,6 +47,18 @@ namespace vk
void create(u16 w, u16 h, u16 depth, u16 mipmaps, vk::image* image, u32 rsx_pitch, bool managed, u32 gcm_format, bool pack_swap_bytes = false) void create(u16 w, u16 h, u16 depth, u16 mipmaps, vk::image* image, u32 rsx_pitch, bool managed, u32 gcm_format, bool pack_swap_bytes = false)
{ {
if (vram_texture && !managed_texture && get_protection() == utils::protection::no)
{
// In-place image swap, still locked. Likely a color buffer that got rebound as depth buffer or vice-versa.
vk::as_rtt(vram_texture)->release();
if (!managed)
{
// Incoming is also an external resource, reference it immediately
vk::as_rtt(image)->add_ref();
}
}
auto new_texture = static_cast<vk::viewable_image*>(image); auto new_texture = static_cast<vk::viewable_image*>(image);
ensure(!exists() || !is_managed() || vram_texture == new_texture); ensure(!exists() || !is_managed() || vram_texture == new_texture);
vram_texture = new_texture; vram_texture = new_texture;