diff options
| author | bunnei <bunneidev@gmail.com> | 2018-07-02 11:48:18 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-02 11:48:18 -0400 |
| commit | 3d41fdfbba48f92e8d433085cc66cd4ef50b03ab (patch) | |
| tree | a7441d8c1c03d0e1ebe7a81b5e4a01f1de45251c /src/video_core/memory_manager.cpp | |
| parent | 066d6184d453fdcf6e9a4622646a514e0cbccc53 (diff) | |
| parent | 80c5e8ae99255fd2871e9500a5b26e5b5cb6b167 (diff) | |
Merge pull request #604 from Subv/invalid_textures
GPU: Ignore invalid and disabled textures when drawing.
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 {}; } |