The open source OpenXR runtime
0
fork

Configure Feed

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

build: s/rs/realsense/g

+70 -47
+2 -2
CMakeLists.txt
··· 242 242 cmake_dependent_option(XRT_HAVE_BASALT_SLAM "Enable Basalt support" ON "basalt_FOUND" OFF) 243 243 cmake_dependent_option(XRT_HAVE_SLAM "Enable SLAM tracking support" ON "SLAM;XRT_HAVE_OPENCV" OFF) 244 244 cmake_dependent_option(XRT_BUILD_DRIVER_PSVR "Enable PSVR HMD driver" ON "HIDAPI_FOUND" OFF) 245 - cmake_dependent_option(XRT_BUILD_DRIVER_RS "Enable RealSense device driver" ON "XRT_HAVE_REALSENSE" OFF) 245 + cmake_dependent_option(XRT_BUILD_DRIVER_REALSENSE "Enable RealSense device driver" ON "XRT_HAVE_REALSENSE" OFF) 246 246 cmake_dependent_option(XRT_BUILD_DRIVER_VIVE "Enable driver for HTC Vive, Vive Pro, Valve Index, and their controllers" ON "ZLIB_FOUND AND XRT_HAVE_LINUX" OFF) 247 247 cmake_dependent_option(XRT_BUILD_DRIVER_OHMD "Enable OpenHMD driver" ON "OPENHMD_FOUND" OFF) 248 248 cmake_dependent_option(XRT_BUILD_DRIVER_HANDTRACKING "Enable Camera Hand Tracking driver" ON "XRT_HAVE_ONNXRUNTIME AND XRT_HAVE_OPENCV AND XRT_HAVE_V4L2" OFF) ··· 447 447 message(STATUS "# DRIVER_OHMD: ${XRT_BUILD_DRIVER_OHMD}") 448 448 message(STATUS "# DRIVER_PSMV: ${XRT_BUILD_DRIVER_PSMV}") 449 449 message(STATUS "# DRIVER_PSVR: ${XRT_BUILD_DRIVER_PSVR}") 450 - message(STATUS "# DRIVER_RS: ${XRT_BUILD_DRIVER_RS}") 450 + message(STATUS "# DRIVER_RS: ${XRT_BUILD_DRIVER_REALSENSE}") 451 451 message(STATUS "# DRIVER_REMOTE: ${XRT_BUILD_DRIVER_REMOTE}") 452 452 message(STATUS "# DRIVER_SURVIVE: ${XRT_BUILD_DRIVER_SURVIVE}") 453 453 message(STATUS "# DRIVER_VF: ${XRT_BUILD_DRIVER_VF}")
+1 -1
doc/Doxyfile.in
··· 36 36 XR_USE_GRAPHICS_API_VULKAN \ 37 37 XR_USE_PLATFORM_XLIB \ 38 38 XR_USE_TIMESPEC \ 39 - XRT_BUILD_DRIVER_RS \ 39 + XRT_BUILD_DRIVER_REALSENSE \ 40 40 XRT_DOXYGEN \ 41 41 XRT_FEATURE_SERVICE \ 42 42 XRT_HAVE_JPEG \
+26 -26
meson.build
··· 57 57 pthreads = cc.find_library('pthread', required: true) 58 58 rt = cc.find_library('rt', required: true) 59 59 60 - avcodec = dependency('libavcodec', required: false) 61 - egl = dependency('egl', required: get_option('egl')) 62 - egl = egl.partial_dependency(includes: true) 63 - eigen3 = dependency('eigen3') 64 - libjpeg = dependency('libjpeg', required: false) 65 - libusb = dependency('libusb-1.0', required: false) 66 - opengl = dependency('gl', required: get_option('opengl')) 67 - opengles = dependency('glesv2', required: get_option('opengles')) 68 - rs = dependency('realsense2', required: false) 69 - sdl2 = dependency('sdl2', required: get_option('gui')) 70 - udev = dependency('libudev', required: false) 71 - libuvc = dependency('libuvc', required: false) 72 - vulkan = dependency('vulkan', required: true) 73 - zlib = dependency('zlib', required: false) 74 - survive = dependency('survive', required: false) 75 - dbus = dependency('dbus-1', required: get_option('dbus')) 76 - systemd = dependency('libsystemd', required: get_option('systemd')) 77 - libbsd = dependency('libbsd', required: get_option('libbsd')) 78 - gst = dependency('gstreamer-1.0', required: false) 79 - gst_app = dependency('gstreamer-app-1.0', required: false) 80 - gst_video= dependency('gstreamer-video-1.0', required: false) 81 - depthai = dependency('depthai', method: 'cmake', modules : ['depthai::core', 'depthai::opencv', 'XLink'], required: false) 60 + avcodec = dependency('libavcodec', required: false) 61 + egl = dependency('egl', required: get_option('egl')) 62 + egl = egl.partial_dependency(includes: true) 63 + eigen3 = dependency('eigen3') 64 + libjpeg = dependency('libjpeg', required: false) 65 + libusb = dependency('libusb-1.0', required: false) 66 + opengl = dependency('gl', required: get_option('opengl')) 67 + opengles = dependency('glesv2', required: get_option('opengles')) 68 + realsense = dependency('realsense2', required: false) 69 + sdl2 = dependency('sdl2', required: get_option('gui')) 70 + udev = dependency('libudev', required: false) 71 + libuvc = dependency('libuvc', required: false) 72 + vulkan = dependency('vulkan', required: true) 73 + zlib = dependency('zlib', required: false) 74 + survive = dependency('survive', required: false) 75 + dbus = dependency('dbus-1', required: get_option('dbus')) 76 + systemd = dependency('libsystemd', required: get_option('systemd')) 77 + libbsd = dependency('libbsd', required: get_option('libbsd')) 78 + gst = dependency('gstreamer-1.0', required: false) 79 + gst_app = dependency('gstreamer-app-1.0', required: false) 80 + gst_video = dependency('gstreamer-video-1.0', required: false) 81 + depthai = dependency('depthai', method: 'cmake', modules : ['depthai::core', 'depthai::opencv', 'XLink'], required: false) 82 82 onnxruntime = dependency('libonnxruntime', required: false) 83 - percetto = dependency('percetto', required: false) 83 + percetto = dependency('percetto', required: false) 84 84 85 85 gst_found = gst.found() and gst_app.found() and gst_video.found() 86 86 ··· 219 219 endif 220 220 endif 221 221 222 - if rs.found() and ('auto' in drivers or 'rs' in drivers) 223 - if 'rs' not in drivers 224 - drivers += ['rs'] 222 + if realsense.found() and ('auto' in drivers or 'realsense' in drivers) 223 + if 'realsense' not in drivers 224 + drivers += ['realsense'] 225 225 endif 226 226 endif 227 227
+24 -1
meson_options.txt
··· 3 3 4 4 option('drivers', 5 5 type: 'array', 6 - choices: ['auto', 'dummy', 'hdk', 'hydra', 'ns', 'ohmd', 'psmv', 'psvr', 'rs', 'v4l2', 'vf', 'depthai', 'vive', 'wmr', 'survive', 'daydream', 'arduino', 'remote', 'handtracking', 'qwerty', 'ulv2', 'euroc'], 6 + choices: [ 7 + 'auto', 8 + 'dummy', 9 + 'hdk', 10 + 'hydra', 11 + 'ns', 12 + 'ohmd', 13 + 'psmv', 14 + 'psvr', 15 + 'realsense', 16 + 'v4l2', 17 + 'vf', 18 + 'depthai', 19 + 'vive', 20 + 'wmr', 21 + 'survive', 22 + 'daydream', 23 + 'arduino', 24 + 'remote', 25 + 'handtracking', 26 + 'qwerty', 27 + 'ulv2', 28 + 'euroc', 29 + ], 7 30 value: ['auto'], 8 31 description: 'Set of drivers to build') 9 32
+3 -3
src/xrt/drivers/CMakeLists.txt
··· 138 138 list(APPEND ENABLED_HEADSET_DRIVERS psvr) 139 139 endif() 140 140 141 - if(XRT_BUILD_DRIVER_RS) 141 + if(XRT_BUILD_DRIVER_REALSENSE) 142 142 add_library( 143 - drv_rs STATIC 143 + drv_realsense STATIC 144 144 realsense/rs_ddev.c 145 145 realsense/rs_hdev.c 146 146 realsense/rs_prober.c 147 147 realsense/rs_driver.h 148 148 realsense/rs_interface.h 149 149 ) 150 - target_link_libraries(drv_rs PRIVATE xrt-interfaces realsense2::realsense2 aux_util) 150 + target_link_libraries(drv_realsense PRIVATE xrt-interfaces realsense2::realsense2 aux_util) 151 151 list(APPEND ENABLED_HEADSET_DRIVERS rs) 152 152 endif() 153 153
+3 -3
src/xrt/drivers/meson.build
··· 150 150 build_by_default: 'psvr' in drivers, 151 151 ) 152 152 153 - lib_drv_rs = static_library( 154 - 'drv_rs', 153 + lib_drv_realsense = static_library( 154 + 'drv_realsense', 155 155 files( 156 156 'realsense/rs_ddev.c', 157 157 'realsense/rs_hdev.c', ··· 160 160 'realsense/rs_prober.c', 161 161 ), 162 162 include_directories: [xrt_include,cjson_include], 163 - dependencies: [aux, rs], 163 + dependencies: [aux, realsense], 164 164 build_by_default: 'rs' in drivers, 165 165 ) 166 166
+2 -2
src/xrt/state_trackers/prober/p_prober.c
··· 31 31 #include "euroc/euroc_interface.h" 32 32 #endif 33 33 34 - #ifdef XRT_BUILD_DRIVER_RS 34 + #ifdef XRT_BUILD_DRIVER_REALSENSE 35 35 #include "realsense/rs_interface.h" 36 36 #endif 37 37 ··· 1006 1006 } 1007 1007 #endif 1008 1008 1009 - #if defined(XRT_BUILD_DRIVER_RS) 1009 + #if defined(XRT_BUILD_DRIVER_REALSENSE) 1010 1010 int rs_source_index = debug_get_num_option_rs_source_index(); 1011 1011 if (rs_source_index != -1) { 1012 1012 *out_xfs = rs_source_create(xfctx, rs_source_index);
+2 -2
src/xrt/state_trackers/prober/p_tracking.c
··· 31 31 DEBUG_GET_ONCE_OPTION(euroc_path, "EUROC_PATH", NULL) 32 32 #endif 33 33 34 - #ifdef XRT_BUILD_DRIVER_RS 34 + #ifdef XRT_BUILD_DRIVER_REALSENSE 35 35 #include "util/u_debug.h" 36 36 DEBUG_GET_ONCE_NUM_OPTION(rs_source_index, "RS_SOURCE_INDEX", -1) 37 37 #endif ··· 275 275 276 276 // SLAM tracker with RealSense frameserver 277 277 278 - #ifdef XRT_BUILD_DRIVER_RS 278 + #ifdef XRT_BUILD_DRIVER_REALSENSE 279 279 if (debug_get_num_option_rs_source_index() != -1) { 280 280 struct xrt_slam_sinks empty_sinks = {0}; 281 281 struct xrt_slam_sinks *sinks = &empty_sinks;
+2 -2
src/xrt/targets/common/CMakeLists.txt
··· 59 59 target_link_libraries(target_lists PRIVATE drv_psvr) 60 60 endif() 61 61 62 - if(XRT_BUILD_DRIVER_RS) 63 - target_link_libraries(target_lists PRIVATE drv_rs) 62 + if(XRT_BUILD_DRIVER_REALSENSE) 63 + target_link_libraries(target_lists PRIVATE drv_realsense) 64 64 endif() 65 65 66 66 if(XRT_BUILD_DRIVER_REMOTE)
+2 -2
src/xrt/targets/common/target_lists.c
··· 62 62 #include "illixr/illixr_interface.h" 63 63 #endif 64 64 65 - #ifdef XRT_BUILD_DRIVER_RS 65 + #ifdef XRT_BUILD_DRIVER_REALSENSE 66 66 #include "realsense/rs_interface.h" 67 67 #endif 68 68 ··· 179 179 illixr_create_auto_prober, 180 180 #endif 181 181 182 - #ifdef XRT_BUILD_DRIVER_RS 182 + #ifdef XRT_BUILD_DRIVER_REALSENSE 183 183 rs_create_auto_prober, 184 184 #endif 185 185
+3 -3
src/xrt/targets/meson.build
··· 44 44 driver_libs += [lib_drv_psvr] 45 45 endif 46 46 47 - if 'rs' in drivers 48 - driver_libs += [lib_drv_rs] 49 - driver_deps += [rs] 47 + if 'realsense' in drivers 48 + driver_libs += [lib_drv_realsense] 49 + driver_deps += [realsense] 50 50 endif 51 51 52 52 if 'v4l2' in drivers