diff options
| author | Derek Foreman <derek.foreman@collabora.com> | 2022-10-25 14:54:58 -0500 |
|---|---|---|
| committer | Pekka Paalanen <pq@iki.fi> | 2022-10-27 08:13:30 +0000 |
| commit | 5079f0b2f925a19d514340c1943d3c6b5f33514b (patch) | |
| tree | 31b03f99e6f36a10e015654c782107123c95a94a /clients | |
| parent | 2ca2eac39a3b7ec850866bf155362a01e997a195 (diff) | |
| download | weston-5079f0b2f925a19d514340c1943d3c6b5f33514b.tar.gz | |
helpers: Add a u64 from 2 u32 helper
We do this enough that having a single implementation for it is probably
a win.
Signed-off-by: Derek Foreman <derek.foreman@collabora.com>
Diffstat (limited to 'clients')
| -rw-r--r-- | clients/presentation-shm.c | 2 | ||||
| -rw-r--r-- | clients/simple-dmabuf-egl.c | 2 | ||||
| -rw-r--r-- | clients/simple-dmabuf-v4l.c | 2 | ||||
| -rw-r--r-- | clients/window.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/clients/presentation-shm.c b/clients/presentation-shm.c index 828cb08d..2bb0aa1c 100644 --- a/clients/presentation-shm.c +++ b/clients/presentation-shm.c @@ -446,7 +446,7 @@ feedback_presented(void *data, struct feedback *feedback = data; struct window *window = feedback->window; struct feedback *prev_feedback = window->received_feedback; - uint64_t seq = ((uint64_t)seq_hi << 32) + seq_lo; + uint64_t seq = u64_from_u32s(seq_hi, seq_lo); const struct timespec *prevpresent; uint32_t commit, present; uint32_t f2c, c2p, f2p; diff --git a/clients/simple-dmabuf-egl.c b/clients/simple-dmabuf-egl.c index 16d47ba9..e63c320c 100644 --- a/clients/simple-dmabuf-egl.c +++ b/clients/simple-dmabuf-egl.c @@ -1010,7 +1010,7 @@ dmabuf_modifiers(void *data, struct zwp_linux_dmabuf_v1 *zwp_linux_dmabuf, uint32_t format, uint32_t modifier_hi, uint32_t modifier_lo) { struct display *d = data; - uint64_t modifier = ((uint64_t)modifier_hi << 32) | modifier_lo; + uint64_t modifier = u64_from_u32s(modifier_hi, modifier_lo); if (format != d->format) { return; diff --git a/clients/simple-dmabuf-v4l.c b/clients/simple-dmabuf-v4l.c index a19570f9..50144986 100644 --- a/clients/simple-dmabuf-v4l.c +++ b/clients/simple-dmabuf-v4l.c @@ -730,7 +730,7 @@ dmabuf_modifier(void *data, struct zwp_linux_dmabuf_v1 *zwp_linux_dmabuf, uint32_t format, uint32_t modifier_hi, uint32_t modifier_lo) { struct display *d = data; - uint64_t modifier = ((uint64_t) modifier_hi << 32 ) | modifier_lo; + uint64_t modifier = u64_from_u32s(modifier_hi, modifier_lo); if (format == d->drm_format && modifier == DRM_FORMAT_MOD_LINEAR) d->requested_format_found = true; diff --git a/clients/window.c b/clients/window.c index 3036bb42..0d9d6cec 100644 --- a/clients/window.c +++ b/clients/window.c @@ -4704,7 +4704,7 @@ relative_pointer_handle_motion(void *data, struct zwp_relative_pointer_v1 *point { struct input *input = data; struct window *window = input->pointer_focus; - uint32_t ms = (((uint64_t) utime_hi) << 32 | utime_lo) / 1000; + uint32_t ms = u64_from_u32s(utime_hi, utime_lo) / 1000; if (window->locked_pointer_motion_handler && window->pointer_locked) { |