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

ipc: Add support for local_floor

Browse source
This commit is contained in:
Jakob Bornecrantz 2023-11-07 00:16:53 +00:00
parent f11c1fa699
commit 1b80d7182e
3 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/xrt/ipc/client/ipc_client_space_overseer.c
View file

@ -179,6 +179,7 @@ destroy(struct xrt_space_overseer *xso)
xrt_space_reference(&icspo->base.semantic.root, NULL); xrt_space_reference(&icspo->base.semantic.root, NULL);
xrt_space_reference(&icspo->base.semantic.view, NULL); xrt_space_reference(&icspo->base.semantic.view, NULL);
xrt_space_reference(&icspo->base.semantic.local, NULL); xrt_space_reference(&icspo->base.semantic.local, NULL);
xrt_space_reference(&icspo->base.semantic.local_floor, NULL);
xrt_space_reference(&icspo->base.semantic.stage, NULL); xrt_space_reference(&icspo->base.semantic.stage, NULL);
xrt_space_reference(&icspo->base.semantic.unbounded, NULL); xrt_space_reference(&icspo->base.semantic.unbounded, NULL);
@ -206,10 +207,18 @@ ipc_client_space_overseer_create(struct ipc_connection *ipc_c)
uint32_t root_id = UINT32_MAX; uint32_t root_id = UINT32_MAX;
uint32_t view_id = UINT32_MAX; uint32_t view_id = UINT32_MAX;
uint32_t local_id = UINT32_MAX; uint32_t local_id = UINT32_MAX;
uint32_t local_floor_id = UINT32_MAX;
uint32_t stage_id = UINT32_MAX; uint32_t stage_id = UINT32_MAX;
uint32_t unbounded_id = UINT32_MAX; uint32_t unbounded_id = UINT32_MAX;
ipc_call_space_create_semantic_ids(icspo->ipc_c, &root_id, &view_id, &local_id, &stage_id, &unbounded_id); ipc_call_space_create_semantic_ids( //
icspo->ipc_c, //
&root_id, //
&view_id, //
&local_id, //
&local_floor_id, //
&stage_id, //
&unbounded_id); //
#define CREATE(NAME) \ #define CREATE(NAME) \
do { \ do { \
@ -222,6 +231,7 @@ ipc_client_space_overseer_create(struct ipc_connection *ipc_c)
CREATE(root); CREATE(root);
CREATE(view); CREATE(view);
CREATE(local); CREATE(local);
CREATE(local_floor);
CREATE(stage); CREATE(stage);
CREATE(unbounded); CREATE(unbounded);

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

@ -270,6 +270,7 @@ ipc_handle_space_create_semantic_ids(volatile struct ipc_client_state *ics,
uint32_t *out_root_id, uint32_t *out_root_id,
uint32_t *out_view_id, uint32_t *out_view_id,
uint32_t *out_local_id, uint32_t *out_local_id,
uint32_t *out_local_floor_id,
uint32_t *out_stage_id, uint32_t *out_stage_id,
uint32_t *out_unbounded_id) uint32_t *out_unbounded_id)
{ {
@ -294,6 +295,7 @@ ipc_handle_space_create_semantic_ids(volatile struct ipc_client_state *ics,
CREATE(root); CREATE(root);
CREATE(view); CREATE(view);
CREATE(local); CREATE(local);
CREATE(local_floor);
CREATE(stage); CREATE(stage);
CREATE(unbounded); CREATE(unbounded);

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

@ -79,6 +79,7 @@
{"name": "root_id", "type": "uint32_t"}, {"name": "root_id", "type": "uint32_t"},
{"name": "view_id", "type": "uint32_t"}, {"name": "view_id", "type": "uint32_t"},
{"name": "local_id", "type": "uint32_t"}, {"name": "local_id", "type": "uint32_t"},
{"name": "local_floor_id", "type": "uint32_t"},
{"name": "stage_id", "type": "uint32_t"}, {"name": "stage_id", "type": "uint32_t"},
{"name": "unbounded_id", "type": "uint32_t"} {"name": "unbounded_id", "type": "uint32_t"}
] ]