matrixfurry.com
The open source OpenXR runtime
st/gui: Do not call gui_prober_select in debug scene
Call it in the monado-gui thread, this was the only place it was used.
Part-of: <https://gitlab.freedesktop.org/monado/monado/-/merge_requests/2399>
-5
src/xrt/state_trackers/gui/gui_scene_debug.c
-5
src/xrt/state_trackers/gui/gui_scene_debug.c
···
1027
1027
void
1028
1028
gui_scene_debug(struct gui_program *p)
1029
1029
{
1030
-
// Only create devices if we have a instance and no system devices.
1031
-
if (p->instance != NULL && p->xsysd == NULL) {
1032
-
gui_prober_select(p);
1033
-
}
1034
-
1035
1030
struct debug_scene *ds = U_TYPED_CALLOC(struct debug_scene);
1036
1031
1037
1032
ds->base.render = scene_render;
+8
-1
src/xrt/targets/gui/gui_sdl2_main.c
+8
-1
src/xrt/targets/gui/gui_sdl2_main.c
···
39
39
40
40
// First scene to start with.
41
41
if (argc >= 2 && strcmp("debug", argv[1]) == 0) {
42
-
// We have created a prober select devices now.
42
+
/*
43
+
* We have created a prober select devices now, only create
44
+
* devices if we have a instance and no system devices.
45
+
*/
46
+
if (p.base.instance != NULL && p.base.xsysd == NULL) {
47
+
gui_prober_select(&p.base);
48
+
}
49
+
43
50
gui_scene_debug(&p.base);
44
51
} else if (argc >= 2 && strcmp("calibrate", argv[1]) == 0) {
45
52
gui_scene_select_video_calibrate(&p.base);