[PATCH weston 1/2] compositor: remove android backend
Pekka Paalanen
ppaalanen at gmail.com
Fri Jan 18 02:11:09 PST 2013
The Android backend has been fairly unused, since we do not have
projects actively using it. It gets basic build testing as part of the
normal build, but runtime testing it takes a considerable effort, and so
I have not done that in a long time. The code is slowly rotting, and
with new emerging backends it starts to be a burden, since it cannot use
udev, but needs evdev.
Therefore to ease Weston going forward, remove the Android backend. If
someone misses it, it can still be found in the stable 1.0 branch, and
of course resurrected from git history if someone wants to put in the
effort and maintain it.
Signed-off-by: Pekka Paalanen <ppaalanen at gmail.com>
---
configure.ac | 11 --
src/Makefile.am | 22 +---
src/android-framebuffer.cpp | 93 -----------
src/android-framebuffer.h | 54 ------
src/compositor-android.c | 376 -------------------------------------------
5 files changed, 1 insertions(+), 555 deletions(-)
delete mode 100644 src/android-framebuffer.cpp
delete mode 100644 src/android-framebuffer.h
delete mode 100644 src/compositor-android.c
diff --git a/configure.ac b/configure.ac
index 64505dd..a2e8e27 100644
--- a/configure.ac
+++ b/configure.ac
@@ -126,17 +126,6 @@ AM_CONDITIONAL(ENABLE_HEADLESS_COMPOSITOR,
test x$enable_headless_compositor = xyes)
-AC_ARG_ENABLE(android-compositor,
- AS_HELP_STRING([--disable-android-compositor],
- [do not build-test the Android 4.0 backend]),,
- enable_android_compositor=yes)
-AM_CONDITIONAL(ENABLE_ANDROID_COMPOSITOR, test x$enable_android_compositor = xyes -a x$enable_egl = xyes)
-if test x$enable_android_compositor = xyes -a x$enable_egl = xyes; then
- AC_DEFINE([BUILD_ANDROID_COMPOSITOR], [1], [Build the compositor for Android 4.0])
- PKG_CHECK_MODULES(ANDROID_COMPOSITOR, [mtdev >= 1.1.0])
-fi
-
-
AC_ARG_ENABLE(rpi-compositor,
AS_HELP_STRING([--disable-rpi-compositor],
[do not build the Raspberry Pi backend]),,
diff --git a/src/Makefile.am b/src/Makefile.am
index cbfa911..a94a25f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -86,9 +86,7 @@ module_LTLIBRARIES = \
$(wayland_backend) \
$(headless_backend)
-# Do not install, since the binary produced via autotools is unusable.
-# The real backend is built by the Android build system.
-noinst_LTLIBRARIES = $(android_backend)
+noinst_LTLIBRARIES =
if INSTALL_RPI_COMPOSITOR
module_LTLIBRARIES += $(rpi_backend)
@@ -145,24 +143,6 @@ wayland_backend_la_CFLAGS = \
wayland_backend_la_SOURCES = compositor-wayland.c
endif
-if ENABLE_ANDROID_COMPOSITOR
-android_backend = android-backend.la
-android_backend_la_LDFLAGS = -module -avoid-version
-android_backend_la_LIBADD = $(COMPOSITOR_LIBS) $(ANDROID_COMPOSITOR_LIBS)
-android_backend_la_CFLAGS = \
- $(GCC_CFLAGS) \
- $(COMPOSITOR_CFLAGS) \
- $(ANDROID_COMPOSITOR_CFLAGS)
-android_backend_la_CXXFLAGS = $(GCC_CXXFLAGS) $(COMPOSITOR_CFLAGS)
-android_backend_la_SOURCES = \
- compositor-android.c \
- evdev.c \
- evdev.h \
- evdev-touchpad.c \
- android-framebuffer.cpp \
- android-framebuffer.h
-endif
-
if ENABLE_RPI_COMPOSITOR
rpi_backend = rpi-backend.la
rpi_backend_la_LDFLAGS = -module -avoid-version
diff --git a/src/android-framebuffer.cpp b/src/android-framebuffer.cpp
deleted file mode 100644
index 1dfe9e8..0000000
--- a/src/android-framebuffer.cpp
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright © 2012 Collabora, Ltd.
- *
- * Permission to use, copy, modify, distribute, and sell this software and
- * its documentation for any purpose is hereby granted without fee, provided
- * that the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of the copyright holders not be used in
- * advertising or publicity pertaining to distribution of the software
- * without specific, written prior permission. The copyright holders make
- * no representations about the suitability of this software for any
- * purpose. It is provided "as is" without express or implied warranty.
- *
- * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
- * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
- * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
- * CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include <cstdlib>
-
-#include "android-framebuffer.h"
-
-#ifdef ANDROID
-
-#include <ui/FramebufferNativeWindow.h>
-
-class AndroidFramebuffer {
-public:
- int init();
-
- struct android_framebuffer fb_;
-
-private:
- android::sp<android::FramebufferNativeWindow> nativefb_;
-};
-
-int AndroidFramebuffer::init()
-{
- struct ANativeWindow *window;
- const framebuffer_device_t *fbdev;
- int ret1, ret2, ret3;
-
- nativefb_ = new android::FramebufferNativeWindow();
- fbdev = nativefb_->getDevice();
-
- if (!fbdev)
- return -1;
-
- fb_.priv = this;
-
- window = nativefb_.get();
- ret1 = window->query(window, NATIVE_WINDOW_WIDTH, &fb_.width);
- ret2 = window->query(window, NATIVE_WINDOW_HEIGHT, &fb_.height);
- ret3 = window->query(window, NATIVE_WINDOW_FORMAT, &fb_.format);
- fb_.xdpi = window->xdpi;
- fb_.ydpi = window->ydpi;
- fb_.refresh_rate = fbdev->fps;
-
- if (ret1 != android::NO_ERROR ||
- ret2 != android::NO_ERROR ||
- ret3 != android::NO_ERROR)
- return -1;
-
- fb_.native_window = reinterpret_cast<EGLNativeWindowType>(window);
- return 0;
-}
-
-void
-android_framebuffer_destroy(struct android_framebuffer *fb)
-{
- AndroidFramebuffer *afb = static_cast<AndroidFramebuffer*>(fb->priv);
-
- delete afb;
-}
-
-struct android_framebuffer *
-android_framebuffer_create(void)
-{
- AndroidFramebuffer *afb = new AndroidFramebuffer;
-
- if (afb->init() < 0) {
- delete afb;
- return NULL;
- }
-
- return &afb->fb_;
-}
-
-#endif /* ANDROID */
diff --git a/src/android-framebuffer.h b/src/android-framebuffer.h
deleted file mode 100644
index 48b22e5..0000000
--- a/src/android-framebuffer.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright © 2012 Collabora, Ltd.
- *
- * Permission to use, copy, modify, distribute, and sell this software and
- * its documentation for any purpose is hereby granted without fee, provided
- * that the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of the copyright holders not be used in
- * advertising or publicity pertaining to distribution of the software
- * without specific, written prior permission. The copyright holders make
- * no representations about the suitability of this software for any
- * purpose. It is provided "as is" without express or implied warranty.
- *
- * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
- * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
- * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
- * CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#ifndef ANDROID_FRAMEBUFFER_H
-#define ANDROID_FRAMEBUFFER_H
-
-#include <EGL/egl.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct android_framebuffer {
- EGLNativeWindowType native_window;
- int width;
- int height;
- int format;
- float xdpi;
- float ydpi;
- float refresh_rate;
-
- void *priv;
-};
-
-void
-android_framebuffer_destroy(struct android_framebuffer *fb);
-
-struct android_framebuffer *
-android_framebuffer_create(void);
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#endif /* ANDROID_FRAMEBUFFER_H */
diff --git a/src/compositor-android.c b/src/compositor-android.c
deleted file mode 100644
index 4e4ff08..0000000
--- a/src/compositor-android.c
+++ /dev/null
@@ -1,376 +0,0 @@
-/*
- * Copyright © 2012 Collabora, Ltd.
- *
- * Permission to use, copy, modify, distribute, and sell this software and
- * its documentation for any purpose is hereby granted without fee, provided
- * that the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of the copyright holders not be used in
- * advertising or publicity pertaining to distribution of the software
- * without specific, written prior permission. The copyright holders make
- * no representations about the suitability of this software for any
- * purpose. It is provided "as is" without express or implied warranty.
- *
- * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
- * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
- * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
- * CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#define _GNU_SOURCE
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <math.h>
-#include <sys/types.h>
-#include <dirent.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <unistd.h>
-
-#include <EGL/egl.h>
-
-#include "compositor.h"
-#include "gl-renderer.h"
-#include "android-framebuffer.h"
-#include "evdev.h"
-
-struct android_compositor;
-
-struct android_output {
- struct android_compositor *compositor;
- struct weston_output base;
-
- struct weston_mode mode;
- struct android_framebuffer *fb;
-};
-
-struct android_seat {
- struct weston_seat base;
- struct wl_list devices_list;
-};
-
-struct android_compositor {
- struct weston_compositor base;
-
- struct android_seat *seat;
-};
-
-static inline struct android_output *
-to_android_output(struct weston_output *base)
-{
- return container_of(base, struct android_output, base);
-}
-
-static inline struct android_seat *
-to_android_seat(struct weston_seat *base)
-{
- return container_of(base, struct android_seat, base);
-}
-
-static inline struct android_compositor *
-to_android_compositor(struct weston_compositor *base)
-{
- return container_of(base, struct android_compositor, base);
-}
-
-static void
-android_finish_frame(void *data)
-{
- struct android_output *output = data;
-
- weston_output_finish_frame(&output->base,
- weston_compositor_get_time());
-}
-
-static void
-android_output_repaint(struct weston_output *base, pixman_region32_t *damage)
-{
- struct android_output *output = to_android_output(base);
- struct android_compositor *compositor = output->compositor;
- struct weston_plane *primary_plane = &compositor->base.primary_plane;
- struct wl_event_loop *loop;
-
- compositor->base.renderer->repaint_output(&output->base, damage);
-
- pixman_region32_subtract(&primary_plane->damage,
- &primary_plane->damage, damage);
-
- /* FIXME: does Android have a way to signal page flip done? */
- loop = wl_display_get_event_loop(compositor->base.wl_display);
- wl_event_loop_add_idle(loop, android_finish_frame, output);
-}
-
-static void
-android_output_destroy(struct weston_output *base)
-{
- struct android_output *output = to_android_output(base);
-
- wl_list_remove(&output->base.link);
- weston_output_destroy(&output->base);
-
- gl_renderer_output_destroy(base);
-
- android_framebuffer_destroy(output->fb);
-
- free(output);
-}
-
-static struct android_output *
-android_output_create(struct android_compositor *compositor)
-{
- struct android_output *output;
-
- output = calloc(1, sizeof *output);
- if (!output)
- return NULL;
-
- output->fb = android_framebuffer_create();
- if (!output->fb) {
- free(output);
- return NULL;
- }
-
- output->compositor = compositor;
- return output;
-}
-
-static void
-android_compositor_add_output(struct android_compositor *compositor,
- struct android_output *output)
-{
- float mm_width, mm_height;
-
- output->base.repaint = android_output_repaint;
- output->base.destroy = android_output_destroy;
- output->base.assign_planes = NULL;
- output->base.set_backlight = NULL;
- output->base.set_dpms = NULL;
- output->base.switch_mode = NULL;
-
- /* only one static mode in list */
- output->mode.flags =
- WL_OUTPUT_MODE_CURRENT | WL_OUTPUT_MODE_PREFERRED;
- output->mode.width = output->fb->width;
- output->mode.height = output->fb->height;
- output->mode.refresh = ceilf(1000.0f * output->fb->refresh_rate);
- wl_list_init(&output->base.mode_list);
- wl_list_insert(&output->base.mode_list, &output->mode.link);
-
- output->base.current = &output->mode;
- output->base.origin = &output->mode;
- output->base.subpixel = WL_OUTPUT_SUBPIXEL_UNKNOWN;
- output->base.make = "unknown";
- output->base.model = "unknown";
-
- mm_width = output->fb->width / output->fb->xdpi * 25.4f;
- mm_height = output->fb->height / output->fb->ydpi * 25.4f;
- weston_output_init(&output->base, &compositor->base,
- 0, 0, round(mm_width), round(mm_height),
- WL_OUTPUT_TRANSFORM_NORMAL);
- wl_list_insert(compositor->base.output_list.prev, &output->base.link);
-}
-
-static void
-android_led_update(struct weston_seat *seat_base, enum weston_led leds)
-{
- struct android_seat *seat = to_android_seat(seat_base);
- struct evdev_device *device;
-
- wl_list_for_each(device, &seat->devices_list, link)
- evdev_led_update(device, leds);
-}
-
-static void
-android_seat_open_device(struct android_seat *seat, const char *devnode)
-{
- struct evdev_device *device;
- int fd;
-
- /* XXX: check the Android excluded list */
-
- fd = open(devnode, O_RDWR | O_NONBLOCK | O_CLOEXEC);
- if (fd < 0) {
- weston_log_continue("opening '%s' failed: %s\n", devnode,
- strerror(errno));
- return;
- }
-
- device = evdev_device_create(&seat->base, devnode, fd);
- if (!device) {
- close(fd);
- return;
- }
-
- wl_list_insert(seat->devices_list.prev, &device->link);
-}
-
-static int
-is_dot_or_dotdot(const char *str)
-{
- return (str[0] == '.' &&
- (str[1] == 0 || (str[1] == '.' && str[2] == 0)));
-}
-
-static void
-android_seat_scan_devices(struct android_seat *seat, const char *dirpath)
-{
- int ret;
- DIR *dir;
- struct dirent *dent;
- char *devnode = NULL;
-
- dir = opendir(dirpath);
- if (!dir) {
- weston_log("Could not open input device directory '%s': %s\n",
- dirpath, strerror(errno));
- return;
- }
-
- while ((dent = readdir(dir)) != NULL) {
- if (is_dot_or_dotdot(dent->d_name))
- continue;
-
- ret = asprintf(&devnode, "%s/%s", dirpath, dent->d_name);
- if (ret < 0)
- continue;
-
- android_seat_open_device(seat, devnode);
- free(devnode);
- }
-
- closedir(dir);
-}
-
-static void
-android_seat_destroy(struct android_seat *seat)
-{
- struct evdev_device *device, *next;
-
- wl_list_for_each_safe(device, next, &seat->devices_list, link)
- evdev_device_destroy(device);
-
- if (seat->base.seat.keyboard)
- notify_keyboard_focus_out(&seat->base);
-
- weston_seat_release(&seat->base);
- free(seat);
-}
-
-static struct android_seat *
-android_seat_create(struct android_compositor *compositor)
-{
- struct android_seat *seat;
-
- seat = calloc(1, sizeof *seat);
- if (!seat)
- return NULL;
-
- weston_seat_init(&seat->base, &compositor->base);
- seat->base.led_update = android_led_update;
- wl_list_init(&seat->devices_list);
-
- android_seat_scan_devices(seat, "/dev/input");
-
- evdev_notify_keyboard_focus(&seat->base, &seat->devices_list);
-
- if (wl_list_empty(&seat->devices_list))
- weston_log("Warning: no input devices found.\n");
-
- /* XXX: implement hotplug support */
-
- return seat;
-}
-
-static int
-android_init_egl(struct android_compositor *compositor,
- struct android_output *output)
-{
- EGLint visual_id = output->fb->format;
-
- if (gl_renderer_create(&compositor->base,
- EGL_DEFAULT_DISPLAY, gl_renderer_opaque_attribs,
- &visual_id) < 0)
- return -1;
-
- if (gl_renderer_output_create(&output->base,
- output->fb->native_window) < 0) {
- compositor->base.renderer->destroy(&compositor->base);
- return -1;
- }
-
- return 0;
-}
-
-static void
-android_compositor_destroy(struct weston_compositor *base)
-{
- struct android_compositor *compositor = to_android_compositor(base);
-
- android_seat_destroy(compositor->seat);
-
- base->renderer->destroy(base);
-
- /* destroys outputs, too */
- weston_compositor_shutdown(&compositor->base);
-
- free(compositor);
-}
-
-static struct weston_compositor *
-android_compositor_create(struct wl_display *display, int argc, char *argv[],
- const char *config_file)
-{
- struct android_compositor *compositor;
- struct android_output *output;
-
- weston_log("initializing android backend\n");
-
- compositor = calloc(1, sizeof *compositor);
- if (compositor == NULL)
- return NULL;
-
- if (weston_compositor_init(&compositor->base, display, argc, argv,
- config_file) < 0)
- goto err_free;
-
- compositor->base.destroy = android_compositor_destroy;
-
- compositor->base.focus = 1;
-
- output = android_output_create(compositor);
- if (!output)
- goto err_compositor;
-
- if (android_init_egl(compositor, output) < 0)
- goto err_output;
-
- android_compositor_add_output(compositor, output);
-
- compositor->seat = android_seat_create(compositor);
- if (!compositor->seat)
- goto err_gl;
-
- return &compositor->base;
-
-err_gl:
- compositor->base.renderer->destroy(&compositor->base);
-err_output:
- android_output_destroy(&output->base);
-err_compositor:
- weston_compositor_shutdown(&compositor->base);
-err_free:
- free(compositor);
- return NULL;
-}
-
-WL_EXPORT struct weston_compositor *
-backend_init(struct wl_display *display, int argc, char *argv[],
- const char *config_file)
-{
- return android_compositor_create(display, argc, argv, config_file);
-}
--
1.7.8.6
More information about the wayland-devel
mailing list