mirrors-yuzu-emu/yuzu-mainline
1
0
Fork 0
mirror of https://github.com/yuzu-emu/yuzu-mainline synced 2024-11-22 21:53:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #10091 from Kelebek1/bc_bugggggg

Browse source 
Fix buffer overlap checking skipping a page for stream score right expand
This commit is contained in:
liamwhite 2023-06-01 09:06:07 -04:00 committed by GitHub
commit d89b98d8e8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/video_core/buffer_cache/buffer_cache.h
View file

@ -1278,7 +1278,7 @@ typename BufferCache<P>::OverlapResult BufferCache<P>::ResolveOverlaps(VAddr cpu
const VAddr overlap_cpu_addr = overlap.CpuAddr(); const VAddr overlap_cpu_addr = overlap.CpuAddr();
const bool expands_left = overlap_cpu_addr < begin; const bool expands_left = overlap_cpu_addr < begin;
if (expands_left) { if (expands_left) {
cpu_addr = begin = overlap_cpu_addr; begin = overlap_cpu_addr;
} }
const VAddr overlap_end = overlap_cpu_addr + overlap.SizeBytes(); const VAddr overlap_end = overlap_cpu_addr + overlap.SizeBytes();
const bool expands_right = overlap_end > end; const bool expands_right = overlap_end > end;
@ -1292,7 +1292,7 @@ typename BufferCache<P>::OverlapResult BufferCache<P>::ResolveOverlaps(VAddr cpu
has_stream_leap = true; has_stream_leap = true;
if (expands_right) { if (expands_right) {
begin -= CACHING_PAGESIZE * 256; begin -= CACHING_PAGESIZE * 256;
cpu_addr = begin; cpu_addr = begin - CACHING_PAGESIZE;
} }
if (expands_left) { if (expands_left) {
end += CACHING_PAGESIZE * 256; end += CACHING_PAGESIZE * 256;
@ -1315,7 +1315,7 @@ void BufferCache<P>::JoinOverlap(BufferId new_buffer_id, BufferId overlap_id,
if (accumulate_stream_score) { if (accumulate_stream_score) {
new_buffer.IncreaseStreamScore(overlap.StreamScore() + 1); new_buffer.IncreaseStreamScore(overlap.StreamScore() + 1);
} }
boost::container::small_vector<BufferCopy, 1> copies; boost::container::small_vector<BufferCopy, 10> copies;
const size_t dst_base_offset = overlap.CpuAddr() - new_buffer.CpuAddr(); const size_t dst_base_offset = overlap.CpuAddr() - new_buffer.CpuAddr();
copies.push_back(BufferCopy{ copies.push_back(BufferCopy{
.src_offset = 0, .src_offset = 0,