diff options
| author | 2018-08-28 12:28:57 -0400 | |
|---|---|---|
| committer | 2018-08-28 12:28:57 -0400 | |
| commit | 4d7e1662c84ef65f7da5a27b0473125cc6759d5c (patch) | |
| tree | 63c9f3fc7a8a76af35e0b5890a4388a4250318a4 /src/core/memory.cpp | |
| parent | Merge pull request #1192 from lioncash/unused (diff) | |
| parent | gpu: Make memory_manager private (diff) | |
| download | yuzu-4d7e1662c84ef65f7da5a27b0473125cc6759d5c.tar.gz yuzu-4d7e1662c84ef65f7da5a27b0473125cc6759d5c.tar.xz yuzu-4d7e1662c84ef65f7da5a27b0473125cc6759d5c.zip | |
Merge pull request #1193 from lioncash/priv
gpu: Make memory_manager private
Diffstat (limited to 'src/core/memory.cpp')
| -rw-r--r-- | src/core/memory.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/memory.cpp b/src/core/memory.cpp index 1133bcbaf..bc34bfd6d 100644 --- a/src/core/memory.cpp +++ b/src/core/memory.cpp | |||
| @@ -264,7 +264,7 @@ void RasterizerMarkRegionCached(Tegra::GPUVAddr gpu_addr, u64 size, bool cached) | |||
| 264 | u64 num_pages = ((gpu_addr + size - 1) >> PAGE_BITS) - (gpu_addr >> PAGE_BITS) + 1; | 264 | u64 num_pages = ((gpu_addr + size - 1) >> PAGE_BITS) - (gpu_addr >> PAGE_BITS) + 1; |
| 265 | for (unsigned i = 0; i < num_pages; ++i, gpu_addr += PAGE_SIZE) { | 265 | for (unsigned i = 0; i < num_pages; ++i, gpu_addr += PAGE_SIZE) { |
| 266 | boost::optional<VAddr> maybe_vaddr = | 266 | boost::optional<VAddr> maybe_vaddr = |
| 267 | Core::System::GetInstance().GPU().memory_manager->GpuToCpuAddress(gpu_addr); | 267 | Core::System::GetInstance().GPU().MemoryManager().GpuToCpuAddress(gpu_addr); |
| 268 | // The GPU <-> CPU virtual memory mapping is not 1:1 | 268 | // The GPU <-> CPU virtual memory mapping is not 1:1 |
| 269 | if (!maybe_vaddr) { | 269 | if (!maybe_vaddr) { |
| 270 | LOG_ERROR(HW_Memory, | 270 | LOG_ERROR(HW_Memory, |
| @@ -346,7 +346,7 @@ void RasterizerFlushVirtualRegion(VAddr start, u64 size, FlushMode mode) { | |||
| 346 | const VAddr overlap_end = std::min(end, region_end); | 346 | const VAddr overlap_end = std::min(end, region_end); |
| 347 | 347 | ||
| 348 | const std::vector<Tegra::GPUVAddr> gpu_addresses = | 348 | const std::vector<Tegra::GPUVAddr> gpu_addresses = |
| 349 | system_instance.GPU().memory_manager->CpuToGpuAddress(overlap_start); | 349 | system_instance.GPU().MemoryManager().CpuToGpuAddress(overlap_start); |
| 350 | 350 | ||
| 351 | if (gpu_addresses.empty()) { | 351 | if (gpu_addresses.empty()) { |
| 352 | return; | 352 | return; |