diff options
| author | Narr the Reg <[email protected]> | 2024-02-22 11:34:23 -0600 |
|---|---|---|
| committer | GitHub <[email protected]> | 2024-02-22 11:34:23 -0600 |
| commit | 2b3f1d3fc53c1b7a729c3f1cebbddebcd9427952 (patch) | |
| tree | 212f3f415073e1fda5c8859e6dbb5ef2d0887128 | |
| parent | 984396a21ae8e82378b41f61f4f6a9745cde250a (diff) | |
| parent | 461eaca7e83e45a311a1d92a2de6d6a54b2405ab (diff) | |
| download | yuzu-android-2b3f1d3fc53c1b7a729c3f1cebbddebcd9427952.tar.gz yuzu-android-2b3f1d3fc53c1b7a729c3f1cebbddebcd9427952.zip | |
Merge pull request #13000 from liamwhite/skip-null-memory
device_memory_manager: skip unregistered interfaces on invalidate
| -rw-r--r-- | src/core/device_memory_manager.inc | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/core/device_memory_manager.inc b/src/core/device_memory_manager.inc index 37c1e69c3..f104d495b 100644 --- a/src/core/device_memory_manager.inc +++ b/src/core/device_memory_manager.inc @@ -522,13 +522,17 @@ void DeviceMemoryManager<Traits>::UpdatePagesCachedCount(DAddr addr, size_t size auto* memory_device_inter = registered_processes[asid.id]; const auto release_pending = [&] { if (uncache_bytes > 0) { - MarkRegionCaching(memory_device_inter, uncache_begin << Memory::YUZU_PAGEBITS, - uncache_bytes, false); + if (memory_device_inter != nullptr) { + MarkRegionCaching(memory_device_inter, uncache_begin << Memory::YUZU_PAGEBITS, + uncache_bytes, false); + } uncache_bytes = 0; } if (cache_bytes > 0) { - MarkRegionCaching(memory_device_inter, cache_begin << Memory::YUZU_PAGEBITS, - cache_bytes, true); + if (memory_device_inter != nullptr) { + MarkRegionCaching(memory_device_inter, cache_begin << Memory::YUZU_PAGEBITS, + cache_bytes, true); + } cache_bytes = 0; } }; |