The open source OpenXR runtime
st/oxr: Set extensions earlier
+6
-3
+6
-3
src/xrt/state_trackers/oxr/oxr_instance.c
+6
-3
src/xrt/state_trackers/oxr/oxr_instance.c
···
179
179
180
180
OXR_ALLOCATE_HANDLE_OR_RETURN(log, inst, OXR_XR_DEBUG_INSTANCE, oxr_instance_destroy, NULL);
181
181
182
+
inst->extensions = *extensions; // Sets the enabled extensions.
182
183
inst->lifecycle_verbose = debug_get_bool_option_lifecycle_verbose();
183
184
inst->debug_spaces = debug_get_bool_option_debug_spaces();
184
185
inst->debug_views = debug_get_bool_option_debug_views();
···
254
255
android_looper_poll_until_activity_resumed();
255
256
#endif
256
257
258
+
259
+
/*
260
+
* Monado initialisation.
261
+
*/
262
+
257
263
xret = xrt_instance_create(&i_info, &inst->xinst);
258
264
if (xret != XRT_SUCCESS) {
259
265
ret = oxr_error(log, XR_ERROR_RUNTIME_FAILURE, "Failed to create instance '%i'", xret);
···
298
304
oxr_instance_destroy(log, &inst->handle);
299
305
return ret;
300
306
}
301
-
302
-
// Sets the enabled extensions, this is where we should do any extra validation.
303
-
inst->extensions = *extensions;
304
307
305
308
ret = oxr_system_fill_in(log, inst, 1, &inst->system);
306
309
if (ret != XR_SUCCESS) {