From 3c7619ce8454cb6b4144f78609f948b3069151a0 Mon Sep 17 00:00:00 2001 From: bunnei Date: Sat, 30 Jun 2018 02:32:33 -0400 Subject: [PATCH] memory_manager: Allow GpuToCpuAddress to return a zero address. - Rationale: It's up to the caller to handle this or assert. --- src/video_core/memory_manager.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/video_core/memory_manager.cpp b/src/video_core/memory_manager.cpp index 5cefce9fce..cd35646c27 100644 --- a/src/video_core/memory_manager.cpp +++ b/src/video_core/memory_manager.cpp @@ -100,9 +100,10 @@ boost::optional MemoryManager::FindFreeBlock(u64 size, u64 align) { boost::optional MemoryManager::GpuToCpuAddress(GPUVAddr gpu_addr) { VAddr base_addr = PageSlot(gpu_addr); - ASSERT(base_addr != static_cast(PageStatus::Unmapped)); - if (base_addr == static_cast(PageStatus::Allocated)) { + switch (static_cast(base_addr)) { + case PageStatus::Unmapped: + case PageStatus::Allocated: return {}; }