diff options
| author | Subv <subv2112@gmail.com> | 2018-07-02 16:42:48 +0200 |
|---|---|---|
| committer | Subv <subv2112@gmail.com> | 2018-07-02 16:42:48 +0200 |
| commit | e9d147349bd90b7b2ee6d0f9f5825de28c3a018e (patch) | |
| tree | e9bcfdf0b43aef549e5bbd2058e7368a17735500 /src/video_core/memory_manager.cpp | |
| parent | Merge pull request #595 from bunnei/raster-cache (diff) | |
| download | yuzu-e9d147349bd90b7b2ee6d0f9f5825de28c3a018e.tar yuzu-e9d147349bd90b7b2ee6d0f9f5825de28c3a018e.tar.gz yuzu-e9d147349bd90b7b2ee6d0f9f5825de28c3a018e.tar.bz2 yuzu-e9d147349bd90b7b2ee6d0f9f5825de28c3a018e.tar.lz yuzu-e9d147349bd90b7b2ee6d0f9f5825de28c3a018e.tar.xz yuzu-e9d147349bd90b7b2ee6d0f9f5825de28c3a018e.tar.zst yuzu-e9d147349bd90b7b2ee6d0f9f5825de28c3a018e.zip | |
Diffstat (limited to 'src/video_core/memory_manager.cpp')
| -rw-r--r-- | src/video_core/memory_manager.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/video_core/memory_manager.cpp b/src/video_core/memory_manager.cpp index 5cefce9fc..2f814a184 100644 --- a/src/video_core/memory_manager.cpp +++ b/src/video_core/memory_manager.cpp @@ -100,9 +100,9 @@ boost::optional<GPUVAddr> MemoryManager::FindFreeBlock(u64 size, u64 align) { boost::optional<VAddr> MemoryManager::GpuToCpuAddress(GPUVAddr gpu_addr) { VAddr base_addr = PageSlot(gpu_addr); - ASSERT(base_addr != static_cast<u64>(PageStatus::Unmapped)); - if (base_addr == static_cast<u64>(PageStatus::Allocated)) { + if (base_addr == static_cast<u64>(PageStatus::Allocated) || + base_addr == static_cast<u64>(PageStatus::Unmapped)) { return {}; } |