summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKelebek1 <eeeedddccc@hotmail.co.uk>2023-04-24 15:07:32 +0200
committerKelebek1 <eeeedddccc@hotmail.co.uk>2023-05-26 11:35:46 +0200
commit7ce181edcf1af2efe8d3b4a162cffb4ba6ff5bc9 (patch)
tree7c0c0627d8481dd40eda86655977dfb71ed84b5d
parentMerge pull request #10422 from liamwhite/gc (diff)
downloadyuzu-7ce181edcf1af2efe8d3b4a162cffb4ba6ff5bc9.tar
yuzu-7ce181edcf1af2efe8d3b4a162cffb4ba6ff5bc9.tar.gz
yuzu-7ce181edcf1af2efe8d3b4a162cffb4ba6ff5bc9.tar.bz2
yuzu-7ce181edcf1af2efe8d3b4a162cffb4ba6ff5bc9.tar.lz
yuzu-7ce181edcf1af2efe8d3b4a162cffb4ba6ff5bc9.tar.xz
yuzu-7ce181edcf1af2efe8d3b4a162cffb4ba6ff5bc9.tar.zst
yuzu-7ce181edcf1af2efe8d3b4a162cffb4ba6ff5bc9.zip
-rw-r--r--src/video_core/buffer_cache/buffer_cache.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/video_core/buffer_cache/buffer_cache.h b/src/video_core/buffer_cache/buffer_cache.h
index 65494097b..88d3b2515 100644
--- a/src/video_core/buffer_cache/buffer_cache.h
+++ b/src/video_core/buffer_cache/buffer_cache.h
@@ -1262,7 +1262,7 @@ typename BufferCache<P>::OverlapResult BufferCache<P>::ResolveOverlaps(VAddr cpu
const VAddr overlap_cpu_addr = overlap.CpuAddr();
const bool expands_left = overlap_cpu_addr < begin;
if (expands_left) {
- cpu_addr = begin = overlap_cpu_addr;
+ begin = overlap_cpu_addr;
}
const VAddr overlap_end = overlap_cpu_addr + overlap.SizeBytes();
const bool expands_right = overlap_end > end;
@@ -1276,7 +1276,7 @@ typename BufferCache<P>::OverlapResult BufferCache<P>::ResolveOverlaps(VAddr cpu
has_stream_leap = true;
if (expands_right) {
begin -= CACHING_PAGESIZE * 256;
- cpu_addr = begin;
+ cpu_addr = begin - CACHING_PAGESIZE;
}
if (expands_left) {
end += CACHING_PAGESIZE * 256;
@@ -1299,7 +1299,7 @@ void BufferCache<P>::JoinOverlap(BufferId new_buffer_id, BufferId overlap_id,
if (accumulate_stream_score) {
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();
copies.push_back(BufferCopy{
.src_offset = 0,