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

st/oxr: Improve error condition handling on instance creation

Browse source
This commit is contained in:
Jakob Bornecrantz 2019-11-09 12:41:43 +00:00
parent e78e5c8045
commit 86244f726f
1 changed files with 31 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -77,8 +77,10 @@ oxr_instance_destroy(struct oxr_logger *log, struct oxr_handle_base *hb)
xrt_prober_destroy(&inst->prober); xrt_prober_destroy(&inst->prober);
time_state_destroy(inst->timekeeping); if (inst->timekeeping != NULL) {
inst->timekeeping = NULL; time_state_destroy(inst->timekeeping);
inst->timekeeping = NULL;
}
free(inst); free(inst);
@ -104,6 +106,7 @@ oxr_instance_create(struct oxr_logger *log,
struct oxr_instance *inst = NULL; struct oxr_instance *inst = NULL;
struct xrt_device *xdevs[NUM_XDEVS] = {0}; struct xrt_device *xdevs[NUM_XDEVS] = {0};
int h_ret, p_ret; int h_ret, p_ret;
XrResult ret;
OXR_ALLOCATE_HANDLE_OR_RETURN(log, inst, OXR_XR_DEBUG_INSTANCE, OXR_ALLOCATE_HANDLE_OR_RETURN(log, inst, OXR_XR_DEBUG_INSTANCE,
oxr_instance_destroy, NULL); oxr_instance_destroy, NULL);
@ -145,23 +148,35 @@ oxr_instance_create(struct oxr_logger *log,
p_ret = xrt_prober_create(&inst->prober); p_ret = xrt_prober_create(&inst->prober);
if (p_ret != 0) { if (p_ret != 0) {
xrt_prober_destroy(&inst->prober); ret = oxr_error(log, XR_ERROR_RUNTIME_FAILURE,
return oxr_error(log, XR_ERROR_RUNTIME_FAILURE, "Failed to create prober");
"Failed to create prober"); oxr_instance_destroy(log, &inst->handle);
return ret;
} }
p_ret = xrt_prober_probe(inst->prober); p_ret = xrt_prober_probe(inst->prober);
if (p_ret != 0) { if (p_ret != 0) {
xrt_prober_destroy(&inst->prober); ret = oxr_error(log, XR_ERROR_RUNTIME_FAILURE,
return oxr_error(log, XR_ERROR_RUNTIME_FAILURE, "Failed to probe device(s)");
"Failed to probe device(s)"); oxr_instance_destroy(log, &inst->handle);
return ret;
} }
p_ret = xrt_prober_select(inst->prober, xdevs, NUM_XDEVS); p_ret = xrt_prober_select(inst->prober, xdevs, NUM_XDEVS);
if (p_ret != 0) { if (p_ret != 0) {
xrt_prober_destroy(&inst->prober); ret = oxr_error(log, XR_ERROR_RUNTIME_FAILURE,
return oxr_error(log, XR_ERROR_RUNTIME_FAILURE, "Failed to select device");
"Failed to select device"); oxr_instance_destroy(log, &inst->handle);
return ret;
}
// Did we find any HMD
// @todo Headless with only controllers?
if (xdevs[0] == NULL) {
ret = oxr_error(log, XR_ERROR_RUNTIME_FAILURE,
"Failed to find any HMD device");
oxr_instance_destroy(log, &inst->handle);
return ret;
} }
struct xrt_device *dev = xdevs[0]; struct xrt_device *dev = xdevs[0];
@ -205,7 +220,11 @@ oxr_instance_create(struct oxr_logger *log,
dev->hmd->views[1].fov.angle_down = down_override; dev->hmd->views[1].fov.angle_down = down_override;
} }
oxr_system_fill_in(log, inst, 1, &inst->system, xdevs, NUM_XDEVS); ret = oxr_system_fill_in(log, inst, 1, &inst->system, xdevs, NUM_XDEVS);
if (ret != XR_SUCCESS) {
oxr_instance_destroy(log, &inst->handle);
return ret;
}
inst->timekeeping = time_state_create(); inst->timekeeping = time_state_create();