The open source OpenXR runtime
st/oxr: Don't use the debug gui by default in out-of-process
authored by
Moses Turner
and committed by
Moses Turner
fa2554f2
f55ac055
+24
-1
+11
CMakeLists.txt
+11
CMakeLists.txt
···
245
245
option_with_deps(XRT_FEATURE_STEAMVR_PLUGIN "Build SteamVR plugin" DEPENDS "NOT ANDROID")
246
246
option_with_deps(XRT_FEATURE_TRACING "Enable debug tracing on supported platforms" DEFAULT OFF DEPENDS XRT_HAVE_PERCETTO)
247
247
248
+
if (XRT_FEATURE_SERVICE)
249
+
# Disable the client debug gui by default for out-of-proc -
250
+
# too many clients have problems with depending on SDL/GStreamer/etc and we rarely use it in this configuration
251
+
option(XRT_FEATURE_CLIENT_DEBUG_GUI "Allow clients to have their own instances of the debug gui" OFF)
252
+
else()
253
+
# Enable the client debug gui by default for in-proc -
254
+
# In in-proc, the client debug gui is the same as the server debug gui, and we use it a lot in this configuration
255
+
option(XRT_FEATURE_CLIENT_DEBUG_GUI "Allow clients to have their own instances of the debug gui" ON)
256
+
endif()
257
+
248
258
# systemd detailed config
249
259
option_with_deps(XRT_INSTALL_SYSTEMD_UNIT_FILES "Install user unit files for systemd socket activation on installation" DEPENDS XRT_HAVE_SYSTEMD)
250
260
option_with_deps(XRT_INSTALL_ABSOLUTE_SYSTEMD_UNIT_FILES "Use an absolute path to monado-system in installed user unit files for systemd socket activation" DEPENDS XRT_HAVE_SYSTEMD)
···
475
485
message(STATUS "# FEATURE_SERVICE: ${XRT_FEATURE_SERVICE}")
476
486
message(STATUS "# FEATURE_STEAMVR_PLUGIN: ${XRT_FEATURE_STEAMVR_PLUGIN}")
477
487
message(STATUS "# FEATURE_TRACING: ${XRT_FEATURE_TRACING}")
488
+
message(STATUS "# FEATURE_CLIENT_DEBUG_GUI: ${XRT_FEATURE_CLIENT_DEBUG_GUI}")
478
489
message(STATUS "#")
479
490
message(STATUS "# DRIVER_ANDROID: ${XRT_BUILD_DRIVER_ANDROID}")
480
491
message(STATUS "# DRIVER_ARDUINO: ${XRT_BUILD_DRIVER_ARDUINO}")
+1
src/xrt/include/xrt/xrt_config_build.h.cmake_in
+1
src/xrt/include/xrt/xrt_config_build.h.cmake_in
+8
src/xrt/state_trackers/oxr/oxr_instance.c
+8
src/xrt/state_trackers/oxr/oxr_instance.c
···
48
48
DEBUG_GET_ONCE_FLOAT_OPTION(tracking_origin_offset_y, "OXR_TRACKING_ORIGIN_OFFSET_Y", 0.0f)
49
49
DEBUG_GET_ONCE_FLOAT_OPTION(tracking_origin_offset_z, "OXR_TRACKING_ORIGIN_OFFSET_Z", 0.0f)
50
50
51
+
#ifdef XRT_FEATURE_CLIENT_DEBUG_GUI
51
52
/* ---- HACK ---- */
52
53
extern int
53
54
oxr_sdl2_hack_create(void **out_hack);
···
58
59
extern void
59
60
oxr_sdl2_hack_stop(void **hack_ptr);
60
61
/* ---- HACK ---- */
62
+
#endif
61
63
62
64
static XrResult
63
65
oxr_instance_destroy(struct oxr_logger *log, struct oxr_handle_base *hb)
···
78
80
79
81
xrt_system_devices_destroy(&inst->system.xsysd);
80
82
83
+
#ifdef XRT_FEATURE_CLIENT_DEBUG_GUI
81
84
/* ---- HACK ---- */
82
85
oxr_sdl2_hack_stop(&inst->hack);
83
86
/* ---- HACK ---- */
87
+
#endif
84
88
85
89
xrt_instance_destroy(&inst->xinst);
86
90
···
189
193
return ret;
190
194
}
191
195
196
+
#ifdef XRT_FEATURE_CLIENT_DEBUG_GUI
192
197
/* ---- HACK ---- */
193
198
oxr_sdl2_hack_create(&inst->hack);
194
199
/* ---- HACK ---- */
200
+
#endif
195
201
196
202
ret = oxr_path_init(log, inst);
197
203
if (ret != XR_SUCCESS) {
···
323
329
324
330
u_var_add_root((void *)inst, "XrInstance", true);
325
331
332
+
#ifdef XRT_FEATURE_CLIENT_DEBUG_GUI
326
333
/* ---- HACK ---- */
327
334
oxr_sdl2_hack_start(inst->hack, inst->xinst, sys->xsysd);
328
335
/* ---- HACK ---- */
336
+
#endif
329
337
330
338
oxr_log(log,
331
339
"Instance created\n"
+4
-1
src/xrt/targets/openxr/CMakeLists.txt
+4
-1
src/xrt/targets/openxr/CMakeLists.txt
···
145
145
target_link_libraries(oxr_sdl2 PRIVATE drv_qwerty drv_qwerty_includes)
146
146
endif()
147
147
endif()
148
-
target_link_libraries(${RUNTIME_TARGET} PRIVATE oxr_sdl2)
148
+
149
+
if(XRT_FEATURE_CLIENT_DEBUG_GUI)
150
+
target_link_libraries(${RUNTIME_TARGET} PRIVATE oxr_sdl2)
151
+
endif()