diff options
| author | 2019-11-28 11:43:17 -0500 | |
|---|---|---|
| committer | 2019-11-28 11:43:17 -0500 | |
| commit | e3ee017e91ef4d713f1af8cb60c5157e40d43f18 (patch) | |
| tree | e0a5b47cac1d548599b8ceba7f71b40746fe6b48 /src/video_core/rasterizer_accelerated.cpp | |
| parent | Merge pull request #3171 from lioncash/internal-link (diff) | |
| parent | core/memory; Migrate over SetCurrentPageTable() to the Memory class (diff) | |
| download | yuzu-e3ee017e91ef4d713f1af8cb60c5157e40d43f18.tar.gz yuzu-e3ee017e91ef4d713f1af8cb60c5157e40d43f18.tar.xz yuzu-e3ee017e91ef4d713f1af8cb60c5157e40d43f18.zip | |
Merge pull request #3169 from lioncash/memory
core/memory: Deglobalize memory management code
Diffstat (limited to 'src/video_core/rasterizer_accelerated.cpp')
| -rw-r--r-- | src/video_core/rasterizer_accelerated.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/video_core/rasterizer_accelerated.cpp b/src/video_core/rasterizer_accelerated.cpp index b230dcc18..fc6ecb899 100644 --- a/src/video_core/rasterizer_accelerated.cpp +++ b/src/video_core/rasterizer_accelerated.cpp | |||
| @@ -22,7 +22,8 @@ constexpr auto RangeFromInterval(Map& map, const Interval& interval) { | |||
| 22 | 22 | ||
| 23 | } // Anonymous namespace | 23 | } // Anonymous namespace |
| 24 | 24 | ||
| 25 | RasterizerAccelerated::RasterizerAccelerated() = default; | 25 | RasterizerAccelerated::RasterizerAccelerated(Memory::Memory& cpu_memory_) |
| 26 | : cpu_memory{cpu_memory_} {} | ||
| 26 | 27 | ||
| 27 | RasterizerAccelerated::~RasterizerAccelerated() = default; | 28 | RasterizerAccelerated::~RasterizerAccelerated() = default; |
| 28 | 29 | ||
| @@ -47,9 +48,9 @@ void RasterizerAccelerated::UpdatePagesCachedCount(VAddr addr, u64 size, int del | |||
| 47 | const u64 interval_size = interval_end_addr - interval_start_addr; | 48 | const u64 interval_size = interval_end_addr - interval_start_addr; |
| 48 | 49 | ||
| 49 | if (delta > 0 && count == delta) { | 50 | if (delta > 0 && count == delta) { |
| 50 | Memory::RasterizerMarkRegionCached(interval_start_addr, interval_size, true); | 51 | cpu_memory.RasterizerMarkRegionCached(interval_start_addr, interval_size, true); |
| 51 | } else if (delta < 0 && count == -delta) { | 52 | } else if (delta < 0 && count == -delta) { |
| 52 | Memory::RasterizerMarkRegionCached(interval_start_addr, interval_size, false); | 53 | cpu_memory.RasterizerMarkRegionCached(interval_start_addr, interval_size, false); |
| 53 | } else { | 54 | } else { |
| 54 | ASSERT(count >= 0); | 55 | ASSERT(count >= 0); |
| 55 | } | 56 | } |