From 72a389ef1264f80a174d51d0d3358abedd476453 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20=C3=85dahl?= Date: Thu, 9 Jul 2020 21:41:17 +0200 Subject: [PATCH] clutter/egl: Remove unused clutter_egl_get_egl_display() https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1364 --- .../clutter/egl/clutter-backend-eglnative.c | 40 ------------- clutter/clutter/egl/clutter-egl.h | 59 ------------------- 2 files changed, 99 deletions(-) delete mode 100644 clutter/clutter/egl/clutter-egl.h diff --git a/clutter/clutter/egl/clutter-backend-eglnative.c b/clutter/clutter/egl/clutter-backend-eglnative.c index 0c3144976..950dfc64f 100644 --- a/clutter/clutter/egl/clutter-backend-eglnative.c +++ b/clutter/clutter/egl/clutter-backend-eglnative.c @@ -45,10 +45,6 @@ #include "clutter-main.h" #include "clutter-stage-private.h" -#ifdef COGL_HAS_EGL_SUPPORT -#include "clutter-egl.h" -#endif - G_DEFINE_TYPE (ClutterBackendEglNative, clutter_backend_egl_native, CLUTTER_TYPE_BACKEND); static void @@ -66,39 +62,3 @@ clutter_backend_egl_native_new (void) { return g_object_new (CLUTTER_TYPE_BACKEND_EGL_NATIVE, NULL); } - -/** - * clutter_egl_get_egl_display: - * - * Retrieves the EGL display used by Clutter, if it supports the - * EGL windowing system and if it is running using an EGL backend. - * - * Return value: the EGL display used by Clutter, or 0 - * - * Since: 1.6 - */ -EGLDisplay -clutter_egl_get_egl_display (void) -{ - ClutterBackend *backend; - - if (!_clutter_context_is_initialized ()) - { - g_critical ("The Clutter backend has not been initialized yet"); - return 0; - } - - backend = clutter_get_default_backend (); - - if (!CLUTTER_IS_BACKEND_EGL_NATIVE (backend)) - { - g_critical ("The Clutter backend is not an EGL backend"); - return 0; - } - -#ifdef COGL_HAS_EGL_SUPPORT - return cogl_egl_context_get_egl_display (backend->cogl_context); -#else - return 0; -#endif -} diff --git a/clutter/clutter/egl/clutter-egl.h b/clutter/clutter/egl/clutter-egl.h deleted file mode 100644 index 8258cbec4..000000000 --- a/clutter/clutter/egl/clutter-egl.h +++ /dev/null @@ -1,59 +0,0 @@ -/* - * Clutter. - * - * An OpenGL based 'interactive canvas' library. - * - * Authored By Matthew Allum - * - * Copyright (C) 2006 OpenedHand - * - * 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 . - * - * - */ - -/** - * SECTION:clutter-egl - * @short_description: EGL specific API - * - * The EGL backend for Clutter provides some EGL specific API - * - * You need to include `clutter-egl.h` to have access to the functions documented here. - */ - -#ifndef __CLUTTER_EGL_H__ -#define __CLUTTER_EGL_H__ - -#include - -#include "clutter-egl-headers.h" -#include - -G_BEGIN_DECLS - -/** - * clutter_egl_get_egl_display: - * - * Retrieves the #EGLDisplay used by Clutter. - * - * Return value: the EGL display - * - * Since: 1.6 - */ -CLUTTER_EXPORT -EGLDisplay clutter_egl_get_egl_display (void); - -G_END_DECLS - -#endif /* __CLUTTER_EGL_H__ */