diff options
| author |  ReinUsesLisp | 2019-01-22 00:57:04 -0300 |
|---|---|---|
| committer | ReinUsesLisp | 2019-02-03 04:58:24 -0300 |
| commit | e01a9de35faddaea0cb99ed71b582d86a73cf3bd (patch) | |
| tree | e842570724515a30bde48e20ad82daa73342ae7d /src | |
| parent | Merge pull request #2074 from ReinUsesLisp/shader-ir-unify-offset (diff) | |
| download | yuzu-e01a9de35faddaea0cb99ed71b582d86a73cf3bd.tar.gz yuzu-e01a9de35faddaea0cb99ed71b582d86a73cf3bd.tar.xz yuzu-e01a9de35faddaea0cb99ed71b582d86a73cf3bd.zip | |
memory_manager: Check for reserved page status
Diffstat (limited to 'src')
| -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) { | |||
| 154 | const VAddr base_addr{PageSlot(gpu_addr)}; | 154 | const VAddr base_addr{PageSlot(gpu_addr)}; |
| 155 | 155 | ||
| 156 | if (base_addr == static_cast<u64>(PageStatus::Allocated) || | 156 | if (base_addr == static_cast<u64>(PageStatus::Allocated) || |
| 157 | base_addr == static_cast<u64>(PageStatus::Unmapped)) { | 157 | base_addr == static_cast<u64>(PageStatus::Unmapped) || |
| 158 | base_addr == static_cast<u64>(PageStatus::Reserved)) { | ||
| 158 | return {}; | 159 | return {}; |
| 159 | } | 160 | } |
| 160 | 161 | ||