mirrors/monado
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/monado/monado.git synced 2025-01-03 21:56:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ipc: Clarify that wait_image timeout is nanoseconds

Browse source
This commit is contained in:
Ryan Pavlik 2022-05-17 13:18:06 -05:00 committed by Jakob Bornecrantz
parent e54d336844
commit ea35e79ec7
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/xrt/ipc/client/ipc_client_compositor.c
View file

@ -183,12 +183,12 @@ ipc_compositor_swapchain_destroy(struct xrt_swapchain *xsc)
} }
static xrt_result_t static xrt_result_t
ipc_compositor_swapchain_wait_image(struct xrt_swapchain *xsc, uint64_t timeout, uint32_t index) ipc_compositor_swapchain_wait_image(struct xrt_swapchain *xsc, uint64_t timeout_ns, uint32_t index)
{ {
struct ipc_client_swapchain *ics = ipc_client_swapchain(xsc); struct ipc_client_swapchain *ics = ipc_client_swapchain(xsc);
struct ipc_client_compositor *icc = ics->icc; struct ipc_client_compositor *icc = ics->icc;
IPC_CALL_CHK(ipc_call_swapchain_wait_image(icc->ipc_c, ics->id, timeout, index)); IPC_CALL_CHK(ipc_call_swapchain_wait_image(icc->ipc_c, ics->id, timeout_ns, index));
return res; return res;
} }

4
src/xrt/ipc/server/ipc_server_handler.c
View file

@ -855,7 +855,7 @@ ipc_handle_swapchain_import(volatile struct ipc_client_state *ics,
} }
xrt_result_t xrt_result_t
ipc_handle_swapchain_wait_image(volatile struct ipc_client_state *ics, uint32_t id, uint64_t timeout, uint32_t index) ipc_handle_swapchain_wait_image(volatile struct ipc_client_state *ics, uint32_t id, uint64_t timeout_ns, uint32_t index)
{ {
if (ics->xc == NULL) { if (ics->xc == NULL) {
return XRT_ERROR_IPC_SESSION_NOT_CREATED; return XRT_ERROR_IPC_SESSION_NOT_CREATED;
@ -865,7 +865,7 @@ ipc_handle_swapchain_wait_image(volatile struct ipc_client_state *ics, uint32_t
uint32_t sc_index = id; uint32_t sc_index = id;
struct xrt_swapchain *xsc = ics->xscs[sc_index]; struct xrt_swapchain *xsc = ics->xscs[sc_index];
xrt_swapchain_wait_image(xsc, timeout, index); xrt_swapchain_wait_image(xsc, timeout_ns, index);
return XRT_SUCCESS; return XRT_SUCCESS;
} }

2
src/xrt/ipc/shared/proto.json
View file

@ -166,7 +166,7 @@
"swapchain_wait_image": { "swapchain_wait_image": {
"in": [ "in": [
{"name": "id", "type": "uint32_t"}, {"name": "id", "type": "uint32_t"},
{"name": "timeout", "type": "uint64_t"}, {"name": "timeout_ns", "type": "uint64_t"},
{"name": "index", "type": "uint32_t"} {"name": "index", "type": "uint32_t"}
] ]
}, },