mirror of
https://github.com/yuzu-emu/yuzu-android
synced 2024-12-24 10:31:20 -08:00
Merge pull request #2468 from lioncash/deduction
yuzu: Remove explicit types from locks where applicable
This commit is contained in:
commit
ac3775e6ae
@ -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 {
|
|||||||
|
|
||||||
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
|
|||||||
|
|
||||||
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();
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user