From c6fbb06914ae73de809ba0d7f6916d08aa1ee091 Mon Sep 17 00:00:00 2001
From: Milan Jaros <milan.jaros@vsb.cz>
Date: Fri, 20 May 2022 12:35:54 +0200
Subject: [PATCH] fix timing
---
src/xrt/auxiliary/util/u_timing_render.c | 2 ++
src/xrt/compositor/multi/comp_multi_system.c | 5 +++++
src/xrt/targets/gui/gui_sdl2.c | 2 +-
src/xrt/targets/openxr/oxr_sdl2_hack.c | 2 +-
4 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/xrt/auxiliary/util/u_timing_render.c b/src/xrt/auxiliary/util/u_timing_render.c
index c8e8120a8..c73a5f96f 100644
--- a/src/xrt/auxiliary/util/u_timing_render.c
+++ b/src/xrt/auxiliary/util/u_timing_render.c
@@ -170,7 +170,9 @@ calc_period(const struct render_timing *rt)
// Error checking.
uint64_t base_period_ns = min_period(rt);
if (base_period_ns == 0) {
+#ifndef _WIN32
assert(false && "Have not yet received and samples from timing driver.");
+#endif
base_period_ns = U_TIME_1MS_IN_NS * 16; // Sure
}
diff --git a/src/xrt/compositor/multi/comp_multi_system.c b/src/xrt/compositor/multi/comp_multi_system.c
index 1f48a4dd9..3c8281408 100644
--- a/src/xrt/compositor/multi/comp_multi_system.c
+++ b/src/xrt/compositor/multi/comp_multi_system.c
@@ -521,6 +521,11 @@ comp_multi_create_system_compositor(struct xrt_compositor_native *xcn,
return XRT_ERROR_THREADING_INIT_FAILURE;
}
+ ret = os_mutex_init(&msc->list_and_timing_lock);
+ if (ret < 0) {
+ return XRT_ERROR_THREADING_INIT_FAILURE;
+ }
+
os_thread_helper_start(&msc->oth, thread_func, msc);
*out_xsysc = &msc->base;
diff --git a/src/xrt/targets/gui/gui_sdl2.c b/src/xrt/targets/gui/gui_sdl2.c
index 2ab5faf69..79ee4da09 100644
--- a/src/xrt/targets/gui/gui_sdl2.c
+++ b/src/xrt/targets/gui/gui_sdl2.c
@@ -100,7 +100,7 @@ gui_sdl2_init(struct sdl2_program *p)
SDL_GL_SetSwapInterval(1); // Enable vsync
// Setup OpenGL bindings.
- bool err = gladLoadGL((GLADloadfunc)SDL_GL_GetProcAddress) == 0;
+ bool err = gladLoadGL() == 0;
if (err) {
return -1;
}
diff --git a/src/xrt/targets/openxr/oxr_sdl2_hack.c b/src/xrt/targets/openxr/oxr_sdl2_hack.c
index 37423390c..39238b158 100644
--- a/src/xrt/targets/openxr/oxr_sdl2_hack.c
+++ b/src/xrt/targets/openxr/oxr_sdl2_hack.c
@@ -120,7 +120,7 @@ sdl2_window_init(struct sdl2_program *p)
SDL_GL_SetSwapInterval(1); // Enable vsync
// Setup OpenGL bindings.
- bool err = gladLoadGL((GLADloadfunc)SDL_GL_GetProcAddress) == 0;
+ bool err = gladLoadGL() == 0;
if (err) {
U_LOG_E("Failed to load GL functions!");
return;
--
GitLab