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

st/oxr: Handle request exit session and stopping state

Browse source
This commit is contained in:
Ryan Pavlik 2019-10-22 14:35:09 +02:00
parent 0826ff9273
commit e2428ee7fa
3 changed files with 43 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/xrt/state_trackers/oxr/oxr_api_session.c
View file

@ -153,7 +153,7 @@ oxr_xrRequestExitSession(XrSession session)
OXR_VERIFY_SESSION_AND_INIT_LOG(&log, session, sess,
"xrRequestExitSession");
return oxr_error(&log, XR_ERROR_HANDLE_INVALID, " not implemented");
return oxr_session_request_exit(&log, sess);
}
XrResult

3
src/xrt/state_trackers/oxr/oxr_objects.h
View file

@ -441,6 +441,9 @@ oxr_session_begin(struct oxr_logger *log,
XrResult
oxr_session_end(struct oxr_logger *log, struct oxr_session *sess);
XrResult
oxr_session_request_exit(struct oxr_logger *log, struct oxr_session *sess);
void
oxr_session_poll(struct oxr_session *sess);

55
src/xrt/state_trackers/oxr/oxr_session.c
View file

@ -39,6 +39,7 @@ is_running(XrSessionState state)
case XR_SESSION_STATE_SYNCHRONIZED: return true;
case XR_SESSION_STATE_VISIBLE: return true;
case XR_SESSION_STATE_FOCUSED: return true;
case XR_SESSION_STATE_STOPPING: return true;
default: return false;
}
}
@ -49,10 +50,20 @@ should_render(XrSessionState state)
switch (state) {
case XR_SESSION_STATE_VISIBLE: return true;
case XR_SESSION_STATE_FOCUSED: return true;
case XR_SESSION_STATE_STOPPING: return true;
default: return false;
}
}
static void
oxr_session_change_state(struct oxr_logger *log,
struct oxr_session *sess,
XrSessionState state)
{
oxr_event_push_XrEventDataSessionStateChanged(log, sess, state, 0);
sess->state = state;
}
XrResult
oxr_session_enumerate_formats(struct oxr_logger *log,
struct oxr_session *sess,
@ -103,14 +114,9 @@ oxr_session_begin(struct oxr_logger *log,
->primaryViewConfigurationType);
}
oxr_event_push_XrEventDataSessionStateChanged(
log, sess, XR_SESSION_STATE_SYNCHRONIZED, 0);
oxr_event_push_XrEventDataSessionStateChanged(
log, sess, XR_SESSION_STATE_VISIBLE, 0);
oxr_event_push_XrEventDataSessionStateChanged(
log, sess, XR_SESSION_STATE_FOCUSED, 0);
sess->state = XR_SESSION_STATE_FOCUSED;
oxr_session_change_state(log, sess, XR_SESSION_STATE_SYNCHRONIZED);
oxr_session_change_state(log, sess, XR_SESSION_STATE_VISIBLE);
oxr_session_change_state(log, sess, XR_SESSION_STATE_FOCUSED);
return oxr_session_success_result(sess);
}
@ -124,6 +130,10 @@ oxr_session_end(struct oxr_logger *log, struct oxr_session *sess)
return oxr_error(log, XR_ERROR_SESSION_NOT_RUNNING,
" session is not running");
}
if (sess->state != XR_SESSION_STATE_STOPPING) {
return oxr_error(log, XR_ERROR_SESSION_NOT_STOPPING,
" session is not stopping");
}
if (xc != NULL) {
if (sess->frame_started) {
@ -134,16 +144,29 @@ oxr_session_end(struct oxr_logger *log, struct oxr_session *sess)
xc->end_session(xc);
}
oxr_event_push_XrEventDataSessionStateChanged(
log, sess, XR_SESSION_STATE_STOPPING, 0);
oxr_event_push_XrEventDataSessionStateChanged(log, sess,
XR_SESSION_STATE_IDLE, 0);
oxr_event_push_XrEventDataSessionStateChanged(
log, sess, XR_SESSION_STATE_READY, 0);
oxr_session_change_state(log, sess, XR_SESSION_STATE_IDLE);
oxr_session_change_state(log, sess, XR_SESSION_STATE_READY);
sess->state = XR_SESSION_STATE_READY;
return oxr_session_success_result(sess);
}
return XR_SUCCESS;
XrResult
oxr_session_request_exit(struct oxr_logger *log, struct oxr_session *sess)
{
if (!is_running(sess->state)) {
return oxr_error(log, XR_ERROR_SESSION_NOT_RUNNING,
" session is not running");
}
if (sess->state == XR_SESSION_STATE_FOCUSED) {
oxr_session_change_state(log, sess, XR_SESSION_STATE_VISIBLE);
}
if (sess->state == XR_SESSION_STATE_VISIBLE) {
oxr_session_change_state(log, sess,
XR_SESSION_STATE_SYNCHRONIZED);
}
//! @todo start fading out the app.
oxr_session_change_state(log, sess, XR_SESSION_STATE_STOPPING);
return oxr_session_success_result(sess);
}
void