diff options
| author | 2023-12-31 20:55:15 +0100 | |
|---|---|---|
| committer | 2024-01-18 21:12:30 -0500 | |
| commit | 590d9b7e1d875e0403fb87cfcd4a8d52c50e2b81 (patch) | |
| tree | b9eb43c5a4af892d5fda77fac241099c166c2380 /src/video_core/buffer_cache | |
| parent | SMMU: Fix software rendering and cleanup (diff) | |
| download | yuzu-590d9b7e1d875e0403fb87cfcd4a8d52c50e2b81.tar.gz yuzu-590d9b7e1d875e0403fb87cfcd4a8d52c50e2b81.tar.xz yuzu-590d9b7e1d875e0403fb87cfcd4a8d52c50e2b81.zip | |
Core: Clang format and other small issues.
Diffstat (limited to 'src/video_core/buffer_cache')
| -rw-r--r-- | src/video_core/buffer_cache/buffer_cache.h | 8 | ||||
| -rw-r--r-- | src/video_core/buffer_cache/word_manager.h | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/video_core/buffer_cache/buffer_cache.h b/src/video_core/buffer_cache/buffer_cache.h index 6fe2e8b93..5325a715a 100644 --- a/src/video_core/buffer_cache/buffer_cache.h +++ b/src/video_core/buffer_cache/buffer_cache.h | |||
| @@ -240,8 +240,8 @@ bool BufferCache<P>::DMACopy(GPUVAddr src_address, GPUVAddr dest_address, u64 am | |||
| 240 | memory_tracker.MarkRegionAsGpuModified(*cpu_dest_address, amount); | 240 | memory_tracker.MarkRegionAsGpuModified(*cpu_dest_address, amount); |
| 241 | } | 241 | } |
| 242 | 242 | ||
| 243 | Tegra::Memory::DeviceGuestMemoryScoped<u8, Tegra::Memory::GuestMemoryFlags::UnsafeReadWrite> tmp( | 243 | Tegra::Memory::DeviceGuestMemoryScoped<u8, Tegra::Memory::GuestMemoryFlags::UnsafeReadWrite> |
| 244 | device_memory, *cpu_src_address, amount, &tmp_buffer); | 244 | tmp(device_memory, *cpu_src_address, amount, &tmp_buffer); |
| 245 | tmp.SetAddressAndSize(*cpu_dest_address, amount); | 245 | tmp.SetAddressAndSize(*cpu_dest_address, amount); |
| 246 | return true; | 246 | return true; |
| 247 | } | 247 | } |
| @@ -1355,7 +1355,7 @@ typename BufferCache<P>::OverlapResult BufferCache<P>::ResolveOverlaps(DAddr dev | |||
| 1355 | bool has_stream_leap = false; | 1355 | bool has_stream_leap = false; |
| 1356 | auto expand_begin = [&](DAddr add_value) { | 1356 | auto expand_begin = [&](DAddr add_value) { |
| 1357 | static constexpr DAddr min_page = CACHING_PAGESIZE + Core::Memory::YUZU_PAGESIZE; | 1357 | static constexpr DAddr min_page = CACHING_PAGESIZE + Core::Memory::YUZU_PAGESIZE; |
| 1358 | if (add_value > begin - min_page ) { | 1358 | if (add_value > begin - min_page) { |
| 1359 | begin = min_page; | 1359 | begin = min_page; |
| 1360 | device_addr = Core::Memory::YUZU_PAGESIZE; | 1360 | device_addr = Core::Memory::YUZU_PAGESIZE; |
| 1361 | return; | 1361 | return; |
| @@ -1365,7 +1365,7 @@ typename BufferCache<P>::OverlapResult BufferCache<P>::ResolveOverlaps(DAddr dev | |||
| 1365 | }; | 1365 | }; |
| 1366 | auto expand_end = [&](DAddr add_value) { | 1366 | auto expand_end = [&](DAddr add_value) { |
| 1367 | static constexpr DAddr max_page = 1ULL << Tegra::MaxwellDeviceMemoryManager::AS_BITS; | 1367 | static constexpr DAddr max_page = 1ULL << Tegra::MaxwellDeviceMemoryManager::AS_BITS; |
| 1368 | if (add_value > max_page - end ) { | 1368 | if (add_value > max_page - end) { |
| 1369 | end = max_page; | 1369 | end = max_page; |
| 1370 | return; | 1370 | return; |
| 1371 | } | 1371 | } |
diff --git a/src/video_core/buffer_cache/word_manager.h b/src/video_core/buffer_cache/word_manager.h index 56ab4f5f1..1ca333b32 100644 --- a/src/video_core/buffer_cache/word_manager.h +++ b/src/video_core/buffer_cache/word_manager.h | |||
| @@ -472,8 +472,8 @@ private: | |||
| 472 | u64 changed_bits = (add_to_tracker ? current_bits : ~current_bits) & new_bits; | 472 | u64 changed_bits = (add_to_tracker ? current_bits : ~current_bits) & new_bits; |
| 473 | VAddr addr = cpu_addr + word_index * BYTES_PER_WORD; | 473 | VAddr addr = cpu_addr + word_index * BYTES_PER_WORD; |
| 474 | IteratePages(changed_bits, [&](size_t offset, size_t size) { | 474 | IteratePages(changed_bits, [&](size_t offset, size_t size) { |
| 475 | tracker->UpdatePagesCachedCount(addr + offset * BYTES_PER_PAGE, | 475 | tracker->UpdatePagesCachedCount(addr + offset * BYTES_PER_PAGE, size * BYTES_PER_PAGE, |
| 476 | size * BYTES_PER_PAGE, add_to_tracker ? 1 : -1); | 476 | add_to_tracker ? 1 : -1); |
| 477 | }); | 477 | }); |
| 478 | } | 478 | } |
| 479 | 479 | ||