The open source OpenXR runtime
0
fork

Configure Feed

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

xrt: Move OpenXR defines to header

Part-of: <https://gitlab.freedesktop.org/monado/monado/-/merge_requests/2194>

authored by

Christoph Haag and committed by
Marge Bot
8dd24bf2 8b2571b6

+64 -23
+41
src/xrt/include/xrt/CMakeLists.txt
··· 31 31 ${CMAKE_CURRENT_SOURCE_DIR}/xrt_config_android.h.cmake_in 32 32 ${CMAKE_CURRENT_BINARY_DIR}/xrt_config_android.h @ONLY 33 33 ) 34 + 35 + if(XRT_HAVE_VULKAN) 36 + set(XR_USE_GRAPHICS_API_VULKAN ON) 37 + endif() 38 + 39 + if(XRT_HAVE_OPENGL) 40 + set(XR_USE_GRAPHICS_API_OPENGL ON) 41 + endif() 42 + 43 + if(XRT_HAVE_OPENGLES) 44 + set(XR_USE_GRAPHICS_API_OPENGL_ES ON) 45 + endif() 46 + 47 + if(XRT_HAVE_OPENGL_GLX AND XRT_HAVE_XLIB) 48 + set(XR_USE_PLATFORM_XLIB ON) 49 + endif() 50 + 51 + if(XRT_HAVE_EGL) 52 + set(XR_USE_PLATFORM_EGL ON) 53 + endif() 54 + 55 + if(XRT_HAVE_D3D11) 56 + set(XR_USE_GRAPHICS_API_D3D11 ON) 57 + endif() 58 + 59 + if(XRT_HAVE_D3D12) 60 + set(XR_USE_GRAPHICS_API_D3D12 ON) 61 + endif() 62 + 63 + if(ANDROID) 64 + set(XR_USE_PLATFORM_ANDROID ON) 65 + endif() 66 + 67 + if(WIN32) 68 + set(XR_USE_PLATFORM_WIN32 ON) 69 + endif() 70 + 71 + configure_file( 72 + ${CMAKE_CURRENT_SOURCE_DIR}/xrt_openxr_config.h.cmake_in 73 + ${CMAKE_CURRENT_BINARY_DIR}/xrt_openxr_config.h @ONLY 74 + )
+20
src/xrt/include/xrt/xrt_openxr_config.h.cmake_in
··· 1 + // Copyright 2024, Collabora, Ltd. 2 + // SPDX-License-Identifier: BSL-1.0 3 + /*! 4 + * @file 5 + * @brief What OpenXR defines are enabled in this oxr build. 6 + * @author Christoph Haag <christoph.haag@collabora.com> 7 + * @ingroup xrt_iface 8 + */ 9 + 10 + #pragma once 11 + 12 + #cmakedefine XR_USE_GRAPHICS_API_VULKAN 13 + #cmakedefine XR_USE_GRAPHICS_API_OPENGL 14 + #cmakedefine XR_USE_GRAPHICS_API_OPENGL_ES 15 + #cmakedefine XR_USE_PLATFORM_EGL 16 + #cmakedefine XR_USE_PLATFORM_XLIB 17 + #cmakedefine XR_USE_GRAPHICS_API_D3D11 18 + #cmakedefine XR_USE_GRAPHICS_API_D3D12 19 + #cmakedefine XR_USE_PLATFORM_ANDROID 20 + #cmakedefine XR_USE_PLATFORM_WIN32
+2
src/xrt/include/xrt/xrt_openxr_includes.h
··· 10 10 11 11 #pragma once 12 12 13 + #include "xrt/xrt_openxr_config.h" 14 + 13 15 //! @todo Move these to the build system instead. 14 16 #define XR_USE_TIMESPEC 1 15 17
+1 -23
src/xrt/state_trackers/oxr/CMakeLists.txt
··· 53 53 oxr_xdev.c 54 54 ) 55 55 56 - set(OXR_COMPILE_DEFINITIONS) 57 - 58 56 if(XRT_HAVE_VULKAN) 59 - list(APPEND OXR_COMPILE_DEFINITIONS XR_USE_GRAPHICS_API_VULKAN) 60 57 target_sources(st_oxr PRIVATE oxr_session_gfx_vk.c oxr_swapchain_vk.c oxr_vulkan.c) 61 58 target_link_libraries(st_oxr PUBLIC Vulkan::Vulkan) 62 59 endif() 63 60 64 - if(XRT_HAVE_OPENGL) 65 - list(APPEND OXR_COMPILE_DEFINITIONS XR_USE_GRAPHICS_API_OPENGL) 66 - endif() 67 - if(XRT_HAVE_OPENGLES) 68 - list(APPEND OXR_COMPILE_DEFINITIONS XR_USE_GRAPHICS_API_OPENGL_ES) 69 - endif() 70 - 71 61 if(XRT_HAVE_OPENGL OR XRT_HAVE_OPENGLES) 72 62 target_sources(st_oxr PRIVATE oxr_swapchain_gl.c) 73 63 target_link_libraries(st_oxr PUBLIC aux_ogl) 74 64 endif() 75 65 76 66 if(XRT_HAVE_OPENGL_GLX AND XRT_HAVE_XLIB) 77 - list(APPEND OXR_COMPILE_DEFINITIONS XR_USE_PLATFORM_XLIB) 78 67 target_sources(st_oxr PRIVATE oxr_session_gfx_gl_xlib.c) 79 68 endif() 80 69 81 70 if(XRT_HAVE_EGL) 82 - list(APPEND OXR_COMPILE_DEFINITIONS XR_USE_PLATFORM_EGL) 83 71 target_sources(st_oxr PRIVATE oxr_session_gfx_egl.c) 84 72 endif() 85 73 ··· 89 77 endif() 90 78 91 79 if(XRT_HAVE_D3D11) 92 - list(APPEND OXR_COMPILE_DEFINITIONS XR_USE_GRAPHICS_API_D3D11) 93 80 target_sources(st_oxr PRIVATE oxr_session_gfx_d3d11.c oxr_swapchain_d3d11.c oxr_d3d11.cpp) 94 81 endif() 95 82 96 83 if(XRT_HAVE_D3D12) 97 - list(APPEND OXR_COMPILE_DEFINITIONS XR_USE_GRAPHICS_API_D3D12) 98 84 target_sources(st_oxr PRIVATE oxr_session_gfx_d3d12.c oxr_swapchain_d3d12.c oxr_d3d12.cpp) 99 85 target_link_libraries(st_oxr PRIVATE aux_d3d) 100 86 endif() 101 87 102 88 if(ANDROID) 103 - list(APPEND OXR_COMPILE_DEFINITIONS XR_USE_PLATFORM_ANDROID) 104 89 target_sources(st_oxr PRIVATE oxr_session_gfx_gles_android.c) 105 90 target_link_libraries(st_oxr PRIVATE aux_android) 106 91 endif() 92 + 107 93 if(WIN32) 108 94 target_link_libraries(st_oxr PRIVATE kernel32) 109 - list(APPEND OXR_COMPILE_DEFINITIONS XR_USE_PLATFORM_WIN32) 110 95 endif() 111 96 112 97 if(WIN32 AND XRT_HAVE_OPENGL) 113 98 target_sources(st_oxr PRIVATE oxr_session_gfx_gl_win32.c) 114 99 endif() 115 100 116 - if(WIN32) 117 - list(APPEND OXR_COMPILE_DEFINITIONS XR_USE_PLATFORM_WIN32) 118 - endif() 119 - 120 101 if(XRT_FEATURE_OPENXR_LAYER_PASSTHROUGH) 121 102 target_sources(st_oxr PRIVATE oxr_api_passthrough.c oxr_passthrough.c) 122 103 endif() ··· 128 109 if(XRT_FEATURE_OPENXR_FACIAL_TRACKING_HTC) 129 110 target_sources(st_oxr PRIVATE oxr_api_face_tracking.c oxr_face_tracking.c) 130 111 endif() 131 - 132 - target_compile_definitions(st_oxr PRIVATE ${OXR_COMPILE_DEFINITIONS}) 133 - target_compile_definitions(oxr-interfaces INTERFACE ${OXR_COMPILE_DEFINITIONS}) 134 112 135 113 target_link_libraries( 136 114 st_oxr