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

rsx: Minor improvement to fbo region invalidation

Browse source 
- When commiting a block as fbo, keep blit_dst data as well.
- Avoids removing (and losing data from) blit targets that just happen to share a page with a framebuffer.
This commit is contained in:
kd-11 2019-10-13 22:56:56 +03:00 • committed by kd-11
parent c16319f959
commit 868547aec8
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
rpcs3/Emu/RSX/Common/texture_cache.h
View file

@ -743,10 +743,10 @@ namespace rsx
if (tex.overlaps(fault_range, section_bounds::locked_range)) if (tex.overlaps(fault_range, section_bounds::locked_range))
{ {
if (cause == invalidation_cause::superseded_by_fbo && if (cause == invalidation_cause::superseded_by_fbo &&
tex.get_context() == texture_upload_context::framebuffer_storage && tex.is_flushable() &&
tex.get_section_base() != fault_range_in.start) tex.get_section_base() != fault_range_in.start)
{ {
// HACK: When being superseded by an fbo, we preserve other overlapped fbos unless the start addresses match // HACK: When being superseded by an fbo, we preserve overlapped flushables unless the start addresses match
continue; continue;
} }
else if (tex.inside(fault_range, section_bounds::locked_range)) else if (tex.inside(fault_range, section_bounds::locked_range))
@ -807,9 +807,9 @@ namespace rsx
!tex.inside(trampled_set.invalidate_range, bounds) || !tex.inside(trampled_set.invalidate_range, bounds) ||
// Unsynchronized sections (or any flushable when skipping flushes) that do not overlap the fault range directly can also be ignored // Unsynchronized sections (or any flushable when skipping flushes) that do not overlap the fault range directly can also be ignored
(invalidation_ignore_unsynchronized && tex.is_flushable() && (cause.skip_flush() || !tex.is_synchronized()) && !overlaps_fault_range) || (invalidation_ignore_unsynchronized && tex.is_flushable() && (cause.skip_flush() || !tex.is_synchronized()) && !overlaps_fault_range) ||
// HACK: When being superseded by an fbo, we preserve other overlapped fbos unless the start addresses match // HACK: When being superseded by an fbo, we preserve other overlapped flushables unless the start addresses match
// If region is committed as fbo, all non-fbo data is removed but all fbos in the region must be preserved if possible // If region is committed as fbo, all non-flushable data is removed but all flushables in the region must be preserved if possible
(overlaps_fault_range && tex.get_context() == texture_upload_context::framebuffer_storage && cause.skip_fbos() && tex.get_section_base() != fault_range_in.start) (overlaps_fault_range && tex.is_flushable() && cause.skip_fbos() && tex.get_section_base() != fault_range_in.start)
) )
{ {
// False positive // False positive