purgatory/yuzu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Buffer Cache: Revert unnecessary range reduction.

Browse Source
This commit is contained in:
Fernando Sahmkow 2021-07-07 20:45:33 +02:00
parent cf38faee9b
commit f75544a943
1 changed files with 13 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/video_core/buffer_cache/buffer_cache.h
View File

@ -592,35 +592,19 @@ void BufferCache<P>::CommitAsyncFlushesHigh() {
const VAddr cpu_addr_end = interval.upper(); const VAddr cpu_addr_end = interval.upper();
ForEachBufferInRange(cpu_addr, size, [&](BufferId buffer_id, Buffer& buffer) { ForEachBufferInRange(cpu_addr, size, [&](BufferId buffer_id, Buffer& buffer) {
boost::container::small_vector<BufferCopy, 1> copies; boost::container::small_vector<BufferCopy, 1> copies;
buffer.ForEachDownloadRange( buffer.ForEachDownloadRange(cpu_addr, size, true,
cpu_addr, size, false, [&](u64 range_offset, u64 range_size) { [&](u64 range_offset, u64 range_size) {
VAddr cpu_addr_base = buffer.CpuAddr() + range_offset; downloads.push_back({
VAddr cpu_addr_end2 = cpu_addr_base + range_size; BufferCopy{
const s64 difference = s64(cpu_addr_end2 - cpu_addr_end); .src_offset = range_offset,
cpu_addr_end2 -= u64(std::max<s64>(difference, 0)); .dst_offset = total_size_bytes,
const s64 difference2 = s64(cpu_addr - cpu_addr_base); .size = range_size,
cpu_addr_base += u64(std::max<s64>(difference2, 0)); },
const u64 new_size = cpu_addr_end2 - cpu_addr_base; buffer_id,
const u64 new_offset = cpu_addr_base - buffer.CpuAddr(); });
downloads.push_back({ total_size_bytes += range_size;
BufferCopy{ largest_copy = std::max(largest_copy, range_size);
.src_offset = new_offset, });
.dst_offset = total_size_bytes,
.size = new_size,
},
buffer_id,
});
total_size_bytes += new_size;
largest_copy = std::max(largest_copy, new_size);
constexpr u64 align_mask = ~(32ULL - 1);
const VAddr align_up_address = (cpu_addr_base + 31) & align_mask;
const u64 difference_base = align_up_address - cpu_addr_base;
if (difference_base > new_size) {
return;
}
const u64 fixed_size = new_size - difference_base;
buffer.UnmarkRegionAsGpuModified(align_up_address, fixed_size & align_mask);
});
}); });
} }
} }