Rename public backend headers

The backend headers are renamed from compositor-foo.h to backend-foo.h to
better describe their purpose. These headers are public libweston API for each
specific backend.

The headers will also be used like

 #include <libweston/backend-drm.h>

instead of

 #include <compositor-drm.h>

to give them a more explicit namespace.

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.com>
dev
Pekka Paalanen 6 years ago
parent 3d5d9476e3
commit 7571027f17
  1. 12
      compositor/main.c
  2. 0
      include/libweston/backend-drm.h
  3. 0
      include/libweston/backend-fbdev.h
  4. 0
      include/libweston/backend-headless.h
  5. 0
      include/libweston/backend-rdp.h
  6. 0
      include/libweston/backend-wayland.h
  7. 0
      include/libweston/backend-x11.h
  8. 7
      include/libweston/meson.build
  9. 2
      libweston/compositor-drm.c
  10. 2
      libweston/compositor-fbdev.c
  11. 2
      libweston/compositor-headless.c
  12. 2
      libweston/compositor-rdp.c
  13. 2
      libweston/compositor-wayland.c
  14. 2
      libweston/compositor-x11.c
  15. 12
      libweston/meson.build
  16. 2
      remoting/remoting-plugin.c

@ -55,12 +55,12 @@
#include "version.h" #include "version.h"
#include "weston.h" #include "weston.h"
#include "compositor-drm.h" #include <libweston/backend-drm.h>
#include "compositor-headless.h" #include <libweston/backend-headless.h>
#include "compositor-rdp.h" #include <libweston/backend-rdp.h>
#include "compositor-fbdev.h" #include <libweston/backend-fbdev.h>
#include "compositor-x11.h" #include <libweston/backend-x11.h>
#include "compositor-wayland.h" #include <libweston/backend-wayland.h>
#include "windowed-output-api.h" #include "windowed-output-api.h"
#include "weston-debug.h" #include "weston-debug.h"
#include "../remoting/remoting-plugin.h" #include "../remoting/remoting-plugin.h"

@ -3,3 +3,10 @@ install_headers(
'timeline-object.h', 'timeline-object.h',
subdir: dir_include_libweston_install subdir: dir_include_libweston_install
) )
backend_drm_h = files('backend-drm.h')
backend_fbdev_h = files('backend-fbdev.h')
backend_headless_h = files('backend-headless.h')
backend_rdp_h = files('backend-rdp.h')
backend_wayland_h = files('backend-wayland.h')
backend_x11_h = files('backend-x11.h')

@ -51,7 +51,7 @@
#include <libudev.h> #include <libudev.h>
#include <libweston/libweston.h> #include <libweston/libweston.h>
#include "compositor-drm.h" #include <libweston/backend-drm.h>
#include "weston-debug.h" #include "weston-debug.h"
#include "shared/helpers.h" #include "shared/helpers.h"
#include "shared/timespec-util.h" #include "shared/timespec-util.h"

@ -46,7 +46,7 @@
#include "shared/helpers.h" #include "shared/helpers.h"
#include <libweston/libweston.h> #include <libweston/libweston.h>
#include "compositor-fbdev.h" #include <libweston/backend-fbdev.h>
#include "launcher-util.h" #include "launcher-util.h"
#include "pixman-renderer.h" #include "pixman-renderer.h"
#include "libinput-seat.h" #include "libinput-seat.h"

@ -34,7 +34,7 @@
#include <stdbool.h> #include <stdbool.h>
#include <libweston/libweston.h> #include <libweston/libweston.h>
#include "compositor-headless.h" #include <libweston/backend-headless.h>
#include "shared/helpers.h" #include "shared/helpers.h"
#include "linux-explicit-synchronization.h" #include "linux-explicit-synchronization.h"
#include "pixman-renderer.h" #include "pixman-renderer.h"

@ -99,7 +99,7 @@
#include "shared/helpers.h" #include "shared/helpers.h"
#include "shared/timespec-util.h" #include "shared/timespec-util.h"
#include <libweston/libweston.h> #include <libweston/libweston.h>
#include "compositor-rdp.h" #include <libweston/backend-rdp.h>
#include "pixman-renderer.h" #include "pixman-renderer.h"
#define MAX_FREERDP_FDS 32 #define MAX_FREERDP_FDS 32

