summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Morph2023-03-07 19:24:13 -0500
committerGravatar Morph2023-03-07 21:17:47 -0500
commit1073346c7f5541056b7ea88a701ad2e8e91a89b2 (patch)
tree7163c903818bc34d2b6fe672db5168357ba383c3
parentcore: Promote CPU/GPU threads to time critical (diff)
downloadyuzu-1073346c7f5541056b7ea88a701ad2e8e91a89b2.tar.gz
yuzu-1073346c7f5541056b7ea88a701ad2e8e91a89b2.tar.xz
yuzu-1073346c7f5541056b7ea88a701ad2e8e91a89b2.zip
hid: Use nanosecond timestamps instead of ticks
-rw-r--r--src/core/hle/service/hid/controllers/stubbed.cpp2
-rw-r--r--src/core/hle/service/hid/controllers/touchscreen.cpp8
2 files changed, 5 insertions, 5 deletions
diff --git a/src/core/hle/service/hid/controllers/stubbed.cpp b/src/core/hle/service/hid/controllers/stubbed.cpp
index df9ee0c3f..9e2f3ab21 100644
--- a/src/core/hle/service/hid/controllers/stubbed.cpp
+++ b/src/core/hle/service/hid/controllers/stubbed.cpp
@@ -26,7 +26,7 @@ void Controller_Stubbed::OnUpdate(const Core::Timing::CoreTiming& core_timing) {
26 } 26 }
27 27
28 CommonHeader header{}; 28 CommonHeader header{};
29 header.timestamp = core_timing.GetCPUTicks(); 29 header.timestamp = core_timing.GetGlobalTimeNs().count();
30 header.total_entry_count = 17; 30 header.total_entry_count = 17;
31 header.entry_count = 0; 31 header.entry_count = 0;
32 header.last_entry_index = 0; 32 header.last_entry_index = 0;
diff --git a/src/core/hle/service/hid/controllers/touchscreen.cpp b/src/core/hle/service/hid/controllers/touchscreen.cpp
index d90a4e732..3ef91df4b 100644
--- a/src/core/hle/service/hid/controllers/touchscreen.cpp
+++ b/src/core/hle/service/hid/controllers/touchscreen.cpp
@@ -32,7 +32,7 @@ void Controller_Touchscreen::OnInit() {}
32void Controller_Touchscreen::OnRelease() {} 32void Controller_Touchscreen::OnRelease() {}
33 33
34void Controller_Touchscreen::OnUpdate(const Core::Timing::CoreTiming& core_timing) { 34void Controller_Touchscreen::OnUpdate(const Core::Timing::CoreTiming& core_timing) {
35 shared_memory->touch_screen_lifo.timestamp = core_timing.GetCPUTicks(); 35 shared_memory->touch_screen_lifo.timestamp = core_timing.GetGlobalTimeNs().count();
36 36
37 if (!IsControllerActivated()) { 37 if (!IsControllerActivated()) {
38 shared_memory->touch_screen_lifo.buffer_count = 0; 38 shared_memory->touch_screen_lifo.buffer_count = 0;
@@ -85,7 +85,7 @@ void Controller_Touchscreen::OnUpdate(const Core::Timing::CoreTiming& core_timin
85 const auto active_fingers_count = 85 const auto active_fingers_count =
86 static_cast<std::size_t>(std::distance(active_fingers.begin(), end_iter)); 86 static_cast<std::size_t>(std::distance(active_fingers.begin(), end_iter));
87 87
88 const u64 tick = core_timing.GetCPUTicks(); 88 const u64 timestamp = static_cast<u64>(core_timing.GetGlobalTimeNs().count());
89 const auto& last_entry = shared_memory->touch_screen_lifo.ReadCurrentEntry().state; 89 const auto& last_entry = shared_memory->touch_screen_lifo.ReadCurrentEntry().state;
90 90
91 next_state.sampling_number = last_entry.sampling_number + 1; 91 next_state.sampling_number = last_entry.sampling_number + 1;
@@ -102,8 +102,8 @@ void Controller_Touchscreen::OnUpdate(const Core::Timing::CoreTiming& core_timin
102 touch_entry.diameter_x = Settings::values.touchscreen.diameter_x; 102 touch_entry.diameter_x = Settings::values.touchscreen.diameter_x;
103 touch_entry.diameter_y = Settings::values.touchscreen.diameter_y; 103 touch_entry.diameter_y = Settings::values.touchscreen.diameter_y;
104 touch_entry.rotation_angle = Settings::values.touchscreen.rotation_angle; 104 touch_entry.rotation_angle = Settings::values.touchscreen.rotation_angle;
105 touch_entry.delta_time = tick - active_fingers[id].last_touch; 105 touch_entry.delta_time = timestamp - active_fingers[id].last_touch;
106 fingers[active_fingers[id].id].last_touch = tick; 106 fingers[active_fingers[id].id].last_touch = timestamp;
107 touch_entry.finger = active_fingers[id].id; 107 touch_entry.finger = active_fingers[id].id;
108 touch_entry.attribute.raw = active_fingers[id].attribute.raw; 108 touch_entry.attribute.raw = active_fingers[id].attribute.raw;
109 } else { 109 } else {