matrixfurry.com / monado
The open source OpenXR runtime
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

cmake: Split out finding GLX from the rest of OpenGL on Linux.

Fixes #132.

Ryan Pavlik 3bd0a07a 15c84141

+12 -4
+7 -3
CMakeLists.txt
··· 95 95 endif() 96 96 97 97 98 + find_package(OpenGL) 99 + set(OPENGL_WITHOUT_GLX_FOUND ${OPENGL_FOUND}) 98 100 if(CMAKE_SYSTEM_NAME STREQUAL "Linux") 99 101 set(XRT_HAVE_LINUX YES) 100 102 # Compositor backend ··· 124 126 125 127 pkg_check_modules(SURVIVE IMPORTED_TARGET survive) 126 128 else() 127 - find_package(OpenGL) 128 129 endif() 129 130 130 131 find_library(RT_LIBRARY rt) ··· 163 164 cmake_dependent_option(XRT_HAVE_XCB "Enable xcb support" ON "XCB_FOUND" OFF) 164 165 165 166 cmake_dependent_option(XRT_HAVE_VULKAN "Enable Vulkan Graphics API support (also needed for compositor)" ON "VULKAN_FOUND" OFF) 166 - cmake_dependent_option(XRT_HAVE_OPENGL "Enable OpenGL Graphics API support" ON "OPENGL_FOUND" OFF) 167 + cmake_dependent_option(XRT_HAVE_OPENGL "Enable OpenGL Graphics API support" ON "OPENGL_WITHOUT_GLX_FOUND" OFF) 168 + cmake_dependent_option(XRT_HAVE_OPENGL_GLX "Enable OpenGL Graphics API support on X11 (GLX)" ON "XRT_HAVE_OPENGL; OpenGL_GLX_FOUND" OFF) 167 169 cmake_dependent_option(XRT_HAVE_OPENGLES "Enable OpenGL-ES Graphics API support" ON "OpenGLES_FOUND" OFF) 168 - cmake_dependent_option(XRT_HAVE_EGL "Enable OpenGL on EGL Graphics API support" ON "EGL_FOUND; XRT_HAVE_OPENGL OR XRT_HAVE_OPENGLES" OFF) 170 + cmake_dependent_option(XRT_HAVE_EGL "Enable OpenGL(-ES) on EGL Graphics API support" ON "EGL_FOUND; XRT_HAVE_OPENGL OR XRT_HAVE_OPENGLES" OFF) 171 + 169 172 cmake_dependent_option(XRT_HAVE_DBUS "Enable dbus support (for BLE support)" ON "DBUS_FOUND" OFF) 170 173 cmake_dependent_option(XRT_FEATURE_COMPOSITOR_MAIN "Build main compositor host functionality" ON "XRT_HAVE_VULKAN; XRT_HAVE_WAYLAND OR XRT_HAVE_XCB OR ANDROID OR WIN32" OFF) 171 174 cmake_dependent_option(XRT_HAVE_LIBBSD "Enable libbsd support" ON "LIBBSD_FOUND" OFF) ··· 378 381 message(STATUS "# XCB: ${XRT_HAVE_XCB}") 379 382 message(STATUS "# VULKAN: ${XRT_HAVE_VULKAN}") 380 383 message(STATUS "# OPENGL: ${XRT_HAVE_OPENGL}") 384 + message(STATUS "# OPENGL_GLX: ${XRT_HAVE_OPENGL_GLX}") 381 385 message(STATUS "# OPENGLES: ${XRT_HAVE_OPENGLES}") 382 386 message(STATUS "# EGL: ${XRT_HAVE_EGL}") 383 387 message(STATUS "# DBUS: ${XRT_HAVE_DBUS}")
+4
doc/changes/misc_fixes/mr.963.md
··· 1 + --- 2 + - issue.132 3 + --- 4 + - Allow OpenGL to be found on *nix without requiring GLX, which should allow a Wayland-only build.
+1 -1
src/xrt/compositor/CMakeLists.txt
··· 83 83 client/comp_gl_eglimage_swapchain.h 84 84 ) 85 85 endif() 86 - if(XRT_HAVE_OPENGL AND XRT_HAVE_XLIB) 86 + if(XRT_HAVE_OPENGL_GLX AND XRT_HAVE_XLIB) 87 87 list(APPEND CLIENT_SOURCE_FILES 88 88 client/comp_gl_xlib_client.c 89 89 client/comp_gl_xlib_client.h