diff options
| author | bunnei <bunneidev@gmail.com> | 2018-08-28 12:28:57 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-28 12:28:57 -0400 |
| commit | 124c5b77adf3fc840e9c21948b2be68cf9eee0a6 (patch) | |
| tree | 63c9f3fc7a8a76af35e0b5890a4388a4250318a4 /src/core/memory.cpp | |
| parent | 6fd07fa8d30b908f543883c0e506a2f16cce348a (diff) | |
| parent | b4a81f9bca87a8537a15bea5cee003c9aae23999 (diff) | |
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 1133bcbaf0..bc34bfd6d3 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) u64 num_pages = ((gpu_addr + size - 1) >> PAGE_BITS) - (gpu_addr >> PAGE_BITS) + 1; for (unsigned i = 0; i < num_pages; ++i, gpu_addr += PAGE_SIZE) { boost::optional<VAddr> maybe_vaddr = - Core::System::GetInstance().GPU().memory_manager->GpuToCpuAddress(gpu_addr); + Core::System::GetInstance().GPU().MemoryManager().GpuToCpuAddress(gpu_addr); // The GPU <-> CPU virtual memory mapping is not 1:1 if (!maybe_vaddr) { LOG_ERROR(HW_Memory, @@ -346,7 +346,7 @@ void RasterizerFlushVirtualRegion(VAddr start, u64 size, FlushMode mode) { const VAddr overlap_end = std::min(end, region_end); const std::vector<Tegra::GPUVAddr> gpu_addresses = - system_instance.GPU().memory_manager->CpuToGpuAddress(overlap_start); + system_instance.GPU().MemoryManager().CpuToGpuAddress(overlap_start); if (gpu_addresses.empty()) { return; |