Explorar o código

Merge pull request #2468 from lioncash/deduction

yuzu: Remove explicit types from locks where applicable
Hexagon12 %!s(int64=7) %!d(string=hai) anos
pai
achega
ac3775e6ae

+ 1 - 1
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)
     // 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; });
     }
     }
 }
 }

+ 1 - 1
src/video_core/gpu_thread.h

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

+ 1 - 1
src/yuzu/applets/error.cpp

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