The open source OpenXR runtime
comp: Move all glue code into client folder
+16
-14
+9
-7
src/xrt/compositor/CMakeLists.txt
+9
-7
src/xrt/compositor/CMakeLists.txt
···
1
-
# Copyright 2019, Collabora, Ltd.
1
+
# Copyright 2019-2020, Collabora, Ltd.
2
2
# SPDX-License-Identifier: BSL-1.0
3
3
4
4
spirv_shaders(SHADER_HEADERS
···
13
13
set(SOURCE_FILES
14
14
client/comp_vk_client.c
15
15
client/comp_vk_client.h
16
-
main/comp_client_interface.h
16
+
client/comp_vk_glue.c
17
17
main/comp_compositor.c
18
18
main/comp_compositor.h
19
19
main/comp_distortion.c
20
20
main/comp_distortion.h
21
21
main/comp_documentation.h
22
-
main/comp_glue_vk.c
23
22
main/comp_renderer.c
24
23
main/comp_renderer.h
25
24
main/comp_settings.c
···
40
39
list(APPEND SOURCE_FILES
41
40
client/comp_gl_client.c
42
41
client/comp_gl_client.h
43
-
main/comp_glue_gl.c
44
-
main/comp_glue_gles.c # TODO separate config for GLES
42
+
client/comp_gl_glue.c
43
+
client/comp_gles_glue.c # TODO separate config for GLES
45
44
)
46
45
endif()
47
46
if(BUILD_WITH_OPENGL AND BUILD_WITH_XLIB)
48
47
list(APPEND SOURCE_FILES
49
48
client/comp_gl_xlib_client.c
50
-
main/comp_glue_gl_xlib.c
49
+
client/comp_gl_xlib_client.h
50
+
client/comp_gl_xlib_glue.c
51
51
)
52
52
53
53
endif()
54
54
if(BUILD_WITH_OPENGL AND BUILD_WITH_EGL)
55
-
list(APPEND SOURCE_FILES main/comp_glue_egl.c)
55
+
list(APPEND SOURCE_FILES
56
+
client/comp_egl_glue.c
57
+
)
56
58
endif()
57
59
58
60
# generate wayland protocols
src/xrt/compositor/main/comp_glue_egl.c
src/xrt/compositor/client/comp_egl_glue.c
src/xrt/compositor/main/comp_glue_egl.c
src/xrt/compositor/client/comp_egl_glue.c
src/xrt/compositor/main/comp_glue_gl.c
src/xrt/compositor/client/comp_gl_glue.c
src/xrt/compositor/main/comp_glue_gl.c
src/xrt/compositor/client/comp_gl_glue.c
src/xrt/compositor/main/comp_glue_gl_xlib.c
src/xrt/compositor/client/comp_gl_xlib_glue.c
src/xrt/compositor/main/comp_glue_gl_xlib.c
src/xrt/compositor/client/comp_gl_xlib_glue.c
src/xrt/compositor/main/comp_glue_gles.c
src/xrt/compositor/client/comp_gles_glue.c
src/xrt/compositor/main/comp_glue_gles.c
src/xrt/compositor/client/comp_gles_glue.c
src/xrt/compositor/main/comp_glue_vk.c
src/xrt/compositor/client/comp_vk_glue.c
src/xrt/compositor/main/comp_glue_vk.c
src/xrt/compositor/client/comp_vk_glue.c
+7
-7
src/xrt/compositor/meson.build
+7
-7
src/xrt/compositor/meson.build
···
1
-
# Copyright 2019, Collabora, Ltd.
1
+
# Copyright 2019-2020, Collabora, Ltd.
2
2
# SPDX-License-Identifier: BSL-1.0
3
3
4
4
subdir('shaders')
···
9
9
compositor_srcs = [
10
10
'client/comp_vk_client.c',
11
11
'client/comp_vk_client.h',
12
-
'main/comp_client_interface.h',
12
+
'client/comp_vk_glue.c',
13
13
'main/comp_compositor.c',
14
14
'main/comp_compositor.h',
15
15
'main/comp_distortion.c',
16
16
'main/comp_distortion.h',
17
17
'main/comp_documentation.h',
18
-
'main/comp_glue_vk.c',
19
18
'main/comp_renderer.c',
20
19
'main/comp_renderer.h',
21
20
'main/comp_settings.c',
···
42
41
compositor_srcs += [
43
42
'client/comp_gl_client.c',
44
43
'client/comp_gl_client.h',
45
-
'main/comp_glue_gl.c',
46
-
'main/comp_glue_gles.c',
44
+
'client/comp_gl_glue.c',
45
+
'client/comp_gles_glue.c',
47
46
]
48
47
compositor_deps += [opengl]
49
48
endif
···
51
50
if build_opengl and build_xlib
52
51
compositor_srcs += [
53
52
'client/comp_gl_xlib_client.c',
54
-
'main/comp_glue_gl_xlib.c',
53
+
'client/comp_gl_xlib_client.h',
54
+
'client/comp_gl_xlib_glue.c',
55
55
]
56
56
compositor_deps += [x11]
57
57
endif
58
58
59
59
if build_egl
60
60
compositor_srcs += [
61
-
'main/comp_glue_egl.c',
61
+
'client/comp_egl_glue.c',
62
62
]
63
63
compositor_deps += [egl]
64
64
endif