The open source OpenXR runtime
comp: Remove common directory
+14
-28
+2
-2
src/xrt/compositor/CMakeLists.txt
+2
-2
src/xrt/compositor/CMakeLists.txt
···
13
13
set(SOURCE_FILES
14
14
client/comp_vk_client.c
15
15
client/comp_vk_client.h
16
-
common/comp_vk_swapchain.h
17
-
common/comp_vk_swapchain.c
18
16
main/comp_client_interface.h
19
17
main/comp_compositor.c
20
18
main/comp_compositor.h
···
27
25
main/comp_settings.c
28
26
main/comp_settings.h
29
27
main/comp_swapchain.c
28
+
main/comp_vk_swapchain.c
29
+
main/comp_vk_swapchain.h
30
30
main/comp_window.h
31
31
)
32
32
src/xrt/compositor/common/comp_vk_swapchain.c
src/xrt/compositor/main/comp_vk_swapchain.c
src/xrt/compositor/common/comp_vk_swapchain.c
src/xrt/compositor/main/comp_vk_swapchain.c
+8
-8
src/xrt/compositor/common/comp_vk_swapchain.h
src/xrt/compositor/main/comp_vk_swapchain.h
+8
-8
src/xrt/compositor/common/comp_vk_swapchain.h
src/xrt/compositor/main/comp_vk_swapchain.h
···
26
26
/*!
27
27
* Callback when a @ref vk_swapchain changes size.
28
28
*
29
-
* @ingroup comp_common
29
+
* @ingroup comp
30
30
*/
31
31
typedef void (*vk_swapchain_cb)(uint32_t width, uint32_t height, void *priv);
32
32
33
33
/*!
34
34
* A pair of VkImage and VkImageView.
35
35
*
36
-
* @ingroup comp_common
36
+
* @ingroup comp
37
37
*/
38
38
struct vk_swapchain_buffer
39
39
{
···
44
44
/*!
45
45
* Wraps and manage VkSwapchainKHR and VkSurfaceKHR, used by @ref comp code.
46
46
*
47
-
* @ingroup comp_common
47
+
* @ingroup comp
48
48
*/
49
49
struct vk_swapchain
50
50
{
···
76
76
/*!
77
77
* Wraps and manage VkSwapchainKHR and VkSurfaceKHR, used by @ref comp code.
78
78
*
79
-
* @ingroup comp_common
79
+
* @ingroup comp
80
80
*/
81
81
void
82
82
vk_swapchain_init(struct vk_swapchain *sc,
···
87
87
/*!
88
88
* Initialize the given @ref vk_swapchain, does not allocate.
89
89
*
90
-
* @ingroup comp_common
90
+
* @ingroup comp
91
91
*/
92
92
void
93
93
vk_swapchain_create(struct vk_swapchain *sc,
···
100
100
/*!
101
101
* Acquire a image index from the given @ref vk_swapchain for rendering.
102
102
*
103
-
* @ingroup comp_common
103
+
* @ingroup comp
104
104
*/
105
105
VkResult
106
106
vk_swapchain_acquire_next_image(struct vk_swapchain *sc,
···
110
110
/*!
111
111
* Make the given @ref vk_swapchain present the next acquired image.
112
112
*
113
-
* @ingroup comp_common
113
+
* @ingroup comp
114
114
*/
115
115
VkResult
116
116
vk_swapchain_present(struct vk_swapchain *sc,
···
122
122
* Free all managed resources on the given @ref vk_swapchain,
123
123
* does not free the struct itself.
124
124
*
125
-
* @ingroup comp_common
125
+
* @ingroup comp
126
126
*/
127
127
void
128
128
vk_swapchain_cleanup(struct vk_swapchain *sc);
+1
-15
src/xrt/compositor/main/comp_documentation.h
+1
-15
src/xrt/compositor/main/comp_documentation.h
···
26
26
*/
27
27
28
28
/*!
29
-
* @defgroup comp_common Common compositor code
30
-
* @ingroup comp
31
-
*
32
-
* @brief Common compositor code shared between main and client code.
33
-
*/
34
-
35
-
/*!
36
29
* @dir compositor
37
30
* @ingroup xrt
38
31
*
39
-
* @brief Shared code and helpers for Monado.
32
+
* @brief The compositor for Monado.
40
33
*/
41
34
42
35
/*!
···
44
37
* @ingroup comp
45
38
*
46
39
* @brief Smaller pieces of auxiliary utilities code.
47
-
*/
48
-
49
-
/*!
50
-
* @dir compositor/common
51
-
* @ingroup comp
52
-
*
53
-
* @brief Common compositor code shared between main and client code.
54
40
*/
55
41
56
42
/*!
+1
-1
src/xrt/compositor/main/comp_window.h
+1
-1
src/xrt/compositor/main/comp_window.h
+2
-2
src/xrt/compositor/meson.build
+2
-2
src/xrt/compositor/meson.build
···
9
9
compositor_srcs = [
10
10
'client/comp_vk_client.c',
11
11
'client/comp_vk_client.h',
12
-
'common/comp_vk_swapchain.h',
13
-
'common/comp_vk_swapchain.c',
14
12
'main/comp_client_interface.h',
15
13
'main/comp_compositor.c',
16
14
'main/comp_compositor.h',
···
23
21
'main/comp_settings.c',
24
22
'main/comp_settings.h',
25
23
'main/comp_swapchain.c',
24
+
'main/comp_vk_swapchain.c',
25
+
'main/comp_vk_swapchain.h',
26
26
'main/comp_window.h',
27
27
]
28
28