archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-05 06:21:26 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

rsx: Fixup for lost aliased surfaces

Browse source 
- Intersection routines were changed and require explicit identification of the "old surface"
This commit is contained in:
kd-11 2019-05-15 18:06:52 +03:00 • committed by kd-11
parent 05eb1e9193
commit 45a13d0319
1 changed files with 28 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

59
rpcs3/Emu/RSX/Common/surface_store.h
View file

@ -857,6 +857,20 @@ namespace rsx
new_surface = Traits::get(new_surface_storage); new_surface = Traits::get(new_surface_storage);
} }
if (!old_surface)
{
// Remove and preserve if possible any overlapping/replaced depth surface
auto aliased_depth_surface = m_depth_stencil_storage.find(address);
if (aliased_depth_surface != m_depth_stencil_storage.end())
{
old_surface = Traits::get(aliased_depth_surface->second);
Traits::notify_surface_invalidated(aliased_depth_surface->second);
invalidated_resources.push_back(std::move(aliased_depth_surface->second));
m_depth_stencil_storage.erase(aliased_depth_surface);
}
}
#ifndef INCOMPLETE_SURFACE_CACHE_IMPL #ifndef INCOMPLETE_SURFACE_CACHE_IMPL
// Check if old_surface is 'new' and avoid intersection // Check if old_surface is 'new' and avoid intersection
if (old_surface && old_surface->last_use_tag >= write_tag) if (old_surface && old_surface->last_use_tag >= write_tag)
@ -875,22 +889,6 @@ namespace rsx
m_render_targets_storage[address] = std::move(new_surface_storage); m_render_targets_storage[address] = std::move(new_surface_storage);
} }
// Remove and preserve if possible any overlapping/replaced depth surface
auto aliased_depth_surface = m_depth_stencil_storage.find(address);
if (aliased_depth_surface != m_depth_stencil_storage.end())
{
if (Traits::surface_is_pitch_compatible(aliased_depth_surface->second, pitch))
{
// Preserve memory outside the area to be inherited if needed
const u8 bpp = get_format_block_size_in_bytes(color_format);
split_surface_region<true>(command_list, address, Traits::get(aliased_depth_surface->second), (u16)width, (u16)height, bpp, antialias);
}
Traits::notify_surface_invalidated(aliased_depth_surface->second);
invalidated_resources.push_back(std::move(aliased_depth_surface->second));
m_depth_stencil_storage.erase(aliased_depth_surface);
}
return new_surface; return new_surface;
} }
@ -988,6 +986,20 @@ namespace rsx
new_surface = Traits::get(new_surface_storage); new_surface = Traits::get(new_surface_storage);
} }
if (!old_surface)
{
// Remove and preserve if possible any overlapping/replaced color surface
auto aliased_rtt_surface = m_render_targets_storage.find(address);
if (aliased_rtt_surface != m_render_targets_storage.end())
{
old_surface = Traits::get(aliased_rtt_surface->second);
Traits::notify_surface_invalidated(aliased_rtt_surface->second);
invalidated_resources.push_back(std::move(aliased_rtt_surface->second));
m_render_targets_storage.erase(aliased_rtt_surface);
}
}
#ifndef INCOMPLETE_SURFACE_CACHE_IMPL #ifndef INCOMPLETE_SURFACE_CACHE_IMPL
// Check if old_surface is 'new' and avoid intersection // Check if old_surface is 'new' and avoid intersection
if (old_surface && old_surface->last_use_tag >= write_tag) if (old_surface && old_surface->last_use_tag >= write_tag)
@ -1006,21 +1018,6 @@ namespace rsx
m_depth_stencil_storage[address] = std::move(new_surface_storage); m_depth_stencil_storage[address] = std::move(new_surface_storage);
} }
// Remove and preserve if possible any overlapping/replaced color surface
auto aliased_rtt_surface = m_render_targets_storage.find(address);
if (aliased_rtt_surface != m_render_targets_storage.end())
{
if (Traits::surface_is_pitch_compatible(aliased_rtt_surface->second, pitch))
{
const u8 bpp = (depth_format == rsx::surface_depth_format::z16) ? 2 : 4;
split_surface_region<false>(command_list, address, Traits::get(aliased_rtt_surface->second), (u16)width, (u16)height, bpp, antialias);
}
Traits::notify_surface_invalidated(aliased_rtt_surface->second);
invalidated_resources.push_back(std::move(aliased_rtt_surface->second));
m_render_targets_storage.erase(aliased_rtt_surface);
}
return new_surface; return new_surface;
} }
public: public: