Browse Source
Merge pull request #2468 from lioncash/deduction
yuzu: Remove explicit types from locks where applicable
pull/15/merge
Hexagon12
7 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with
3 additions and
3 deletions
-
src/video_core/gpu_thread.cpp
-
src/video_core/gpu_thread.h
-
src/yuzu/applets/error.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; }); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
@ -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(); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
@ -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(); |
|
|
|
} |