summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2018-10-08 07:20:18 +0200
committerGitHub <noreply@github.com>2018-10-08 07:20:18 +0200
commit3f1f82a8c49b18f3a890044e70b9cc726a231fdb (patch)
tree33345311fb17d55776fdf8c5a7e55f15a35164f6 /src/core
parentMerge pull request #1419 from DarkLordZach/homebrew-args (diff)
parentUnmapping an unmapped buffer should succeed (diff)
downloadyuzu-3f1f82a8c49b18f3a890044e70b9cc726a231fdb.tar
yuzu-3f1f82a8c49b18f3a890044e70b9cc726a231fdb.tar.gz
yuzu-3f1f82a8c49b18f3a890044e70b9cc726a231fdb.tar.bz2
yuzu-3f1f82a8c49b18f3a890044e70b9cc726a231fdb.tar.lz
yuzu-3f1f82a8c49b18f3a890044e70b9cc726a231fdb.tar.xz
yuzu-3f1f82a8c49b18f3a890044e70b9cc726a231fdb.tar.zst
yuzu-3f1f82a8c49b18f3a890044e70b9cc726a231fdb.zip
Diffstat (limited to 'src/core')
-rw-r--r--src/core/hle/service/nvdrv/devices/nvhost_as_gpu.cpp7
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 d8b8037a8..7555bbe7d 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();