diff options
| author | 2022-06-10 13:13:46 -0500 | |
|---|---|---|
| committer | 2022-06-10 13:14:31 -0500 | |
| commit | bc8699a9fa653e0fa35d3f434979b99054ffe4b7 (patch) | |
| tree | e11e81fa798807b419f5b260721beec2269f3d14 /src | |
| parent | Merge pull request #8428 from bunnei/nvflinger-fix-timing (diff) | |
| download | yuzu-bc8699a9fa653e0fa35d3f434979b99054ffe4b7.tar.gz yuzu-bc8699a9fa653e0fa35d3f434979b99054ffe4b7.tar.xz yuzu-bc8699a9fa653e0fa35d3f434979b99054ffe4b7.zip | |
service: hid: Fix gesture regression
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/hle/service/hid/controllers/gesture.cpp | 4 | ||||
| -rw-r--r-- | src/core/hle/service/hid/controllers/gesture.h | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/core/hle/service/hid/controllers/gesture.cpp b/src/core/hle/service/hid/controllers/gesture.cpp index 3eae1ae35..32e0708ba 100644 --- a/src/core/hle/service/hid/controllers/gesture.cpp +++ b/src/core/hle/service/hid/controllers/gesture.cpp | |||
| @@ -61,6 +61,7 @@ void Controller_Gesture::OnUpdate(const Core::Timing::CoreTiming& core_timing) { | |||
| 61 | } | 61 | } |
| 62 | 62 | ||
| 63 | last_update_timestamp = shared_memory->gesture_lifo.timestamp; | 63 | last_update_timestamp = shared_memory->gesture_lifo.timestamp; |
| 64 | UpdateGestureSharedMemory(gesture, time_difference); | ||
| 64 | } | 65 | } |
| 65 | 66 | ||
| 66 | void Controller_Gesture::ReadTouchInput() { | 67 | void Controller_Gesture::ReadTouchInput() { |
| @@ -94,8 +95,7 @@ bool Controller_Gesture::ShouldUpdateGesture(const GestureProperties& gesture, | |||
| 94 | return false; | 95 | return false; |
| 95 | } | 96 | } |
| 96 | 97 | ||
| 97 | void Controller_Gesture::UpdateGestureSharedMemory(u8* data, std::size_t size, | 98 | void Controller_Gesture::UpdateGestureSharedMemory(GestureProperties& gesture, |
| 98 | GestureProperties& gesture, | ||
| 99 | f32 time_difference) { | 99 | f32 time_difference) { |
| 100 | GestureType type = GestureType::Idle; | 100 | GestureType type = GestureType::Idle; |
| 101 | GestureAttribute attributes{}; | 101 | GestureAttribute attributes{}; |
diff --git a/src/core/hle/service/hid/controllers/gesture.h b/src/core/hle/service/hid/controllers/gesture.h index c62a341bf..0d6099ea0 100644 --- a/src/core/hle/service/hid/controllers/gesture.h +++ b/src/core/hle/service/hid/controllers/gesture.h | |||
| @@ -107,8 +107,7 @@ private: | |||
| 107 | bool ShouldUpdateGesture(const GestureProperties& gesture, f32 time_difference); | 107 | bool ShouldUpdateGesture(const GestureProperties& gesture, f32 time_difference); |
| 108 | 108 | ||
| 109 | // Updates the shared memory to the next state | 109 | // Updates the shared memory to the next state |
| 110 | void UpdateGestureSharedMemory(u8* data, std::size_t size, GestureProperties& gesture, | 110 | void UpdateGestureSharedMemory(GestureProperties& gesture, f32 time_difference); |
| 111 | f32 time_difference); | ||
| 112 | 111 | ||
| 113 | // Initializes new gesture | 112 | // Initializes new gesture |
| 114 | void NewGesture(GestureProperties& gesture, GestureType& type, GestureAttribute& attributes); | 113 | void NewGesture(GestureProperties& gesture, GestureType& type, GestureAttribute& attributes); |