From e1bc26e67a0345ecec0699595b4069cce6f10cb7 Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Tue, 14 Mar 2017 21:43:10 -0700 Subject: [PATCH] Remove remaining input_state mutexing. --- Windows/InputDevice.cpp | 1 - ios/ViewController.mm | 6 +----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/Windows/InputDevice.cpp b/Windows/InputDevice.cpp index b82656c36e..e334ddf992 100644 --- a/Windows/InputDevice.cpp +++ b/Windows/InputDevice.cpp @@ -43,7 +43,6 @@ inline static void ExecuteInputPoll() { // Hm, we may hold the input_state lock for quite a while (time it takes to poll all devices)... // If that becomes an issue, maybe should poll to a copy of inputstate and only hold the lock while // copying that one to the real one? - std::lock_guard guard(input_state.lock); if (host && (focused || !g_Config.bGamepadOnlyFocused)) { host->PollControllers(input_state); } diff --git a/ios/ViewController.mm b/ios/ViewController.mm index 731a0eb639..918a678f91 100644 --- a/ios/ViewController.mm +++ b/ios/ViewController.mm @@ -253,11 +253,7 @@ static GraphicsContext *graphicsContext; - (void)glkView:(GLKView *)view drawInRect:(CGRect)rect { - { - std::lock_guard guard(input_state.lock); - NativeUpdate(input_state); - } - + NativeUpdate(input_state); NativeRender(graphicsContext); time_update(); }