summaryrefslogtreecommitdiffstats
path: root/src/common/host_memory.cpp
diff options
context:
space:
mode:
authorMerry <git@mary.rs>2022-04-07 20:30:55 +0200
committerMerry <git@mary.rs>2022-04-07 20:30:55 +0200
commitc589db6adde8e4706065b1ab00bd6814b39dc8bb (patch)
tree19430d5342df4de9b8fc196012e53b09fb8f5f41 /src/common/host_memory.cpp
parentMerge pull request #8161 from liamwhite/gl-s8d24 (diff)
downloadyuzu-c589db6adde8e4706065b1ab00bd6814b39dc8bb.tar
yuzu-c589db6adde8e4706065b1ab00bd6814b39dc8bb.tar.gz
yuzu-c589db6adde8e4706065b1ab00bd6814b39dc8bb.tar.bz2
yuzu-c589db6adde8e4706065b1ab00bd6814b39dc8bb.tar.lz
yuzu-c589db6adde8e4706065b1ab00bd6814b39dc8bb.tar.xz
yuzu-c589db6adde8e4706065b1ab00bd6814b39dc8bb.tar.zst
yuzu-c589db6adde8e4706065b1ab00bd6814b39dc8bb.zip
Diffstat (limited to '')
-rw-r--r--src/common/host_memory.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/common/host_memory.cpp b/src/common/host_memory.cpp
index e829af1ac..802943eb7 100644
--- a/src/common/host_memory.cpp
+++ b/src/common/host_memory.cpp
@@ -149,7 +149,7 @@ public:
}
void Unmap(size_t virtual_offset, size_t length) {
- std::lock_guard lock{placeholder_mutex};
+ std::scoped_lock lock{placeholder_mutex};
// Unmap until there are no more placeholders
while (UnmapOnePlaceholder(virtual_offset, length)) {
@@ -169,7 +169,7 @@ public:
}
const size_t virtual_end = virtual_offset + length;
- std::lock_guard lock{placeholder_mutex};
+ std::scoped_lock lock{placeholder_mutex};
auto [it, end] = placeholders.equal_range({virtual_offset, virtual_end});
while (it != end) {
const size_t offset = std::max(it->lower(), virtual_offset);