The open source OpenXR runtime

t/common: Tidy builders a bit [NFC]

+54 -20
+1
src/xrt/targets/common/target_builder_lighthouse.c
··· 283 283 return false; 284 284 } 285 285 286 + 286 287 /* 287 288 * 288 289 * Member functions.
+7
src/xrt/targets/common/target_builder_north_star.c
··· 369 369 } 370 370 #endif 371 371 372 + 373 + /* 374 + * 375 + * Member functions. 376 + * 377 + */ 378 + 372 379 // Note: We're just checking for the config file's existence 373 380 static xrt_result_t 374 381 ns_estimate_system(struct xrt_builder *xb, cJSON *config, struct xrt_prober *xp, struct xrt_builder_estimate *estimate)
+20 -10
src/xrt/targets/common/target_builder_nreal_air.c
··· 32 32 #define NA_WARN(...) U_LOG_IFL_W(nreal_air_log_level, __VA_ARGS__) 33 33 #define NA_ERROR(...) U_LOG_IFL_E(nreal_air_log_level, __VA_ARGS__) 34 34 35 + 35 36 /* 36 37 * 37 - * Defines & structs. 38 + * Misc stuff. 38 39 * 39 40 */ 40 41 41 42 DEBUG_GET_ONCE_LOG_OPTION(nreal_air_log, "NA_LOG", U_LOGGING_WARN) 43 + 44 + static const char *driver_list[] = { 45 + "nreal_air", 46 + }; 47 + 48 + 49 + /* 50 + * 51 + * Member functions. 52 + * 53 + */ 42 54 43 55 static xrt_result_t 44 56 nreal_air_estimate_system(struct xrt_builder *xb, ··· 181 193 return XRT_ERROR_DEVICE_CREATION_FAILED; 182 194 } 183 195 184 - /* 185 - * 186 - * 'Exported' functions. 187 - * 188 - */ 189 - static const char *driver_list[] = { 190 - "nreal_air", 191 - }; 192 - 193 196 static void 194 197 nreal_air_destroy(struct xrt_builder *xb) 195 198 { 196 199 free(xb); 197 200 } 201 + 202 + 203 + /* 204 + * 205 + * 'Exported' functions. 206 + * 207 + */ 198 208 199 209 struct xrt_builder * 200 210 nreal_air_builder_create(void)
+19 -10
src/xrt/targets/common/target_builder_rift_s.c
··· 40 40 41 41 /* 42 42 * 43 - * Defines & structs. 43 + * Misc stuff. 44 44 * 45 45 */ 46 46 ··· 49 49 #ifdef XRT_BUILD_DRIVER_HANDTRACKING 50 50 DEBUG_GET_ONCE_BOOL_OPTION(rift_s_hand_tracking_as_controller, "RIFT_S_HAND_TRACKING_AS_CONTROLLERS", false) 51 51 #endif 52 + 53 + static const char *driver_list[] = { 54 + "rift-s", 55 + }; 56 + 57 + 58 + /* 59 + * 60 + * Member functions. 61 + * 62 + */ 52 63 53 64 static xrt_result_t 54 65 rift_s_estimate_system(struct xrt_builder *xb, ··· 228 239 return XRT_ERROR_DEVICE_CREATION_FAILED; 229 240 } 230 241 231 - /* 232 - * 233 - * 'Exported' functions. 234 - * 235 - */ 236 - static const char *driver_list[] = { 237 - "rift-s", 238 - }; 239 - 240 242 static void 241 243 rift_s_destroy(struct xrt_builder *xb) 242 244 { 243 245 free(xb); 244 246 } 247 + 248 + 249 + /* 250 + * 251 + * 'Exported' functions. 252 + * 253 + */ 245 254 246 255 struct xrt_builder * 247 256 rift_s_builder_create(void)
+7
src/xrt/targets/common/target_builder_simulavr.c
··· 133 133 return good; 134 134 } 135 135 136 + 137 + /* 138 + * 139 + * Member functions. 140 + * 141 + */ 142 + 136 143 static xrt_result_t 137 144 svr_estimate_system(struct xrt_builder *xb, cJSON *config, struct xrt_prober *xp, struct xrt_builder_estimate *estimate) 138 145 {