summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2019-05-14 14:18:44 +0200
committerLioncash <mathew1800@gmail.com>2019-05-14 14:18:48 +0200
commitd6d809db87750a1e47d7a2a2d3f5e2d59d94f146 (patch)
tree1bd68b545096dd9c07d03e619343d5d23ec3a8fe
parentMerge pull request #2462 from lioncash/video-mm (diff)
downloadyuzu-d6d809db87750a1e47d7a2a2d3f5e2d59d94f146.tar
yuzu-d6d809db87750a1e47d7a2a2d3f5e2d59d94f146.tar.gz
yuzu-d6d809db87750a1e47d7a2a2d3f5e2d59d94f146.tar.bz2
yuzu-d6d809db87750a1e47d7a2a2d3f5e2d59d94f146.tar.lz
yuzu-d6d809db87750a1e47d7a2a2d3f5e2d59d94f146.tar.xz
yuzu-d6d809db87750a1e47d7a2a2d3f5e2d59d94f146.tar.zst
yuzu-d6d809db87750a1e47d7a2a2d3f5e2d59d94f146.zip
-rw-r--r--src/video_core/gpu_thread.cpp2
-rw-r--r--src/video_core/gpu_thread.h2
-rw-r--r--src/yuzu/applets/error.cpp2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/video_core/gpu_thread.cpp b/src/video_core/gpu_thread.cpp
index 03856013f..1e2ff46b0 100644
--- a/src/video_core/gpu_thread.cpp
+++ b/src/video_core/gpu_thread.cpp
@@ -118,7 +118,7 @@ void SynchState::WaitForSynchronization(u64 fence) {
// Wait for the GPU to be idle (all commands to be executed)
{
MICROPROFILE_SCOPE(GPU_wait);
- std::unique_lock<std::mutex> lock{synchronization_mutex};
+ std::unique_lock lock{synchronization_mutex};
synchronization_condition.wait(lock, [this, fence] { return signaled_fence >= fence; });
}
}
diff --git a/src/video_core/gpu_thread.h b/src/video_core/gpu_thread.h
index cc14527c7..cdf86f562 100644
--- a/src/video_core/gpu_thread.h
+++ b/src/video_core/gpu_thread.h
@@ -109,7 +109,7 @@ struct SynchState final {
void TrySynchronize() {
if (IsSynchronized()) {
- std::lock_guard<std::mutex> lock{synchronization_mutex};
+ std::lock_guard lock{synchronization_mutex};
synchronization_condition.notify_one();
}
}
diff --git a/src/yuzu/applets/error.cpp b/src/yuzu/applets/error.cpp
index 1fb2fe277..106dde9e2 100644
--- a/src/yuzu/applets/error.cpp
+++ b/src/yuzu/applets/error.cpp
@@ -54,6 +54,6 @@ void QtErrorDisplay::ShowCustomErrorText(ResultCode error, std::string dialog_te
void QtErrorDisplay::MainWindowFinishedError() {
// Acquire the HLE mutex
- std::lock_guard<std::recursive_mutex> lock(HLE::g_hle_lock);
+ std::lock_guard lock{HLE::g_hle_lock};
callback();
}