matrixfurry.com
The open source OpenXR runtime
st/gui: Fixed winsock incompatibility in remote driver gui controls
Part-of: <https://gitlab.freedesktop.org/monado/monado/-/merge_requests/2642>
+10
-1
src/xrt/state_trackers/gui/gui_scene_remote.c
+10
-1
src/xrt/state_trackers/gui/gui_scene_remote.c
···
413
413
igBegin("Remote control", NULL, 0);
414
414
415
415
#ifdef XRT_BUILD_DRIVER_REMOTE
416
-
if (gr->rc.fd < 0) {
416
+
#ifdef XRT_OS_WINDOWS
417
+
bool socket_invalid = gr->rc.fd == INVALID_SOCKET;
418
+
#else
419
+
bool socket_invalid = gr->rc.fd < 0;
420
+
#endif
421
+
if (socket_invalid) {
417
422
on_not_connected(gr, p);
418
423
} else {
419
424
on_connected(gr, p);
···
451
456
452
457
gr->base.render = scene_render;
453
458
gr->base.destroy = scene_destroy;
459
+
#ifdef XRT_OS_WINDOWS
460
+
gr->rc.fd = INVALID_SOCKET;
461
+
#else
454
462
gr->rc.fd = -1;
463
+
#endif
455
464
456
465
// GUI input defaults.
457
466
if (address != NULL) {