From 803afe6edda17b97e3d12a20585e565a2d2a79a2 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Sat, 17 Apr 2021 23:56:50 +0100 Subject: tanis: Remove cairo-cogl Cogl's upstream is unmaintained, and has been for the past 6 years. --- boilerplate/Makefile.sources | 1 - boilerplate/Makefile.win32.features | 10 -- boilerplate/cairo-boilerplate-cogl.c | 217 ----------------------------------- boilerplate/meson.build | 1 - 4 files changed, 229 deletions(-) delete mode 100644 boilerplate/cairo-boilerplate-cogl.c (limited to 'boilerplate') diff --git a/boilerplate/Makefile.sources b/boilerplate/Makefile.sources index e219f04f7..db3543116 100644 --- a/boilerplate/Makefile.sources +++ b/boilerplate/Makefile.sources @@ -34,4 +34,3 @@ cairo_boilerplate_xcb_sources = cairo-boilerplate-xcb.c cairo_boilerplate_xlib_headers = cairo-boilerplate-xlib.h cairo_boilerplate_xlib_sources = cairo-boilerplate-xlib.c cairo_boilerplate_vg_sources = cairo-boilerplate-vg.c -cairo_boilerplate_cogl_sources = cairo-boilerplate-cogl.c diff --git a/boilerplate/Makefile.win32.features b/boilerplate/Makefile.win32.features index 2325ccf5b..d26532c5d 100644 --- a/boilerplate/Makefile.win32.features +++ b/boilerplate/Makefile.win32.features @@ -157,16 +157,6 @@ enabled_cairo_boilerplate_private += $(cairo_boilerplate_glesv3_private) enabled_cairo_boilerplate_sources += $(cairo_boilerplate_glesv3_sources) endif -unsupported_cairo_boilerplate_headers += $(cairo_boilerplate_cogl_headers) -all_cairo_boilerplate_headers += $(cairo_boilerplate_cogl_headers) -all_cairo_boilerplate_private += $(cairo_boilerplate_cogl_private) -all_cairo_boilerplate_sources += $(cairo_boilerplate_cogl_sources) -ifeq ($(CAIRO_HAS_COGL_SURFACE),1) -enabled_cairo_boilerplate_headers += $(cairo_boilerplate_cogl_headers) -enabled_cairo_boilerplate_private += $(cairo_boilerplate_cogl_private) -enabled_cairo_boilerplate_sources += $(cairo_boilerplate_cogl_sources) -endif - unsupported_cairo_boilerplate_headers += $(cairo_boilerplate_directfb_headers) all_cairo_boilerplate_headers += $(cairo_boilerplate_directfb_headers) all_cairo_boilerplate_private += $(cairo_boilerplate_directfb_private) diff --git a/boilerplate/cairo-boilerplate-cogl.c b/boilerplate/cairo-boilerplate-cogl.c deleted file mode 100644 index 2339dd883..000000000 --- a/boilerplate/cairo-boilerplate-cogl.c +++ /dev/null @@ -1,217 +0,0 @@ -/* Cairo - a vector graphics library with display and print output - * - * Copyright © 2009 Chris Wilson - * - * This library is free software; you can redistribute it and/or - * modify it either under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation - * (the "LGPL") or, at your option, under the terms of the Mozilla - * Public License Version 1.1 (the "MPL"). If you do not alter this - * notice, a recipient may use your version of this file under either - * the MPL or the LGPL. - * - * You should have received a copy of the LGPL along with this library - * in the file COPYING-LGPL-2.1; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA - * You should have received a copy of the MPL along with this library - * in the file COPYING-MPL-1.1 - * - * The contents of this file are subject to the Mozilla Public License - * Version 1.1 (the "License"); you may not use this file except in - * compliance with the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY - * OF ANY KIND, either express or implied. See the LGPL or the MPL for - * the specific language governing rights and limitations. - * - * The Original Code is the cairo graphics library. - * - * The Initial Developer of the Original Code is Chris Wilson. - */ - -#include "cairo-boilerplate-private.h" -#include "cairo-malloc-private.h" - -#include -#include - -typedef struct _cogl_closure { - cairo_device_t *device; - cairo_surface_t *surface; -} cogl_closure_t; - -static const cairo_user_data_key_t cogl_closure_key; - -static void -_cairo_boilerplate_cogl_cleanup (void *abstract_closure) -{ - cogl_closure_t *closure = abstract_closure; - - cairo_device_finish (closure->device); - cairo_device_destroy (closure->device); - - free (closure); -} - -static cairo_surface_t * -_cairo_boilerplate_cogl_create_offscreen_color_surface (const char *name, - cairo_content_t content, - double width, - double height, - double max_width, - double max_height, - cairo_boilerplate_mode_t mode, - void **abstract_closure) -{ - CoglContext *context; - cairo_device_t *device; - cogl_closure_t *closure; - cairo_status_t status; - - if (width < 1) - width = 1; - if (height < 1) - height = 1; - - context = cogl_context_new (NULL, NULL); - - device = cairo_cogl_device_create (context); - - /* The device will take a reference on the context */ - cogl_object_unref (context); - - closure = _cairo_malloc (sizeof (cogl_closure_t)); - *abstract_closure = closure; - closure->device = device; - closure->surface = cairo_cogl_offscreen_surface_create (device, - content, - width, - height); - - status = cairo_surface_set_user_data (closure->surface, - &cogl_closure_key, closure, NULL); - if (status == CAIRO_STATUS_SUCCESS) - return closure->surface; - - _cairo_boilerplate_cogl_cleanup (closure); - return cairo_boilerplate_surface_create_in_error (status); -} - -static cairo_surface_t * -_cairo_boilerplate_cogl_create_onscreen_color_surface (const char *name, - cairo_content_t content, - double width, - double height, - double max_width, - double max_height, - cairo_boilerplate_mode_t mode, - void **abstract_closure) -{ - CoglContext *context; - cairo_device_t *device; - cogl_closure_t *closure; - cairo_status_t status; - - if (width < 1) - width = 1; - if (height < 1) - height = 1; - - if (content & CAIRO_CONTENT_ALPHA) { - /* A hackish way to ensure that we get a framebuffer with - * an alpha component */ - CoglSwapChain *swap_chain; - CoglOnscreenTemplate *onscreen_template; - CoglRenderer *renderer; - CoglDisplay *display; - - swap_chain = cogl_swap_chain_new (); - cogl_swap_chain_set_has_alpha (swap_chain, TRUE); - - onscreen_template = cogl_onscreen_template_new (swap_chain); - renderer = cogl_renderer_new (); - display = cogl_display_new (renderer, onscreen_template); - - /* References will be taken on the swap chain, renderer, and - * onscreen template by the constructors */ - cogl_object_unref (swap_chain); - cogl_object_unref (renderer); - cogl_object_unref (onscreen_template); - - context = cogl_context_new (display, NULL); - - /* The context will take a reference on the display */ - cogl_object_unref (display); - } else { - context = cogl_context_new (NULL, NULL); - } - - device = cairo_cogl_device_create (context); - - /* The device will take a reference on the context */ - cogl_object_unref (context); - - closure = _cairo_malloc (sizeof (cogl_closure_t)); - *abstract_closure = closure; - closure->device = device; - closure->surface = cairo_cogl_onscreen_surface_create (device, - content, - width, - height); - - status = cairo_surface_set_user_data (closure->surface, - &cogl_closure_key, closure, NULL); - if (status == CAIRO_STATUS_SUCCESS) - return closure->surface; - - _cairo_boilerplate_cogl_cleanup (closure); - return cairo_boilerplate_surface_create_in_error (status); -} - -static cairo_status_t -_cairo_boilerplate_cogl_finish (cairo_surface_t *surface) -{ - return cairo_cogl_surface_end_frame (surface); -} - -static void -_cairo_boilerplate_cogl_synchronize (void *abstract_closure) -{ - cogl_closure_t *closure = abstract_closure; - cairo_cogl_surface_synchronize (closure->surface); -} - -static const cairo_boilerplate_target_t targets[] = { - { - "cogl-offscreen-color", "cogl", NULL, NULL, - CAIRO_SURFACE_TYPE_COGL, CAIRO_CONTENT_COLOR_ALPHA, 1, - "cairo_cogl_device_create", - _cairo_boilerplate_cogl_create_offscreen_color_surface, - cairo_surface_create_similar, - NULL, - _cairo_boilerplate_cogl_finish, - _cairo_boilerplate_get_image_surface, - cairo_surface_write_to_png, - _cairo_boilerplate_cogl_cleanup, - _cairo_boilerplate_cogl_synchronize, - NULL, - TRUE, FALSE, FALSE - }, - { - "cogl-onscreen-color", "cogl", NULL, NULL, - CAIRO_SURFACE_TYPE_COGL, CAIRO_CONTENT_COLOR_ALPHA, 1, - "cairo_cogl_device_create", - _cairo_boilerplate_cogl_create_onscreen_color_surface, - cairo_surface_create_similar, - NULL, - _cairo_boilerplate_cogl_finish, - _cairo_boilerplate_get_image_surface, - cairo_surface_write_to_png, - _cairo_boilerplate_cogl_cleanup, - _cairo_boilerplate_cogl_synchronize, - NULL, - TRUE, FALSE, FALSE - } -}; -CAIRO_BOILERPLATE (cogl, targets) diff --git a/boilerplate/meson.build b/boilerplate/meson.build index f26d3fa0b..1ff373bb5 100644 --- a/boilerplate/meson.build +++ b/boilerplate/meson.build @@ -9,7 +9,6 @@ cairo_boilerplate_feature_sources = { 'cairo-quartz': ['cairo-boilerplate-quartz.c'], 'cairo-xcb': ['cairo-boilerplate-xcb.c'], 'cairo-win32': ['cairo-boilerplate-win32.c', 'cairo-boilerplate-win32-printing.c'], - 'cairo-cogl': ['cairo-boilerplate-cogl.c'], 'cairo-directfb': ['cairo-boilerplate-directfb.c'], 'cairo-pdf': ['cairo-boilerplate-pdf.c'], 'cairo-ps': ['cairo-boilerplate-ps.c'], -- cgit v1.2.1