Mirrors/yuzu-fork
1
0
Fork 0
mirror of https://github.com/yuzu-mirror/yuzu.git synced 2024-11-20 14:39:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2468 from lioncash/deduction

Browse source 
yuzu: Remove explicit types from locks where applicable
This commit is contained in:
Hexagon12 2019-05-19 15:05:56 +01:00 committed by GitHub
commit ac3775e6ae
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/video_core/gpu_thread.cpp
View file

@ -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; });
} }
} }

2
src/video_core/gpu_thread.h
View file

@ -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();
} }
} }

2
src/yuzu/applets/error.cpp
View file

@ -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();
} }