From cef025a5469fab0611ffb4be006c04ff692fd22b Mon Sep 17 00:00:00 2001 From: Moses Turner Date: Sat, 20 Nov 2021 00:11:06 +0000 Subject: [PATCH] Revert "st/oxr: fix building on linux with OPENGL_GLX OFF" This reverts commit d20f8f4363ea34a8d51f9bfa9b7477130cccb89b --- src/xrt/state_trackers/oxr/oxr_objects.h | 4 ++-- src/xrt/state_trackers/oxr/oxr_session.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/xrt/state_trackers/oxr/oxr_objects.h b/src/xrt/state_trackers/oxr/oxr_objects.h index b0ac564a3..15d198f5c 100644 --- a/src/xrt/state_trackers/oxr/oxr_objects.h +++ b/src/xrt/state_trackers/oxr/oxr_objects.h @@ -907,7 +907,7 @@ oxr_xdev_get_hand_tracking_at(struct oxr_logger *log, * */ -#ifdef XR_USE_GRAPHICS_API_OPENGL_GLX +#ifdef XR_USE_GRAPHICS_API_OPENGL #ifdef XR_USE_PLATFORM_XLIB XrResult @@ -917,7 +917,7 @@ oxr_session_populate_gl_xlib(struct oxr_logger *log, struct oxr_session *sess); #endif // XR_USE_PLATFORM_XLIB -#endif // XR_USE_GRAPHICS_API_OPENGL_GLX +#endif // XR_USE_GRAPHICS_API_OPENGL #if defined(XR_USE_GRAPHICS_API_OPENGL) || defined(XR_USE_GRAPHICS_API_OPENGL_ES) XrResult diff --git a/src/xrt/state_trackers/oxr/oxr_session.c b/src/xrt/state_trackers/oxr/oxr_session.c index 6c5953bbc..1021bc360 100644 --- a/src/xrt/state_trackers/oxr/oxr_session.c +++ b/src/xrt/state_trackers/oxr/oxr_session.c @@ -639,7 +639,7 @@ oxr_session_create_impl(struct oxr_logger *log, const struct xrt_session_info *xsi, struct oxr_session **out_session) { -#if defined(XR_USE_PLATFORM_XLIB) && defined(XR_USE_GRAPHICS_API_OPENGL_GLX) +#if defined(XR_USE_PLATFORM_XLIB) && defined(XR_USE_GRAPHICS_API_OPENGL) XrGraphicsBindingOpenGLXlibKHR const *opengl_xlib = OXR_GET_INPUT_FROM_CHAIN( createInfo, XR_TYPE_GRAPHICS_BINDING_OPENGL_XLIB_KHR, XrGraphicsBindingOpenGLXlibKHR); if (opengl_xlib != NULL) {