diff options
| author | bunnei <bunneidev@gmail.com> | 2018-10-08 01:20:18 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-08 01:20:18 -0400 |
| commit | 3f1f82a8c49b18f3a890044e70b9cc726a231fdb (patch) | |
| tree | 33345311fb17d55776fdf8c5a7e55f15a35164f6 | |
| parent | ae982a9bdf75970de1e612d824df3f9cf7f5026b (diff) | |
| parent | c5c184246d197c0177f2d60b14a307f7247bce4a (diff) | |
Merge pull request #1457 from ogniK5377/unmap-buffer
Unmapping an unmapped buffer should succeed
| -rw-r--r-- | src/core/hle/service/nvdrv/devices/nvhost_as_gpu.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/core/hle/service/nvdrv/devices/nvhost_as_gpu.cpp b/src/core/hle/service/nvdrv/devices/nvhost_as_gpu.cpp index d8b8037a8e..7555bbe7d6 100644 --- a/src/core/hle/service/nvdrv/devices/nvhost_as_gpu.cpp +++ b/src/core/hle/service/nvdrv/devices/nvhost_as_gpu.cpp @@ -157,7 +157,12 @@ u32 nvhost_as_gpu::UnmapBuffer(const std::vector<u8>& input, std::vector<u8>& ou LOG_DEBUG(Service_NVDRV, "called, offset=0x{:X}", params.offset); const auto itr = buffer_mappings.find(params.offset); - ASSERT_MSG(itr != buffer_mappings.end(), "Tried to unmap invalid mapping"); + if (itr == buffer_mappings.end()) { + LOG_WARNING(Service_NVDRV, "Tried to unmap an invalid offset 0x{:X}", params.offset); + // Hardware tests shows that unmapping an already unmapped buffer always returns successful + // and doesn't fail. + return 0; + } auto& system_instance = Core::System::GetInstance(); |