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: Destroy compositor on instance destroy

Browse source 
Fixes direct mode on subsequent instance creation in the same process
when no session was created.
This commit is contained in:
Christoph Haag 2020-09-07 15:25:57 +02:00
parent eb8a304178
commit 2b90b4ea89
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/xrt/state_trackers/oxr/oxr_instance.c
View file

@ -68,6 +68,9 @@ oxr_instance_destroy(struct oxr_logger *log, struct oxr_handle_base *hb)
{
struct oxr_instance *inst = (struct oxr_instance *)hb;
// Does a null-ptr check.
xrt_comp_destroy((struct xrt_compositor **)&inst->system.xcn);
u_var_remove_root((void *)inst);
oxr_binding_destroy_all(log, inst);

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

@ -1830,8 +1830,6 @@ oxr_session_destroy(struct oxr_logger *log, struct oxr_handle_base *hb)
XrResult ret = oxr_event_remove_session_events(log, sess);
// Does a null-ptr check.
xrt_comp_destroy(&sess->compositor);
for (size_t i = 0; i < sess->num_action_set_attachments; ++i) {
oxr_action_set_attachment_teardown(
&sess->act_set_attachments[i]);