The open source OpenXR runtime
st/oxr: Port to u_logging.
Remove foo print.
Use correct ENV variable XRT_COMPOSITOR_LOG for Vulkan log.
authored by
Lubosz Sarnecki
and committed by
Jakob Bornecrantz
521daac0
a8b01a89
+26
-33
+8
-9
src/xrt/state_trackers/oxr/oxr_instance.c
+8
-9
src/xrt/state_trackers/oxr/oxr_instance.c
···
260
260
261
261
const float left_override = debug_get_float_option_lfov_left();
262
262
if (left_override != 0.0f) {
263
-
printf(
263
+
U_LOG_I(
264
264
"Overriding left eye angle_left with %f radians (%i°), "
265
-
"and right eye angle_right with %f radians (%i°)\n",
265
+
"and right eye angle_right with %f radians (%i°)",
266
266
left_override, radtodeg_for_display(left_override),
267
267
-left_override, radtodeg_for_display(-left_override));
268
268
dev->hmd->views[0].fov.angle_left = left_override;
···
271
271
272
272
const float right_override = debug_get_float_option_lfov_right();
273
273
if (right_override != 0.0f) {
274
-
printf(
274
+
U_LOG_I(
275
275
"Overriding left eye angle_right with %f radians (%i°), "
276
-
"and right eye angle_left with %f radians (%i°)\n",
276
+
"and right eye angle_left with %f radians (%i°)",
277
277
right_override, radtodeg_for_display(right_override),
278
278
-right_override, radtodeg_for_display(-right_override));
279
279
dev->hmd->views[0].fov.angle_right = right_override;
···
282
282
283
283
const float up_override = debug_get_float_option_lfov_up();
284
284
if (up_override != 0.0f) {
285
-
printf("Overriding both eyes angle_up with %f radians (%i°)\n",
286
-
up_override, radtodeg_for_display(up_override));
285
+
U_LOG_I("Overriding both eyes angle_up with %f radians (%i°)",
286
+
up_override, radtodeg_for_display(up_override));
287
287
dev->hmd->views[0].fov.angle_up = up_override;
288
288
dev->hmd->views[1].fov.angle_up = up_override;
289
289
}
290
290
291
291
const float down_override = debug_get_float_option_lfov_down();
292
292
if (down_override != 0.0f) {
293
-
printf(
294
-
"Overriding both eyes angle_down with %f radians (%i°)\n",
295
-
down_override, radtodeg_for_display(down_override));
293
+
U_LOG_I("Overriding both eyes angle_down with %f radians (%i°)",
294
+
down_override, radtodeg_for_display(down_override));
296
295
dev->hmd->views[0].fov.angle_down = down_override;
297
296
dev->hmd->views[1].fov.angle_down = down_override;
298
297
}
+10
-16
src/xrt/state_trackers/oxr/oxr_session.c
+10
-16
src/xrt/state_trackers/oxr/oxr_session.c
···
252
252
oxr_event_push_XrEventDataMainSessionVisibilityChangedEXTX(
253
253
log, sess, xce.overlay.visible);
254
254
break;
255
-
default:
256
-
fprintf(stderr, "unhandled event type! %d", xce.type);
257
-
break;
255
+
default: U_LOG_W("unhandled event type! %d", xce.type); break;
258
256
}
259
257
}
260
258
···
318
316
interval, &predicted);
319
317
320
318
if (sess->sys->inst->debug_views) {
321
-
fprintf(stderr,
322
-
"\toriginal quat = {%f, %f, %f, %f} "
319
+
U_LOG_D("\toriginal quat = {%f, %f, %f, %f} "
323
320
"(time requested: %" PRIi64
324
321
", Interval %" PRIi64
325
322
" nsec, with "
326
-
"static interval %f s)\n",
323
+
"static interval %f s)",
327
324
pose->orientation.x, pose->orientation.y,
328
325
pose->orientation.z, pose->orientation.w,
329
326
at_time, ns_diff, interval);
···
345
342
return;
346
343
}
347
344
348
-
fprintf(stderr, "\tviews[%i].fov = {%f, %f, %f, %f}\n", index,
349
-
fov->angle_left, fov->angle_right, fov->angle_up,
350
-
fov->angle_down);
345
+
U_LOG_D("views[%i].fov = {%f, %f, %f, %f}", index, fov->angle_left,
346
+
fov->angle_right, fov->angle_up, fov->angle_down);
351
347
}
352
348
353
349
void
···
359
355
return;
360
356
}
361
357
362
-
fprintf(stderr, "\tviews[%i].pose = {{%f, %f, %f, %f}, {%f, %f, %f}}\n",
363
-
index, pose->orientation.x, pose->orientation.y,
364
-
pose->orientation.z, pose->orientation.w, pose->position.x,
365
-
pose->position.y, pose->position.z);
358
+
U_LOG_D("views[%i].pose = {{%f, %f, %f, %f}, {%f, %f, %f}}", index,
359
+
pose->orientation.x, pose->orientation.y, pose->orientation.z,
360
+
pose->orientation.w, pose->position.x, pose->position.y,
361
+
pose->position.z);
366
362
}
367
363
368
364
static inline XrViewStateFlags
···
419
415
// End two call handling.
420
416
421
417
if (sess->sys->inst->debug_views) {
422
-
fprintf(stderr, "%s\n", __func__);
423
-
fprintf(stderr, "\tviewLocateInfo->displayTime %" PRIu64 "\n",
418
+
U_LOG_D("viewLocateInfo->displayTime %" PRIu64,
424
419
viewLocateInfo->displayTime);
425
420
}
426
421
···
944
939
}
945
940
946
941
if (view->subImage.swapchain == XR_NULL_HANDLE) {
947
-
printf("foo\n");
948
942
return oxr_error(
949
943
log, XR_ERROR_HANDLE_INVALID,
950
944
"(frameEndInfo->layers[%u]->views[%i]->subImage."
+4
-4
src/xrt/state_trackers/oxr/oxr_space.c
+4
-4
src/xrt/state_trackers/oxr/oxr_space.c
···
401
401
struct xrt_vec3 *p = &pose->position;
402
402
struct xrt_quat *q = &pose->orientation;
403
403
404
-
fprintf(stderr, "%s (%f, %f, %f) (%f, %f, %f, %f)\n", prefix, p->x,
405
-
p->y, p->z, q->x, q->y, q->z, q->w);
404
+
U_LOG_D("%s (%f, %f, %f) (%f, %f, %f, %f)", prefix, p->x, p->y, p->z,
405
+
q->x, q->y, q->z, q->w);
406
406
}
407
407
408
408
static void
···
413
413
}
414
414
415
415
const char *type_str = get_ref_space_type_short_str(spc);
416
-
fprintf(stderr, "\t%s->type %s\n\t%s->pose", name, type_str, name);
416
+
U_LOG_D("\t%s->type %s\n\t%s->pose", name, type_str, name);
417
417
print_pose(spc->sess, "", &spc->pose);
418
418
}
419
419
···
460
460
XrSpaceLocation *location)
461
461
{
462
462
if (spc->sess->sys->inst->debug_spaces) {
463
-
fprintf(stderr, "%s\n", __func__);
463
+
U_LOG_D("%s", __func__);
464
464
}
465
465
print_space("space", spc);
466
466
print_space("baseSpace", baseSpc);
+4
-4
src/xrt/state_trackers/oxr/oxr_vulkan.c
+4
-4
src/xrt/state_trackers/oxr/oxr_vulkan.c
···
69
69
return XR_SUCCESS;
70
70
}
71
71
72
-
DEBUG_GET_ONCE_BOOL_OPTION(print_debug, "XRT_COMPOSITOR_PRINT_DEBUG", false)
72
+
DEBUG_GET_ONCE_LOG_OPTION(compositor_log, "XRT_COMPOSITOR_LOG", U_LOGGING_WARN)
73
73
74
74
XrResult
75
75
oxr_vk_get_physical_device(struct oxr_logger *log,
···
119
119
sys->xcn->base.info.client_vk_deviceUUID[i]);
120
120
}
121
121
122
-
bool print_debug = debug_get_bool_option_print_debug();
122
+
enum u_logging_level ll = debug_get_log_option_compositor_log();
123
123
int gpu_index = -1;
124
124
for (uint32_t i = 0; i < count; i++) {
125
125
VkPhysicalDeviceIDProperties pdidp = {
···
132
132
vkGetPhysicalDeviceProperties2(phys[i], &pdp2);
133
133
134
134
char uuid_str[XRT_GPU_UUID_SIZE * 3 + 1] = {0};
135
-
if (print_debug) {
135
+
if (ll <= U_LOGGING_DEBUG) {
136
136
for (int i = 0; i < XRT_GPU_UUID_SIZE; i++) {
137
137
sprintf(uuid_str + i * 3, "%02x ",
138
138
pdidp.deviceUUID[i]);
···
144
144
sys->xcn->base.info.client_vk_deviceUUID,
145
145
XRT_GPU_UUID_SIZE) == 0) {
146
146
gpu_index = i;
147
-
if (print_debug) {
147
+
if (ll <= U_LOGGING_DEBUG) {
148
148
oxr_log(log,
149
149
"Using GPU %d with uuid %s suggested "
150
150
"by runtime",