mirrors/monado
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/monado/monado.git synced 2025-01-06 07:06:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "st/oxr: fix building on linux with OPENGL_GLX OFF"

Browse source 
This reverts commit d20f8f4363
This commit is contained in:
Moses Turner 2021-11-20 00:11:06 +00:00
parent be5b9c9d88
commit cef025a546
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/xrt/state_trackers/oxr/oxr_objects.h
View file

@ -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 #ifdef XR_USE_PLATFORM_XLIB
XrResult XrResult
@ -917,7 +917,7 @@ oxr_session_populate_gl_xlib(struct oxr_logger *log,
struct oxr_session *sess); struct oxr_session *sess);
#endif // XR_USE_PLATFORM_XLIB #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) #if defined(XR_USE_GRAPHICS_API_OPENGL) || defined(XR_USE_GRAPHICS_API_OPENGL_ES)
XrResult XrResult

2
src/xrt/state_trackers/oxr/oxr_session.c
View file

@ -639,7 +639,7 @@ oxr_session_create_impl(struct oxr_logger *log,
const struct xrt_session_info *xsi, const struct xrt_session_info *xsi,
struct oxr_session **out_session) 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( XrGraphicsBindingOpenGLXlibKHR const *opengl_xlib = OXR_GET_INPUT_FROM_CHAIN(
createInfo, XR_TYPE_GRAPHICS_BINDING_OPENGL_XLIB_KHR, XrGraphicsBindingOpenGLXlibKHR); createInfo, XR_TYPE_GRAPHICS_BINDING_OPENGL_XLIB_KHR, XrGraphicsBindingOpenGLXlibKHR);
if (opengl_xlib != NULL) { if (opengl_xlib != NULL) {