+3 -1

src/xrt/compositor/multi/comp_multi_system.c

··· 592 */ 593 594 static xrt_result_t 595 - system_compositor_set_state(struct xrt_system_compositor *xsc, struct xrt_compositor *xc, bool visible, bool focused) 0 596 { 597 struct multi_system_compositor *msc = multi_system_compositor(xsc); 598 struct multi_compositor *mc = multi_compositor(xc); ··· 607 xse.type = XRT_SESSION_EVENT_STATE_CHANGE; 608 xse.state.visible = visible; 609 xse.state.focused = focused; 0 610 611 return multi_compositor_push_event(mc, &xse); 612 }

··· 592 */ 593 594 static xrt_result_t 595 + system_compositor_set_state( 596 + struct xrt_system_compositor *xsc, struct xrt_compositor *xc, bool visible, bool focused, int64_t timestamp_ns) 597 { 598 struct multi_system_compositor *msc = multi_system_compositor(xsc); 599 struct multi_compositor *mc = multi_compositor(xc); ··· 608 xse.type = XRT_SESSION_EVENT_STATE_CHANGE; 609 xse.state.visible = visible; 610 xse.state.focused = focused; 611 + xse.state.timestamp_ns = timestamp_ns; 612 613 return multi_compositor_push_event(mc, &xse); 614 }

+5 -3

src/xrt/include/xrt/xrt_compositor.h

··· 2391 xrt_result_t (*set_state)(struct xrt_system_compositor *xsc, 2392 struct xrt_compositor *xc, 2393 bool visible, 2394 - bool focused); 0 2395 2396 /*! 2397 * Set the rendering Z order for rendering, visible has higher priority ··· 2491 * @public @memberof xrt_system_compositor 2492 */ 2493 static inline xrt_result_t 2494 - xrt_syscomp_set_state(struct xrt_system_compositor *xsc, struct xrt_compositor *xc, bool visible, bool focused) 0 2495 { 2496 if (xsc->xmcc == NULL) { 2497 return XRT_ERROR_MULTI_SESSION_NOT_IMPLEMENTED; 2498 } 2499 2500 - return xsc->xmcc->set_state(xsc, xc, visible, focused); 2501 } 2502 2503 /*!

··· 2391 xrt_result_t (*set_state)(struct xrt_system_compositor *xsc, 2392 struct xrt_compositor *xc, 2393 bool visible, 2394 + bool focused, 2395 + int64_t timestamp_ns); 2396 2397 /*! 2398 * Set the rendering Z order for rendering, visible has higher priority ··· 2492 * @public @memberof xrt_system_compositor 2493 */ 2494 static inline xrt_result_t 2495 + xrt_syscomp_set_state( 2496 + struct xrt_system_compositor *xsc, struct xrt_compositor *xc, bool visible, bool focused, int64_t timestamp_ns) 2497 { 2498 if (xsc->xmcc == NULL) { 2499 return XRT_ERROR_MULTI_SESSION_NOT_IMPLEMENTED; 2500 } 2501 2502 + return xsc->xmcc->set_state(xsc, xc, visible, focused, timestamp_ns); 2503 } 2504 2505 /*!

+1

src/xrt/include/xrt/xrt_session.h

··· 80 enum xrt_session_event_type type; 81 bool visible; 82 bool focused; 0 83 }; 84 85 /*!

··· 80 enum xrt_session_event_type type; 81 bool visible; 82 bool focused; 83 + int64_t timestamp_ns; 84 }; 85 86 /*!

+1 -1

src/xrt/ipc/server/ipc_server_handler.c

··· 461 ics->xc = &xcn->base; 462 463 xrt_syscomp_set_state(ics->server->xsysc, ics->xc, ics->client_state.session_visible, 464 - ics->client_state.session_focused); 465 xrt_syscomp_set_z_order(ics->server->xsysc, ics->xc, ics->client_state.z_order); 466 467 return XRT_SUCCESS;

··· 461 ics->xc = &xcn->base; 462 463 xrt_syscomp_set_state(ics->server->xsysc, ics->xc, ics->client_state.session_visible, 464 + ics->client_state.session_focused, os_monotonic_get_ns()); 465 xrt_syscomp_set_z_order(ics->server->xsysc, ics->xc, ics->client_state.z_order); 466 467 return XRT_SUCCESS;

+1 -1

src/xrt/ipc/server/ipc_server_process.c

··· 615 ics->client_state.z_order = z_order; 616 617 if (ics->xc != NULL) { 618 - xrt_syscomp_set_state(ics->server->xsysc, ics->xc, visible, focused); 619 xrt_syscomp_set_z_order(ics->server->xsysc, ics->xc, z_order); 620 } 621 }

··· 615 ics->client_state.z_order = z_order; 616 617 if (ics->xc != NULL) { 618 + xrt_syscomp_set_state(ics->server->xsysc, ics->xc, visible, focused, os_monotonic_get_ns()); 619 xrt_syscomp_set_z_order(ics->server->xsysc, ics->xc, z_order); 620 } 621 }

+6 -1

src/xrt/state_trackers/oxr/oxr_session.c

··· 551 case XRT_SESSION_EVENT_STATE_CHANGE: 552 sess->compositor_visible = xse.state.visible; 553 sess->compositor_focused = xse.state.focused; 0 0 0 0 0 554 break; 555 case XRT_SESSION_EVENT_OVERLAY_CHANGE: 556 #ifdef OXR_HAVE_EXTX_overlay ··· 1162 "Failed to create xrt_session and xrt_compositor_native! '%i'", xret); 1163 } 1164 if (sess->sys->xsysc->xmcc != NULL) { 1165 - xrt_syscomp_set_state(sess->sys->xsysc, &sess->xcn->base, true, true); 1166 xrt_syscomp_set_z_order(sess->sys->xsysc, &sess->xcn->base, 0); 1167 } 1168 return XR_SUCCESS;

··· 551 case XRT_SESSION_EVENT_STATE_CHANGE: 552 sess->compositor_visible = xse.state.visible; 553 sess->compositor_focused = xse.state.focused; 554 + 555 + // Do not use xse.state.timestamp_ns, server side focused / visible state does not correspond 556 + // 1:1 to the cycle we tell the app. In particular the compositor may have become focused / 557 + // visible much earlier than what we tell the app when it became so. 558 + 559 break; 560 case XRT_SESSION_EVENT_OVERLAY_CHANGE: 561 #ifdef OXR_HAVE_EXTX_overlay ··· 1167 "Failed to create xrt_session and xrt_compositor_native! '%i'", xret); 1168 } 1169 if (sess->sys->xsysc->xmcc != NULL) { 1170 + xrt_syscomp_set_state(sess->sys->xsysc, &sess->xcn->base, true, true, os_monotonic_get_ns()); 1171 xrt_syscomp_set_z_order(sess->sys->xsysc, &sess->xcn->base, 0); 1172 } 1173 return XR_SUCCESS;