The open source OpenXR runtime
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

drivers: don't initialize masks_sink if slam is disabled

Co-authored-by: Simon Zeni <simon.zeni@collabora.com>

authored by

Mateo de Mayo
Simon Zeni
and committed by
Simon Zeni
a8eb098e 55bd054d

+4 -4
+1 -1
src/xrt/drivers/rift_s/rift_s_tracker.c
··· 404 404 // Initialize hand tracker 405 405 struct xrt_slam_sinks *hand_sinks = NULL; 406 406 struct xrt_device *hand_device = NULL; 407 - struct xrt_hand_masks_sink *masks_sink = slam_sinks->hand_masks; 407 + struct xrt_hand_masks_sink *masks_sink = slam_sinks ? slam_sinks->hand_masks : NULL; 408 408 if (t->tracking.hand_enabled) { 409 409 int hand_status = rift_s_create_hand_tracker(t, xfctx, masks_sink, &hand_sinks, &hand_device); 410 410 if (hand_status != 0 || hand_sinks == NULL || hand_device == NULL) {
+1 -1
src/xrt/drivers/wmr/wmr_hmd.c
··· 1872 1872 // Initialize hand tracker 1873 1873 struct xrt_slam_sinks *hand_sinks = NULL; 1874 1874 struct xrt_device *hand_device = NULL; 1875 - struct xrt_hand_masks_sink *masks_sink = slam_sinks->hand_masks; 1875 + struct xrt_hand_masks_sink *masks_sink = slam_sinks ? slam_sinks->hand_masks : NULL; 1876 1876 if (wh->tracking.hand_enabled) { 1877 1877 int hand_status = wmr_hmd_hand_track(wh, stereo_calib, masks_sink, &hand_sinks, &hand_device); 1878 1878 if (hand_status != 0 || hand_sinks == NULL || hand_device == NULL) {
+1 -1
src/xrt/targets/common/target_builder_lighthouse.c
··· 385 385 // Initialize hand tracker 386 386 struct xrt_slam_sinks *hand_sinks = NULL; 387 387 struct xrt_device *hand_devices[2] = {NULL}; 388 - struct xrt_hand_masks_sink *masks_sink = (slam_enabled ? slam_sinks->hand_masks : NULL); 388 + struct xrt_hand_masks_sink *masks_sink = slam_sinks ? slam_sinks->hand_masks : NULL; 389 389 if (hand_enabled) { 390 390 bool success = valve_index_hand_track( // 391 391 lhs, //
+1 -1
src/xrt/targets/common/target_builder_north_star.c
··· 308 308 309 309 #ifdef XRT_BUILD_DRIVER_HANDTRACKING 310 310 struct xrt_slam_sinks *hand_sinks = NULL; 311 - struct xrt_hand_masks_sink *masks_sink = slam_sinks->hand_masks; 311 + struct xrt_hand_masks_sink *masks_sink = slam_sinks ? slam_sinks->hand_masks : NULL; 312 312 313 313 struct t_camera_extra_info extra_camera_info = {0}; 314 314