st/gui: Do not call gui_prober_select in debug scene

The open source OpenXR runtime

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>

Jakob Bornecrantz 10 months ago 56d1abab 58be6313

+8 -6

2 changed files

expand all

unified split

src

xrt

state_trackers

gui

gui_scene_debug.c

targets

gui

gui_sdl2_main.c

-5

src/xrt/state_trackers/gui/gui_scene_debug.c

··· 1027 void 1028 gui_scene_debug(struct gui_program *p) 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 struct debug_scene *ds = U_TYPED_CALLOC(struct debug_scene); 1036 1037 ds->base.render = scene_render;

··· 1027 void 1028 gui_scene_debug(struct gui_program *p) 1029 { 1030 struct debug_scene *ds = U_TYPED_CALLOC(struct debug_scene); 1031 1032 ds->base.render = scene_render;

+8 -1

src/xrt/targets/gui/gui_sdl2_main.c

··· 39 40 // First scene to start with. 41 if (argc >= 2 && strcmp("debug", argv[1]) == 0) { 42 - // We have created a prober select devices now. 43 gui_scene_debug(&p.base); 44 } else if (argc >= 2 && strcmp("calibrate", argv[1]) == 0) { 45 gui_scene_select_video_calibrate(&p.base);

··· 39 40 // First scene to start with. 41 if (argc >= 2 && strcmp("debug", argv[1]) == 0) { 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 + 50 gui_scene_debug(&p.base); 51 } else if (argc >= 2 && strcmp("calibrate", argv[1]) == 0) { 52 gui_scene_select_video_calibrate(&p.base);