diff options
| author | 2023-12-19 16:14:09 +0100 | |
|---|---|---|
| committer | 2023-12-19 16:14:09 +0100 | |
| commit | 97ad3e75304fdf604e7619986388df9d659c3e52 (patch) | |
| tree | ea5ca8448da392fc0a66d5019a694b5bff3a2013 /src/tests | |
| parent | Merge pull request #12304 from liamwhite/flinger-wtf (diff) | |
| parent | Revert "video_core: use interval map for page count tracking" (diff) | |
| download | yuzu-97ad3e75304fdf604e7619986388df9d659c3e52.tar.gz yuzu-97ad3e75304fdf604e7619986388df9d659c3e52.tar.xz yuzu-97ad3e75304fdf604e7619986388df9d659c3e52.zip | |
Merge pull request #12391 from yuzu-emu/revert-12344-its-free-real-estate
Revert "video_core: use interval map for page count tracking"
Diffstat (limited to 'src/tests')
| -rw-r--r-- | src/tests/video_core/memory_tracker.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/tests/video_core/memory_tracker.cpp b/src/tests/video_core/memory_tracker.cpp index 2dbff21af..618793668 100644 --- a/src/tests/video_core/memory_tracker.cpp +++ b/src/tests/video_core/memory_tracker.cpp | |||
| @@ -23,13 +23,13 @@ constexpr VAddr c = 16 * HIGH_PAGE_SIZE; | |||
| 23 | 23 | ||
| 24 | class RasterizerInterface { | 24 | class RasterizerInterface { |
| 25 | public: | 25 | public: |
| 26 | void UpdatePagesCachedCount(VAddr addr, u64 size, bool cache) { | 26 | void UpdatePagesCachedCount(VAddr addr, u64 size, int delta) { |
| 27 | const u64 page_start{addr >> Core::Memory::YUZU_PAGEBITS}; | 27 | const u64 page_start{addr >> Core::Memory::YUZU_PAGEBITS}; |
| 28 | const u64 page_end{(addr + size + Core::Memory::YUZU_PAGESIZE - 1) >> | 28 | const u64 page_end{(addr + size + Core::Memory::YUZU_PAGESIZE - 1) >> |
| 29 | Core::Memory::YUZU_PAGEBITS}; | 29 | Core::Memory::YUZU_PAGEBITS}; |
| 30 | for (u64 page = page_start; page < page_end; ++page) { | 30 | for (u64 page = page_start; page < page_end; ++page) { |
| 31 | int& value = page_table[page]; | 31 | int& value = page_table[page]; |
| 32 | value += (cache ? 1 : -1); | 32 | value += delta; |
| 33 | if (value < 0) { | 33 | if (value < 0) { |
| 34 | throw std::logic_error{"negative page"}; | 34 | throw std::logic_error{"negative page"}; |
| 35 | } | 35 | } |
| @@ -546,4 +546,4 @@ TEST_CASE("MemoryTracker: Cached write downloads") { | |||
| 546 | REQUIRE(!memory_track->IsRegionGpuModified(c + PAGE, PAGE)); | 546 | REQUIRE(!memory_track->IsRegionGpuModified(c + PAGE, PAGE)); |
| 547 | memory_track->MarkRegionAsCpuModified(c, WORD); | 547 | memory_track->MarkRegionAsCpuModified(c, WORD); |
| 548 | REQUIRE(rasterizer.Count() == 0); | 548 | REQUIRE(rasterizer.Count() == 0); |
| 549 | } | 549 | } \ No newline at end of file |