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

ipc: Return XRT_ERROR_IPC_SESSION_NOT_CREATED if so is the case

Browse source
This commit is contained in:
Jakob Bornecrantz 2021-04-16 15:21:10 +01:00 committed by Jakob Bornecrantz
parent 5627849135
commit 741dcbdf40
1 changed files with 52 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -125,6 +125,10 @@ ipc_handle_session_begin(volatile struct ipc_client_state *ics)
{ {
IPC_TRACE_MARKER(); IPC_TRACE_MARKER();
if (ics->xc == NULL) {
return XRT_ERROR_IPC_SESSION_NOT_CREATED;
}
return xrt_comp_begin_session(ics->xc, 0); return xrt_comp_begin_session(ics->xc, 0);
} }
@ -133,6 +137,10 @@ ipc_handle_session_end(volatile struct ipc_client_state *ics)
{ {
IPC_TRACE_MARKER(); IPC_TRACE_MARKER();
if (ics->xc == NULL) {
return XRT_ERROR_IPC_SESSION_NOT_CREATED;
}
return xrt_comp_end_session(ics->xc); return xrt_comp_end_session(ics->xc);
} }
@ -141,6 +149,10 @@ ipc_handle_compositor_get_info(volatile struct ipc_client_state *ics, struct xrt
{ {
IPC_TRACE_MARKER(); IPC_TRACE_MARKER();
if (ics->xc == NULL) {
return XRT_ERROR_IPC_SESSION_NOT_CREATED;
}
*out_info = ics->xc->info; *out_info = ics->xc->info;
return XRT_SUCCESS; return XRT_SUCCESS;
@ -155,6 +167,10 @@ ipc_handle_compositor_predict_frame(volatile struct ipc_client_state *ics,
{ {
IPC_TRACE_MARKER(); IPC_TRACE_MARKER();
if (ics->xc == NULL) {
return XRT_ERROR_IPC_SESSION_NOT_CREATED;
}
/* /*
* We use this to signal that the session has started, this is needed * We use this to signal that the session has started, this is needed
* to make this client/session active/visible/focused. * to make this client/session active/visible/focused.
@ -176,6 +192,10 @@ ipc_handle_compositor_wait_woke(volatile struct ipc_client_state *ics, int64_t f
{ {
IPC_TRACE_MARKER(); IPC_TRACE_MARKER();
if (ics->xc == NULL) {
return XRT_ERROR_IPC_SESSION_NOT_CREATED;
}
return xrt_comp_mark_frame(ics->xc, frame_id, XRT_COMPOSITOR_FRAME_POINT_WOKE, os_monotonic_get_ns()); return xrt_comp_mark_frame(ics->xc, frame_id, XRT_COMPOSITOR_FRAME_POINT_WOKE, os_monotonic_get_ns());
} }
@ -184,6 +204,10 @@ ipc_handle_compositor_begin_frame(volatile struct ipc_client_state *ics, int64_t
{ {
IPC_TRACE_MARKER(); IPC_TRACE_MARKER();
if (ics->xc == NULL) {
return XRT_ERROR_IPC_SESSION_NOT_CREATED;
}
return xrt_comp_begin_frame(ics->xc, frame_id); return xrt_comp_begin_frame(ics->xc, frame_id);
} }
@ -192,6 +216,10 @@ ipc_handle_compositor_discard_frame(volatile struct ipc_client_state *ics, int64
{ {
IPC_TRACE_MARKER(); IPC_TRACE_MARKER();
if (ics->xc == NULL) {
return XRT_ERROR_IPC_SESSION_NOT_CREATED;
}
return xrt_comp_discard_frame(ics->xc, frame_id); return xrt_comp_discard_frame(ics->xc, frame_id);
} }
@ -463,6 +491,10 @@ ipc_handle_compositor_layer_sync(volatile struct ipc_client_state *ics,
{ {
IPC_TRACE_MARKER(); IPC_TRACE_MARKER();
if (ics->xc == NULL) {
return XRT_ERROR_IPC_SESSION_NOT_CREATED;
}
struct ipc_shared_memory *ism = ics->server->ism; struct ipc_shared_memory *ism = ics->server->ism;
struct ipc_layer_slot *slot = &ism->slots[slot_id]; struct ipc_layer_slot *slot = &ism->slots[slot_id];
xrt_graphics_sync_handle_t sync_handle = XRT_GRAPHICS_SYNC_HANDLE_INVALID; xrt_graphics_sync_handle_t sync_handle = XRT_GRAPHICS_SYNC_HANDLE_INVALID;
@ -513,6 +545,10 @@ ipc_handle_compositor_poll_events(volatile struct ipc_client_state *ics, union x
{ {
IPC_TRACE_MARKER(); IPC_TRACE_MARKER();
if (ics->xc == NULL) {
return XRT_ERROR_IPC_SESSION_NOT_CREATED;
}
return xrt_comp_poll_events(ics->xc, out_xce); return xrt_comp_poll_events(ics->xc, out_xce);
} }
@ -719,6 +755,10 @@ 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, uint32_t index)
{ {
if (ics->xc == NULL) {
return XRT_ERROR_IPC_SESSION_NOT_CREATED;
}
//! @todo Look up the index. //! @todo Look up the index.
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];
@ -731,6 +771,10 @@ ipc_handle_swapchain_wait_image(volatile struct ipc_client_state *ics, uint32_t
xrt_result_t xrt_result_t
ipc_handle_swapchain_acquire_image(volatile struct ipc_client_state *ics, uint32_t id, uint32_t *out_index) ipc_handle_swapchain_acquire_image(volatile struct ipc_client_state *ics, uint32_t id, uint32_t *out_index)
{ {
if (ics->xc == NULL) {
return XRT_ERROR_IPC_SESSION_NOT_CREATED;
}
//! @todo Look up the index. //! @todo Look up the index.
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];
@ -743,6 +787,10 @@ ipc_handle_swapchain_acquire_image(volatile struct ipc_client_state *ics, uint32
xrt_result_t xrt_result_t
ipc_handle_swapchain_release_image(volatile struct ipc_client_state *ics, uint32_t id, uint32_t index) ipc_handle_swapchain_release_image(volatile struct ipc_client_state *ics, uint32_t id, uint32_t index)
{ {
if (ics->xc == NULL) {
return XRT_ERROR_IPC_SESSION_NOT_CREATED;
}
//! @todo Look up the index. //! @todo Look up the index.
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];
@ -755,6 +803,10 @@ ipc_handle_swapchain_release_image(volatile struct ipc_client_state *ics, uint32
xrt_result_t xrt_result_t
ipc_handle_swapchain_destroy(volatile struct ipc_client_state *ics, uint32_t id) ipc_handle_swapchain_destroy(volatile struct ipc_client_state *ics, uint32_t id)
{ {
if (ics->xc == NULL) {
return XRT_ERROR_IPC_SESSION_NOT_CREATED;
}
ics->num_swapchains--; ics->num_swapchains--;
// Drop our reference, does NULL checking. Cast away volatile. // Drop our reference, does NULL checking. Cast away volatile.