The open source OpenXR runtime
d/vive: Refactor out vive config code into auxiliary library
fix vive_config.h include for survive
authored by
Jakob Bornecrantz
and committed by
Christoph Haag
58531038
bec70c47
+48
-55
+11
src/xrt/auxiliary/CMakeLists.txt
+11
src/xrt/auxiliary/CMakeLists.txt
···
234
234
target_link_libraries(aux_tracking PUBLIC ${OpenCV_LIBRARIES})
235
235
endif()
236
236
237
+
if (XRT_BUILD_DRIVER_VIVE OR XRT_BUILD_DRIVER_SURVIVE)
238
+
set(VIVE_CONFIG_SOURCE_FILES
239
+
vive/vive_config.h
240
+
vive/vive_config.c
241
+
)
242
+
add_library(aux_vive STATIC ${VIVE_CONFIG_SOURCE_FILES})
243
+
target_link_libraries(aux_vive PRIVATE xrt-interfaces aux_util aux_math xrt-external-cjson)
244
+
target_link_libraries(aux_vive PRIVATE ${ZLIB_LIBRARIES})
245
+
target_include_directories(aux_vive PRIVATE ${ZLIB_INCLUDE_DIRS})
246
+
endif()
247
+
237
248
if(XRT_HAVE_VULKAN)
238
249
# Vulkan library.
239
250
add_library(aux_vk STATIC ${VK_SOURCE_FILES})
+19
-1
src/xrt/auxiliary/meson.build
+19
-1
src/xrt/auxiliary/meson.build
···
217
217
link_with: lib_aux_tracking,
218
218
)
219
219
220
+
lib_aux_vive = static_library(
221
+
'aux_vive',
222
+
files(
223
+
'vive/vive_config.c',
224
+
'vive/vive_config.h',
225
+
),
226
+
include_directories: [
227
+
xrt_include,
228
+
cjson_include,
229
+
],
230
+
dependencies: [zlib],
231
+
)
232
+
233
+
aux_vive = declare_dependency(
234
+
include_directories: aux_include,
235
+
link_with: lib_aux_vive,
236
+
)
237
+
220
238
lib_aux_vk = static_library(
221
239
'aux_vk',
222
240
files(
···
237
255
)
238
256
239
257
240
-
all_aux = [aux_util, aux_os, aux_math, aux_tracking, aux_generated_bindings]
258
+
all_aux = [aux_util, aux_os, aux_math, aux_tracking, aux_generated_bindings, aux_vive]
241
259
242
260
aux = declare_dependency(dependencies: all_aux)
+3
-25
src/xrt/drivers/CMakeLists.txt
+3
-25
src/xrt/drivers/CMakeLists.txt
···
160
160
list(APPEND ENABLED_HEADSET_DRIVERS remote)
161
161
endif()
162
162
163
-
if (XRT_BUILD_DRIVER_VIVE OR XRT_BUILD_DRIVER_SURVIVE)
164
-
set(VIVE_CONFIG_SOURCE_FILES
165
-
vive/vive_device.h
166
-
vive/vive_device.c
167
-
vive/vive_prober.h
168
-
vive/vive_prober.c
169
-
vive/vive_protocol.c
170
-
vive/vive_protocol.h
171
-
vive/vive_controller.h
172
-
vive/vive_controller.c
173
-
vive/vive_config.h
174
-
vive/vive_config.c
175
-
vive/vive_lighthouse.h
176
-
vive/vive_lighthouse.c
177
-
)
178
-
add_library(vive_config STATIC ${VIVE_CONFIG_SOURCE_FILES})
179
-
target_link_libraries(vive_config PRIVATE xrt-interfaces aux_util aux_math xrt-external-cjson)
180
-
target_link_libraries(vive_config PRIVATE ${ZLIB_LIBRARIES})
181
-
target_include_directories(vive_config PRIVATE ${ZLIB_INCLUDE_DIRS})
182
-
endif()
183
-
184
163
set(VIVE_CONFIG_INCLUDE "${CMAKE_CURRENT_SOURCE_DIR}/vive")
185
164
if(XRT_BUILD_DRIVER_VIVE)
186
165
set(VIVE_SOURCE_FILES
···
197
176
)
198
177
199
178
add_library(drv_vive STATIC ${VIVE_SOURCE_FILES})
200
-
target_link_libraries(drv_vive PRIVATE xrt-interfaces aux_os aux_util aux_math xrt-external-cjson vive_config)
179
+
target_link_libraries(drv_vive PRIVATE xrt-interfaces aux_os aux_util aux_math xrt-external-cjson aux_vive)
201
180
target_link_libraries(drv_vive PRIVATE ${ZLIB_LIBRARIES})
202
-
target_include_directories(drv_vive PRIVATE ${ZLIB_INCLUDE_DIRS} ${VIVE_CONFIG_INCLUDE})
181
+
target_include_directories(drv_vive PRIVATE ${ZLIB_INCLUDE_DIRS})
203
182
list(APPEND ENABLED_HEADSET_DRIVERS vive)
204
183
endif()
205
184
···
234
213
)
235
214
236
215
add_library(drv_survive STATIC ${SURVIVE_SOURCE_FILES})
237
-
target_include_directories(drv_survive PRIVATE ${VIVE_CONFIG_INCLUDE})
238
-
target_link_libraries(drv_survive PRIVATE xrt-interfaces aux_os aux_util aux_math vive_config PkgConfig::SURVIVE)
216
+
target_link_libraries(drv_survive PRIVATE xrt-interfaces aux_os aux_util aux_math aux_vive PkgConfig::SURVIVE)
239
217
list(APPEND ENABLED_HEADSET_DRIVERS survive)
240
218
endif()
241
219
+4
-21
src/xrt/drivers/meson.build
+4
-21
src/xrt/drivers/meson.build
···
154
154
build_by_default: 'v4l2' in drivers,
155
155
)
156
156
157
-
vive_config_include = include_directories('vive')
158
-
lib_vive_config = static_library(
159
-
'vive_config',
160
-
files(
161
-
'vive/vive_config.c',
162
-
'vive/vive_config.h',
163
-
),
164
-
include_directories: [
165
-
xrt_include,
166
-
cjson_include,
167
-
],
168
-
dependencies: [aux, zlib],
169
-
build_by_default: 'vive' in drivers or 'survive' in drivers,
170
-
)
171
-
172
157
lib_drv_vive = static_library(
173
158
'drv_vive',
174
159
files(
···
185
170
),
186
171
include_directories: [
187
172
xrt_include,
173
+
aux_include,
188
174
cjson_include,
189
-
vive_config_include,
190
175
],
191
-
dependencies: [aux, zlib],
176
+
dependencies: [aux, zlib, aux_vive],
192
177
build_by_default: 'vive' in drivers,
193
-
link_with: lib_vive_config
194
178
)
195
179
196
180
lib_drv_survive = static_library(
···
203
187
),
204
188
include_directories: [
205
189
xrt_include,
190
+
aux_include,
206
191
cjson_include,
207
-
vive_config_include,
208
192
],
209
-
dependencies: [aux, zlib, survive],
193
+
dependencies: [aux, zlib, survive, aux_vive],
210
194
build_by_default: 'survive' in drivers,
211
-
link_with: lib_vive_config
212
195
)
213
196
214
197
lib_drv_daydream = static_library(
+1
-1
src/xrt/drivers/survive/survive_driver.c
+1
-1
src/xrt/drivers/survive/survive_driver.c
+7
-3
src/xrt/drivers/vive/vive_config.c
src/xrt/auxiliary/vive/vive_config.c
+7
-3
src/xrt/drivers/vive/vive_config.c
src/xrt/auxiliary/vive/vive_config.c
···
11
11
12
12
#include "vive_config.h"
13
13
14
+
#include "util/u_misc.h"
14
15
#include "util/u_json.h"
15
16
#include "util/u_distortion_mesh.h"
16
17
17
18
#include "math/m_api.h"
18
19
19
-
#include "vive.h"
20
-
#include "vive_device.h"
21
-
#include "vive_controller.h"
20
+
21
+
#define VIVE_TRACE(d, ...) U_LOG_IFL_T(d->ll, __VA_ARGS__)
22
+
#define VIVE_DEBUG(d, ...) U_LOG_IFL_D(d->ll, __VA_ARGS__)
23
+
#define VIVE_INFO(d, ...) U_LOG_IFL_I(d->ll, __VA_ARGS__)
24
+
#define VIVE_WARN(d, ...) U_LOG_IFL_W(d->ll, __VA_ARGS__)
25
+
#define VIVE_ERROR(d, ...) U_LOG_IFL_E(d->ll, __VA_ARGS__)
22
26
23
27
#define JSON_INT(a, b, c) u_json_get_int(u_json_get(a, b), c)
24
28
#define JSON_FLOAT(a, b, c) u_json_get_float(u_json_get(a, b), c)
src/xrt/drivers/vive/vive_config.h
src/xrt/auxiliary/vive/vive_config.h
src/xrt/drivers/vive/vive_config.h
src/xrt/auxiliary/vive/vive_config.h
+1
-1
src/xrt/drivers/vive/vive_controller.c
+1
-1
src/xrt/drivers/vive/vive_controller.c
···
30
30
#include "os/os_hid.h"
31
31
#include "os/os_threading.h"
32
32
#include "os/os_time.h"
33
+
#include "vive/vive_config.h"
33
34
34
35
#include "vive.h"
35
36
#include "vive_protocol.h"
36
37
#include "vive_controller.h"
37
-
#include "vive_config.h"
38
38
39
39
#ifdef XRT_OS_LINUX
40
40
#include <unistd.h>
+1
-2
src/xrt/drivers/vive/vive_controller.h
+1
-2
src/xrt/drivers/vive/vive_controller.h
+1
-1
src/xrt/drivers/vive/vive_device.h
+1
-1
src/xrt/drivers/vive/vive_device.h