bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

GHOST/Wayland: skip more involved timestamp conversion where possible

Browse Source 
When the result of getMilliSeconds & wayland time-stamps match,
bypass more involved logic which attempts to maintain a delta and
return the time-stamp with an offset (to account for 32bit rollover).
This commit is contained in:
Campbell Barton 2023-12-07 15:24:56 +11:00
parent 57a1e9207f
commit c0964dcd8d
1 changed files with 33 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
intern/ghost/intern/GHOST_SystemWayland.cc
View File

@ -1203,7 +1203,14 @@ struct GWL_RegistryEntry;
* see: #GHOST_SystemWayland::milliseconds_from_input_time.
*/
struct GWL_DisplayTimeStamp {
uint64_t last = 0;
/**
* When true, the GHOST & WAYLAND time-stamps are compatible,
* in most cases this means they will be equal however for systems with long up-times
* it may equal `uint32(GHOST_SystemWayland::getMilliSeconds())`,
* the `offsets` member is set to account for this case.
*/
bool exact_match = false;
uint32_t last = 0;
uint64_t offset = 0;
};
@ -8155,23 +8162,38 @@ uint64_t GHOST_SystemWayland::ms_from_input_time(const uint32_t timestamp_as_uin
* This is updated because time may have passed between generating the time-stamp and `now`.
* The method here is used by SDL. */
const uint64_t now = getMilliSeconds();
GWL_DisplayTimeStamp &input_timestamp = display_->input_timestamp;
uint64_t timestamp = uint64_t(timestamp_as_uint);
if (timestamp < input_timestamp.last) {
if (timestamp_as_uint < input_timestamp.last) {
/* 32-bit timer rollover, bump the offset. */
input_timestamp.offset += uint64_t(std::numeric_limits<uint32_t>::max()) + 1;
}
input_timestamp.last = timestamp;
input_timestamp.last = timestamp_as_uint;
if (!input_timestamp.offset) {
input_timestamp.offset = (now - timestamp);
uint64_t timestamp = uint64_t(timestamp_as_uint);
if (input_timestamp.exact_match) {
timestamp += input_timestamp.offset;
}
timestamp += input_timestamp.offset;
else {
const uint64_t now = getMilliSeconds();
const uint32_t now_as_uint32 = uint32_t(now);
if (now_as_uint32 == timestamp_as_uint) {
input_timestamp.exact_match = true;
/* For systems with up times exceeding 47 days
* it's possible we need to begin with an offset. */
input_timestamp.offset = now - uint64_t(now_as_uint32);
timestamp = now;
}
else {
if (!input_timestamp.offset) {
input_timestamp.offset = (now - timestamp);
}
timestamp += input_timestamp.offset;
if (timestamp > now) {
input_timestamp.offset -= (timestamp - now);
timestamp = now;
if (timestamp > now) {
input_timestamp.offset -= (timestamp - now);
timestamp = now;
}
}
}
return timestamp;