summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSubv <subv2112@gmail.com>2018-07-02 16:42:48 +0200
committerSubv <subv2112@gmail.com>2018-07-02 16:42:48 +0200
commite9d147349bd90b7b2ee6d0f9f5825de28c3a018e (patch)
treee9bcfdf0b43aef549e5bbd2058e7368a17735500
parentMerge pull request #595 from bunnei/raster-cache (diff)
downloadyuzu-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
-rw-r--r--src/video_core/memory_manager.cpp4
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 {};
}