Skip to content
Snippets Groups Projects
Unverified Commit ac3775e6 authored by Hexagon12's avatar Hexagon12 Committed by GitHub
Browse files

Merge pull request #2468 from lioncash/deduction

yuzu: Remove explicit types from locks where applicable
parents b54bd3f0 d6d809db
No related branches found
No related tags found
No related merge requests found
...@@ -118,7 +118,7 @@ void SynchState::WaitForSynchronization(u64 fence) { ...@@ -118,7 +118,7 @@ void SynchState::WaitForSynchronization(u64 fence) {
// Wait for the GPU to be idle (all commands to be executed) // Wait for the GPU to be idle (all commands to be executed)
{ {
MICROPROFILE_SCOPE(GPU_wait); 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; }); synchronization_condition.wait(lock, [this, fence] { return signaled_fence >= fence; });
} }
} }
......
...@@ -109,7 +109,7 @@ struct SynchState final { ...@@ -109,7 +109,7 @@ struct SynchState final {
void TrySynchronize() { void TrySynchronize() {
if (IsSynchronized()) { if (IsSynchronized()) {
std::lock_guard<std::mutex> lock{synchronization_mutex}; std::lock_guard lock{synchronization_mutex};
synchronization_condition.notify_one(); synchronization_condition.notify_one();
} }
} }
......
...@@ -54,6 +54,6 @@ void QtErrorDisplay::ShowCustomErrorText(ResultCode error, std::string dialog_te ...@@ -54,6 +54,6 @@ void QtErrorDisplay::ShowCustomErrorText(ResultCode error, std::string dialog_te
void QtErrorDisplay::MainWindowFinishedError() { void QtErrorDisplay::MainWindowFinishedError() {
// Acquire the HLE mutex // Acquire the HLE mutex
std::lock_guard<std::recursive_mutex> lock(HLE::g_hle_lock); std::lock_guard lock{HLE::g_hle_lock};
callback(); callback();
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment