diff options
| author | bunnei <bunneidev@gmail.com> | 2019-02-06 20:19:20 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-06 20:19:20 -0500 |
| commit | 10ab714fe015b28215ce61e6b4f9085c954a409d (patch) | |
| tree | 3c9d5c9ad759749d53773c6416be38d476d483bf /src/video_core/memory_manager.cpp | |
| parent | 40ac0585574499bc0dee47c4bef354c8e5676695 (diff) | |
| parent | 2bdbb90af74683bd8bb7e25d5353c39fb8037f8c (diff) | |
Merge pull request #2042 from ReinUsesLisp/nouveau-tex
maxwell_3d: Allow texture handles with TIC id zero
Diffstat (limited to 'src/video_core/memory_manager.cpp')
| -rw-r--r-- | src/video_core/memory_manager.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/video_core/memory_manager.cpp b/src/video_core/memory_manager.cpp index 47247f097..54abe5298 100644 --- a/src/video_core/memory_manager.cpp +++ b/src/video_core/memory_manager.cpp @@ -154,7 +154,8 @@ std::optional<VAddr> MemoryManager::GpuToCpuAddress(GPUVAddr gpu_addr) { const VAddr base_addr{PageSlot(gpu_addr)}; if (base_addr == static_cast<u64>(PageStatus::Allocated) || - base_addr == static_cast<u64>(PageStatus::Unmapped)) { + base_addr == static_cast<u64>(PageStatus::Unmapped) || + base_addr == static_cast<u64>(PageStatus::Reserved)) { return {}; } |