@ -45,7 +45,7 @@
#endif #endif
#include <libweston/libweston.h> #include <libweston/libweston.h>
#include "compositor-wayland.h" #include <libweston/backend-wayland.h>
#include "gl-renderer.h" #include "gl-renderer.h"
#include "weston-egl-ext.h" #include "weston-egl-ext.h"
#include "pixman-renderer.h" #include "pixman-renderer.h"

@ -51,7 +51,7 @@
#include <xkbcommon/xkbcommon.h> #include <xkbcommon/xkbcommon.h>
#include <libweston/libweston.h> #include <libweston/libweston.h>
#include "compositor-x11.h" #include <libweston/backend-x11.h>
#include "shared/config-parser.h" #include "shared/config-parser.h"
#include "shared/helpers.h" #include "shared/helpers.h"
#include "shared/image-loader.h" #include "shared/image-loader.h"

@ -249,7 +249,7 @@ if get_option('backend-drm')
) )
env_modmap += 'drm-backend.so=@0@;'.format(plugin_drm.full_path()) env_modmap += 'drm-backend.so=@0@;'.format(plugin_drm.full_path())
install_headers('compositor-drm.h', subdir: dir_include_libweston) install_headers(backend_drm_h, subdir: dir_include_libweston_install)
endif endif
@ -270,7 +270,7 @@ if get_option('backend-headless')
install_dir: dir_module_libweston, install_dir: dir_module_libweston,
) )
env_modmap += 'headless-backend.so=@0@;'.format(plugin_headless.full_path()) env_modmap += 'headless-backend.so=@0@;'.format(plugin_headless.full_path())
install_headers('compositor-headless.h', subdir: dir_include_libweston) install_headers(backend_headless_h, subdir: dir_include_libweston_install)
endif endif
@ -308,7 +308,7 @@ if get_option('backend-rdp')
install_dir: dir_module_libweston install_dir: dir_module_libweston
) )
env_modmap += 'rdp-backend.so=@0@;'.format(plugin_rdp.full_path()) env_modmap += 'rdp-backend.so=@0@;'.format(plugin_rdp.full_path())
install_headers('compositor-rdp.h', subdir: dir_include_libweston) install_headers(backend_rdp_h, subdir: dir_include_libweston_install)
endif endif
@ -351,7 +351,7 @@ if get_option('backend-wayland')
install_dir: dir_module_libweston install_dir: dir_module_libweston
) )
env_modmap += 'wayland-backend.so=@0@;'.format(plugin_wlwl.full_path()) env_modmap += 'wayland-backend.so=@0@;'.format(plugin_wlwl.full_path())
install_headers('compositor-wayland.h', subdir: dir_include_libweston) install_headers(backend_wayland_h, subdir: dir_include_libweston_install)
endif endif
@ -407,7 +407,7 @@ if get_option('backend-x11')
) )
env_modmap += 'x11-backend.so=@0@;'.format(plugin_x11.full_path()) env_modmap += 'x11-backend.so=@0@;'.format(plugin_x11.full_path())
install_headers('compositor-x11.h', subdir: dir_include_libweston) install_headers(backend_x11_h, subdir: dir_include_libweston_install)
endif endif
@ -439,7 +439,7 @@ if get_option('backend-fbdev')
) )
env_modmap += 'fbdev-backend.so=@0@;'.format(plugin_fbdev.full_path()) env_modmap += 'fbdev-backend.so=@0@;'.format(plugin_fbdev.full_path())
install_headers('compositor-fbdev.h', subdir: dir_include_libweston) install_headers(backend_fbdev_h, subdir: dir_include_libweston_install)
endif endif

@ -44,7 +44,7 @@
#include <gst/video/gstvideometa.h> #include <gst/video/gstvideometa.h>
#include "remoting-plugin.h" #include "remoting-plugin.h"
#include "compositor-drm.h" #include <libweston/backend-drm.h>
#include "shared/helpers.h" #include "shared/helpers.h"
#include "shared/timespec-util.h" #include "shared/timespec-util.h"

Loading…
Cancel
Save