From 961a1376cd6a9c28a6271a80b347cbb33f2f3799 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20=C3=85dahl?= Date: Thu, 9 Jul 2020 21:42:01 +0200 Subject: [PATCH] clutter: Remove 'eglnative' backend layer It's completely empty, so remove it. https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1364 --- .../clutter/egl/clutter-backend-eglnative.c | 64 ----------------- .../clutter/egl/clutter-backend-eglnative.h | 69 ------------------- clutter/clutter/meson.build | 7 -- .../native/meta-clutter-backend-native.c | 4 +- .../native/meta-clutter-backend-native.h | 3 +- 5 files changed, 3 insertions(+), 144 deletions(-) delete mode 100644 clutter/clutter/egl/clutter-backend-eglnative.c delete mode 100644 clutter/clutter/egl/clutter-backend-eglnative.h diff --git a/clutter/clutter/egl/clutter-backend-eglnative.c b/clutter/clutter/egl/clutter-backend-eglnative.c deleted file mode 100644 index 950dfc64f..000000000 --- a/clutter/clutter/egl/clutter-backend-eglnative.c +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Clutter. - * - * An OpenGL based 'interactive canvas' library. - * - * Copyright (C) 2010,2011 Intel Corporation. - * 2011 Giovanni Campagna - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library. If not, see . - - * Authors: - * Matthew Allum - * Emmanuele Bassi - * Robert Bragg - * Neil Roberts - */ - -#include "clutter-build-config.h" - -#include -#include -#include -#include - -#include - -#include "clutter-backend-eglnative.h" - -/* This is a Cogl based backend */ -#include "cogl/clutter-stage-cogl.h" - -#include "clutter-debug.h" -#include "clutter-private.h" -#include "clutter-main.h" -#include "clutter-stage-private.h" - -G_DEFINE_TYPE (ClutterBackendEglNative, clutter_backend_egl_native, CLUTTER_TYPE_BACKEND); - -static void -clutter_backend_egl_native_class_init (ClutterBackendEglNativeClass *klass) -{ -} - -static void -clutter_backend_egl_native_init (ClutterBackendEglNative *backend_egl_native) -{ -} - -ClutterBackend * -clutter_backend_egl_native_new (void) -{ - return g_object_new (CLUTTER_TYPE_BACKEND_EGL_NATIVE, NULL); -} diff --git a/clutter/clutter/egl/clutter-backend-eglnative.h b/clutter/clutter/egl/clutter-backend-eglnative.h deleted file mode 100644 index 8c49aa4d7..000000000 --- a/clutter/clutter/egl/clutter-backend-eglnative.h +++ /dev/null @@ -1,69 +0,0 @@ -/* Clutter. - * An OpenGL based 'interactive canvas' library. - * - * Copyright (C) 2006, 2007 OpenedHand - * Copyright (C) 2010 Intel Corp - * 2011 Giovanni Campagna - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library. If not, see . - * - * Authors: - * Matthew Allum - * Robert Bragg - */ - -#ifndef __CLUTTER_BACKEND_EGL_NATIVE_H__ -#define __CLUTTER_BACKEND_EGL_NATIVE_H__ - -#include -#include -#include -#include -#include -#include - -#include "clutter-backend-private.h" - -G_BEGIN_DECLS - -#define CLUTTER_TYPE_BACKEND_EGL_NATIVE (clutter_backend_egl_native_get_type ()) -#define CLUTTER_BACKEND_EGL_NATIVE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CLUTTER_TYPE_BACKEND_EGL_NATIVE, ClutterBackendEglNative)) -#define CLUTTER_IS_BACKEND_EGL_NATIVE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CLUTTER_TYPE_BACKEND_EGL_NATIVE)) -#define CLUTTER_BACKEND_EGL_NATIVE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), CLUTTER_TYPE_BACKEND_EGL_NATIVE, ClutterBackendEglNativeClass)) -#define CLUTTER_IS_BACKEND_EGL_NATIVE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CLUTTER_TYPE_BACKEND_EGL_NATIVE)) -#define CLUTTER_BACKEND_EGL_NATIVE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), CLUTTER_TYPE_BACKEND_EGL_NATIVE, ClutterBackendEglNativeClass)) - -typedef struct _ClutterBackendEglNative ClutterBackendEglNative; -typedef struct _ClutterBackendEglNativeClass ClutterBackendEglNativeClass; - -G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterBackendEglNative, g_object_unref) - -struct _ClutterBackendEglNative -{ - ClutterBackend parent_instance; -}; - -struct _ClutterBackendEglNativeClass -{ - ClutterBackendClass parent_class; -}; - -CLUTTER_EXPORT -GType clutter_backend_egl_native_get_type (void) G_GNUC_CONST; - -ClutterBackend *clutter_backend_egl_native_new (void); - -G_END_DECLS - -#endif /* __CLUTTER_BACKEND_EGL_NATIVE_H__ */ diff --git a/clutter/clutter/meson.build b/clutter/clutter/meson.build index fa556905e..18994df8d 100644 --- a/clutter/clutter/meson.build +++ b/clutter/clutter/meson.build @@ -257,13 +257,6 @@ if have_x11 clutter_backend_nonintrospected_sources += clutter_x11_nonintrospected_sources endif -if have_native_backend - clutter_native_nonintrospected_sources = [ - 'egl/clutter-backend-eglnative.c', - ] - clutter_backend_nonintrospected_sources += clutter_native_nonintrospected_sources -endif - if have_wayland clutter_wayland_private_headers = [ 'wayland/clutter-wayland-compositor.h', diff --git a/src/backends/native/meta-clutter-backend-native.c b/src/backends/native/meta-clutter-backend-native.c index 841e0f31a..58d6afa44 100644 --- a/src/backends/native/meta-clutter-backend-native.c +++ b/src/backends/native/meta-clutter-backend-native.c @@ -52,7 +52,7 @@ struct _MetaClutterBackendNative { - ClutterBackendEglNative parent; + ClutterBackend parent; MetaSeatNative *main_seat; MetaStageNative *stage_native; @@ -61,7 +61,7 @@ struct _MetaClutterBackendNative static gchar *evdev_seat_id; G_DEFINE_TYPE (MetaClutterBackendNative, meta_clutter_backend_native, - CLUTTER_TYPE_BACKEND_EGL_NATIVE) + CLUTTER_TYPE_BACKEND) MetaStageNative * meta_clutter_backend_native_get_stage_native (ClutterBackend *backend) diff --git a/src/backends/native/meta-clutter-backend-native.h b/src/backends/native/meta-clutter-backend-native.h index 8914f8aa3..60d20f362 100644 --- a/src/backends/native/meta-clutter-backend-native.h +++ b/src/backends/native/meta-clutter-backend-native.h @@ -29,12 +29,11 @@ #include "backends/native/meta-stage-native.h" #include "clutter/clutter.h" -#include "clutter/egl/clutter-backend-eglnative.h" #define META_TYPE_CLUTTER_BACKEND_NATIVE (meta_clutter_backend_native_get_type ()) G_DECLARE_FINAL_TYPE (MetaClutterBackendNative, meta_clutter_backend_native, META, CLUTTER_BACKEND_NATIVE, - ClutterBackendEglNative) + ClutterBackend) MetaStageNative * meta_clutter_backend_native_get_stage_native (ClutterBackend *backend);