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

rsx/texture_cache: fixes to commit_framebuffer_memory

Browse source
This commit is contained in:
kd-11 2019-03-02 15:14:22 +03:00 • committed by kd-11
parent b9e7b085fe
commit dccb4a4888
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -720,6 +720,8 @@ namespace rsx
// Fast code-path for keeping the fault range protection when not flushing anything // Fast code-path for keeping the fault range protection when not flushing anything
if (cause.keep_fault_range_protection() && cause.skip_flush() && !trampled_set.sections.empty()) if (cause.keep_fault_range_protection() && cause.skip_flush() && !trampled_set.sections.empty())
{ {
verify(HERE), cause != invalidation_cause::committed_as_fbo;
// We discard all sections fully inside fault_range // We discard all sections fully inside fault_range
for (auto &obj : trampled_set.sections) for (auto &obj : trampled_set.sections)
{ {
@ -792,7 +794,8 @@ namespace rsx
// 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 fbos unless the start addresses match
(overlaps_fault_range && cause.skip_fbos() && tex.get_context() == texture_upload_context::framebuffer_storage && tex.get_section_base() != fault_range_in.start) // If region is committed as fbo, all non-fbo data is removed but all fbos 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 || cause == invalidation_cause::committed_as_fbo))
) )
{ {
// False positive // False positive