+19 -3

src/xrt/compositor/CMakeLists.txt

··· 17 17 18 18 set(CLIENT_SOURCE_FILES) 19 19 20 20 + set(UTIL_SOURCE_FILES 21 21 + util/comp_swapchain.h 22 22 + util/comp_swapchain.c 23 23 + util/comp_sync.h 24 24 + util/comp_sync.c 25 25 + ) 26 26 + 20 27 set(MAIN_SOURCE_FILES 21 28 main/comp_compositor.c 22 29 main/comp_compositor.h ··· 25 32 main/comp_renderer.h 26 33 main/comp_settings.c 27 34 main/comp_settings.h 28 28 - main/comp_swapchain.c 29 29 - main/comp_sync.c 30 35 main/comp_target.h 31 36 main/comp_target_swapchain.c 32 37 main/comp_target_swapchain.h ··· 114 119 115 120 116 121 ## 122 122 + # Util library 123 123 + # 124 124 + 125 125 + if(XRT_HAVE_VULKAN) 126 126 + add_library(comp_util STATIC ${UTIL_SOURCE_FILES}) 127 127 + target_link_libraries(comp_util PUBLIC xrt-interfaces PRIVATE aux_util aux_os aux_vk) 128 128 + target_include_directories(comp_util PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}) 129 129 + endif() 130 130 + 131 131 + 132 132 + ## 117 133 # Main library 118 134 # 119 135 ··· 208 224 endif() 209 225 210 226 add_library(comp_main STATIC ${SHADER_HEADERS} ${MAIN_SOURCE_FILES}) 211 211 - target_link_libraries(comp_main PUBLIC xrt-interfaces PRIVATE aux_util aux_os aux_vk) 227 227 + target_link_libraries(comp_main PUBLIC xrt-interfaces PRIVATE aux_util aux_os aux_vk comp_util) 212 228 target_include_directories(comp_main PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}) 213 229 target_include_directories(comp_main SYSTEM PRIVATE 214 230 # Shaders - marked SYSTEM so we get no warnings

+7 -6

src/xrt/compositor/main/comp_compositor.h

··· 19 19 20 20 #include "vk/vk_image_allocator.h" 21 21 22 22 - #include "main/comp_sync.h" 22 22 + #include "util/comp_sync.h" 23 23 + #include "util/comp_swapchain.h" 24 24 + 25 25 + #include "render/comp_render.h" 26 26 + 27 27 + #include "main/comp_target.h" 28 28 + #include "main/comp_window.h" 23 29 #include "main/comp_settings.h" 24 24 - #include "main/comp_swapchain.h" 25 25 - #include "main/comp_window.h" 26 30 #include "main/comp_renderer.h" 27 27 - #include "main/comp_target.h" 28 28 - 29 29 - #include "render/comp_render.h" 30 31 31 32 32 33 #ifdef __cplusplus

+1 -1

src/xrt/compositor/main/comp_swapchain.c src/xrt/compositor/util/comp_swapchain.c

··· 13 13 #include "util/u_misc.h" 14 14 #include "util/u_handles.h" 15 15 16 16 - #include "main/comp_swapchain.h" 16 16 + #include "util/comp_swapchain.h" 17 17 18 18 #include <stdio.h> 19 19 #include <stdlib.h>

src/xrt/compositor/main/comp_swapchain.h src/xrt/compositor/util/comp_swapchain.h

+2 -2

src/xrt/compositor/main/comp_sync.c src/xrt/compositor/util/comp_sync.c

··· 9 9 10 10 #include "xrt/xrt_config_os.h" 11 11 12 12 - #include "main/comp_sync.h" 13 13 - 14 12 #include "util/u_misc.h" 15 13 #include "util/u_handles.h" 16 14 #include "util/u_trace_marker.h" 15 15 + 16 16 + #include "util/comp_sync.h" 17 17 18 18 #include <stdio.h> 19 19 #include <stdlib.h>

src/xrt/compositor/main/comp_sync.h src/xrt/compositor/util/comp_sync.h

+4 -2

src/xrt/compositor/meson.build

··· 20 20 'main/comp_renderer.h', 21 21 'main/comp_settings.c', 22 22 'main/comp_settings.h', 23 23 - 'main/comp_swapchain.c', 24 24 - 'main/comp_sync.c', 25 23 'main/comp_target.h', 26 24 'main/comp_target_swapchain.c', 27 25 'main/comp_target_swapchain.h', ··· 39 37 'render/comp_resources.c', 40 38 'render/comp_shaders.c', 41 39 'render/comp_util.c', 40 40 + 'util/comp_swapchain.h', 41 41 + 'util/comp_swapchain.c', 42 42 + 'util/comp_sync.h', 43 43 + 'util/comp_sync.c', 42 44 ] 43 45 44 46 compile_args = []