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

st/oxr: Use xrt_compositor helpers

Browse source
This commit is contained in:
Jakob Bornecrantz 2019-10-28 21:00:36 +00:00
parent 1abdae5b64
commit e84ca2de34
2 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -110,7 +110,7 @@ oxr_session_begin(struct oxr_logger *log,
" view configuration type not supported"); " view configuration type not supported");
} }
xc->begin_session(xc, (enum xrt_view_type)beginInfo xrt_comp_begin_session(xc, (enum xrt_view_type)beginInfo
->primaryViewConfigurationType); ->primaryViewConfigurationType);
} }
@ -137,11 +137,11 @@ oxr_session_end(struct oxr_logger *log, struct oxr_session *sess)
if (xc != NULL) { if (xc != NULL) {
if (sess->frame_started) { if (sess->frame_started) {
xc->discard_frame(xc); xrt_comp_discard_frame(xc);
sess->frame_started = false; sess->frame_started = false;
} }
xc->end_session(xc); xrt_comp_end_session(xc);
} }
oxr_session_change_state(log, sess, XR_SESSION_STATE_IDLE); oxr_session_change_state(log, sess, XR_SESSION_STATE_IDLE);
@ -396,7 +396,7 @@ oxr_session_frame_wait(struct oxr_logger *log,
struct xrt_compositor *xc = sess->compositor; struct xrt_compositor *xc = sess->compositor;
if (xc != NULL) { if (xc != NULL) {
xc->wait_frame(xc, &frameState->predictedDisplayTime, xrt_comp_wait_frame(xc, &frameState->predictedDisplayTime,
&frameState->predictedDisplayPeriod); &frameState->predictedDisplayPeriod);
frameState->shouldRender = should_render(sess->state); frameState->shouldRender = should_render(sess->state);
} else { } else {
@ -420,14 +420,14 @@ oxr_session_frame_begin(struct oxr_logger *log, struct oxr_session *sess)
if (sess->frame_started) { if (sess->frame_started) {
ret = XR_FRAME_DISCARDED; ret = XR_FRAME_DISCARDED;
if (xc != NULL) { if (xc != NULL) {
xc->discard_frame(xc); xrt_comp_discard_frame(xc);
} }
} else { } else {
ret = oxr_session_success_result(sess); ret = oxr_session_success_result(sess);
sess->frame_started = true; sess->frame_started = true;
} }
if (xc != NULL) { if (xc != NULL) {
xc->begin_frame(xc); xrt_comp_begin_frame(xc);
} }
return ret; return ret;
@ -480,7 +480,7 @@ oxr_session_frame_end(struct oxr_logger *log,
* since then blend mode, etc. doesn't matter. * since then blend mode, etc. doesn't matter.
*/ */
if (frameEndInfo->layerCount == 0) { if (frameEndInfo->layerCount == 0) {
xc->discard_frame(xc); xrt_comp_discard_frame(xc);
sess->frame_started = false; sess->frame_started = false;
return oxr_session_success_result(sess); return oxr_session_success_result(sess);
@ -572,7 +572,8 @@ oxr_session_frame_end(struct oxr_logger *log,
image_index[i] = sc->released_index; image_index[i] = sc->released_index;
} }
xc->end_frame(xc, blend_mode, chains, image_index, layers, num_chains); xrt_comp_end_frame(xc, blend_mode, chains, image_index, layers,
num_chains);
sess->frame_started = false; sess->frame_started = false;
@ -583,9 +584,10 @@ static XrResult
oxr_session_destroy(struct oxr_logger *log, struct oxr_handle_base *hb) oxr_session_destroy(struct oxr_logger *log, struct oxr_handle_base *hb)
{ {
struct oxr_session *sess = (struct oxr_session *)hb; struct oxr_session *sess = (struct oxr_session *)hb;
if (sess->compositor != NULL) {
sess->compositor->destroy(sess->compositor); // Does a null-ptr check.
} xrt_comp_destroy(&sess->compositor);
free(sess); free(sess);
return XR_SUCCESS; return XR_SUCCESS;

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

@ -107,7 +107,7 @@ oxr_create_swapchain(struct oxr_logger *log,
const XrSwapchainCreateInfo *createInfo, const XrSwapchainCreateInfo *createInfo,
struct oxr_swapchain **out_swapchain) struct oxr_swapchain **out_swapchain)
{ {
struct xrt_swapchain *xsc = sess->compositor->create_swapchain( struct xrt_swapchain *xsc = xrt_comp_create_swapchain(
sess->compositor, sess->compositor,
(enum xrt_swapchain_create_flags)createInfo->createFlags, (enum xrt_swapchain_create_flags)createInfo->createFlags,
(enum xrt_swapchain_usage_bits)createInfo->usageFlags, (enum xrt_swapchain_usage_bits)createInfo->usageFlags,