mirror of
https://gitlab.freedesktop.org/monado/monado.git
synced 2025-01-07 23:56:38 +00:00
t/common: Refactor SimulaVR builder [NFC]
This commit is contained in:
parent
201ea799ac
commit
0a8fa312d6
|
@ -192,7 +192,6 @@ svr_open_system(struct xrt_builder *xb,
|
||||||
struct xrt_space_overseer **out_xso)
|
struct xrt_space_overseer **out_xso)
|
||||||
{
|
{
|
||||||
struct simula_builder *sb = (struct simula_builder *)xb;
|
struct simula_builder *sb = (struct simula_builder *)xb;
|
||||||
struct u_system_devices *usysd = u_system_devices_allocate();
|
|
||||||
xrt_result_t result = XRT_SUCCESS;
|
xrt_result_t result = XRT_SUCCESS;
|
||||||
|
|
||||||
if (out_xsysd == NULL || *out_xsysd != NULL) {
|
if (out_xsysd == NULL || *out_xsysd != NULL) {
|
||||||
|
@ -211,17 +210,25 @@ svr_open_system(struct xrt_builder *xb,
|
||||||
struct xrt_device *head_device = multi_create_tracking_override(
|
struct xrt_device *head_device = multi_create_tracking_override(
|
||||||
XRT_TRACKING_OVERRIDE_ATTACHED, svr_dev, t265_dev, XRT_INPUT_GENERIC_TRACKER_POSE, &ident);
|
XRT_TRACKING_OVERRIDE_ATTACHED, svr_dev, t265_dev, XRT_INPUT_GENERIC_TRACKER_POSE, &ident);
|
||||||
|
|
||||||
usysd->base.roles.head = head_device;
|
struct xrt_system_devices *xsysd = NULL;
|
||||||
usysd->base.xdevs[0] = usysd->base.roles.head;
|
{
|
||||||
usysd->base.xdev_count = 1;
|
struct u_system_devices *usysd = u_system_devices_allocate();
|
||||||
|
xsysd = &usysd->base;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Add to device list.
|
||||||
|
xsysd->xdevs[xsysd->xdev_count++] = head_device;
|
||||||
|
|
||||||
|
// Assign to role(s).
|
||||||
|
xsysd->roles.head = head_device;
|
||||||
|
|
||||||
|
|
||||||
end:
|
end:
|
||||||
if (result == XRT_SUCCESS) {
|
if (result == XRT_SUCCESS) {
|
||||||
*out_xsysd = &usysd->base;
|
*out_xsysd = xsysd;
|
||||||
u_builder_create_space_overseer(&usysd->base, out_xso);
|
u_builder_create_space_overseer(xsysd, out_xso);
|
||||||
} else {
|
} else {
|
||||||
u_system_devices_destroy(&usysd);
|
xrt_system_devices_destroy(&xsysd);
|
||||||
}
|
}
|
||||||
|
|
||||||
return result;
|
return result;
|
||||||
|
|
Loading…
Reference in a new issue