From b3691fc33c09c479d86154d341e1983995193da8 Mon Sep 17 00:00:00 2001 From: Kelebek1 Date: Tue, 9 May 2023 20:21:08 +0100 Subject: Swap order of checking/setting region modifications in the buffer_cache --- src/video_core/buffer_cache/buffer_cache.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/video_core/buffer_cache/buffer_cache.h b/src/video_core/buffer_cache/buffer_cache.h index 6624919a4..fff57ffa9 100644 --- a/src/video_core/buffer_cache/buffer_cache.h +++ b/src/video_core/buffer_cache/buffer_cache.h @@ -96,12 +96,12 @@ void BufferCache

::TickFrame() { template void BufferCache

::WriteMemory(VAddr cpu_addr, u64 size) { - memory_tracker.MarkRegionAsCpuModified(cpu_addr, size); if (memory_tracker.IsRegionGpuModified(cpu_addr, size)) { const IntervalType subtract_interval{cpu_addr, cpu_addr + size}; ClearDownload(subtract_interval); common_ranges.subtract(subtract_interval); } + memory_tracker.MarkRegionAsCpuModified(cpu_addr, size); } template @@ -122,9 +122,10 @@ std::optional BufferCache

::GetFlushArea(VA area->preemtive = true; return area; }; + area->preemtive = + !IsRegionGpuModified(cpu_addr_start_aligned, cpu_addr_end_aligned - cpu_addr_start_aligned); memory_tracker.MarkRegionAsPreflushable(cpu_addr_start_aligned, cpu_addr_end_aligned - cpu_addr_start_aligned); - area->preemtive = !IsRegionGpuModified(cpu_addr, size); return area; } @@ -1223,11 +1224,10 @@ void BufferCache

::UpdateComputeTextureBuffers() { template void BufferCache

::MarkWrittenBuffer(BufferId buffer_id, VAddr cpu_addr, u32 size) { - memory_tracker.MarkRegionAsGpuModified(cpu_addr, size); - if (memory_tracker.IsRegionCpuModified(cpu_addr, size)) { SynchronizeBuffer(slot_buffers[buffer_id], cpu_addr, size); } + memory_tracker.MarkRegionAsGpuModified(cpu_addr, size); const IntervalType base_interval{cpu_addr, cpu_addr + size}; common_ranges.add(base_interval); -- cgit v1.2.3