gl: Remove eagle support

Eagle is no more, Kristian has superseded it with true EGL support. He
is so happy...

9 files changed, 0 insertions, 240 deletions

diff --git a/boilerplate/Makefile.win32.features b/boilerplate/Makefile.win32.features
index bcf41a8c..31bd4e06 100644
--- a/boilerplate/Makefile.win32.features
+++ b/boilerplate/Makefile.win32.features
@@ -229,16 +229,6 @@ enabled_cairo_boilerplate_private += $(cairo_boilerplate_vg_private)
 enabled_cairo_boilerplate_sources += $(cairo_boilerplate_vg_sources)
 endif
 
-supported_cairo_boilerplate_headers += $(cairo_boilerplate_eagle_headers)
-all_cairo_boilerplate_headers += $(cairo_boilerplate_eagle_headers)
-all_cairo_boilerplate_private += $(cairo_boilerplate_eagle_private)
-all_cairo_boilerplate_sources += $(cairo_boilerplate_eagle_sources)
-ifeq ($(CAIRO_HAS_EAGLE_FUNCTIONS),1)
-enabled_cairo_boilerplate_headers += $(cairo_boilerplate_eagle_headers)
-enabled_cairo_boilerplate_private += $(cairo_boilerplate_eagle_private)
-enabled_cairo_boilerplate_sources += $(cairo_boilerplate_eagle_sources)
-endif
-
 supported_cairo_boilerplate_headers += $(cairo_boilerplate_egl_headers)
 all_cairo_boilerplate_headers += $(cairo_boilerplate_egl_headers)
 all_cairo_boilerplate_private += $(cairo_boilerplate_egl_private)
diff --git a/build/Makefile.win32.features b/build/Makefile.win32.features
index b32e7fcf..2f40eb2f 100644
--- a/build/Makefile.win32.features
+++ b/build/Makefile.win32.features
@@ -21,7 +21,6 @@ CAIRO_HAS_PNG_FUNCTIONS=1
 CAIRO_HAS_GL_SURFACE=0
 CAIRO_HAS_DIRECTFB_SURFACE=0
 CAIRO_HAS_VG_SURFACE=0
-CAIRO_HAS_EAGLE_FUNCTIONS=0
 CAIRO_HAS_EGL_FUNCTIONS=0
 CAIRO_HAS_GLX_FUNCTIONS=0
 CAIRO_HAS_SCRIPT_SURFACE=0
diff --git a/build/Makefile.win32.features-h b/build/Makefile.win32.features-h
index c5df7bdb..f7c07acc 100644
--- a/build/Makefile.win32.features-h
+++ b/build/Makefile.win32.features-h
@@ -68,9 +68,6 @@ endif
 ifeq ($(CAIRO_HAS_VG_SURFACE),1)
 	@echo "#define CAIRO_HAS_VG_SURFACE 1" >> src/cairo-features.h
 endif
-ifeq ($(CAIRO_HAS_EAGLE_FUNCTIONS),1)
-	@echo "#define CAIRO_HAS_EAGLE_FUNCTIONS 1" >> src/cairo-features.h
-endif
 ifeq ($(CAIRO_HAS_EGL_FUNCTIONS),1)
 	@echo "#define CAIRO_HAS_EGL_FUNCTIONS 1" >> src/cairo-features.h
 endif
diff --git a/build/configure.ac.features b/build/configure.ac.features
index c4c5bd9d..34406d74 100644
--- a/build/configure.ac.features
+++ b/build/configure.ac.features
@@ -391,7 +391,6 @@ AC_DEFUN([CAIRO_REPORT],
 	echo "  GLEW functions:  $use_glew"
 	echo "  GLX functions:   $use_glx"
 	echo "  EGL functions:   $use_egl"
-	echo "  Eagle functions: $use_eagle"
 	echo "  X11-xcb functions: $use_xlib_xcb"
 	echo "  XCB-drm functions: $use_xcb_drm"
 	echo "  XCB-shm functions: $use_xcb_shm"
diff --git a/configure.ac b/configure.ac
index 626bf140..7d0cde0b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -332,7 +332,6 @@ CAIRO_ENABLE_SURFACE_BACKEND(gl, OpenGL, no, [
     CAIRO_CFLAGS="$CAIRO_CFLAGS -I\$(top_srcdir)/src/glew"
   fi
   need_glx_functions=yes
-  need_eagle_functions=yes
 ])
 
 dnl ===========================================================================
@@ -356,17 +355,6 @@ CAIRO_ENABLE_SURFACE_BACKEND(vg, OpenVG, no, [
   fi
 ])
 
-CAIRO_ENABLE_FUNCTIONS(eagle, eagle, auto, [
-  if test "x$need_eagle_functions" = "xyes"; then
-      eagle_REQUIRES="eagle"
-      PKG_CHECK_MODULES(eagle, $eagle_REQUIRES, ,
-                       [AC_MSG_RESULT(no)
-                       use_eagle="no (requires eagle)"])
-  else
-      use_eagle="no (not required by any backend)"
-  fi
-])
-
 CAIRO_ENABLE_FUNCTIONS(egl, EGL, auto, [
   if test "x$need_egl_functions" = "xyes"; then
     AC_CHECK_HEADER(EGL/egl.h,, [use_egl="no (EGL headers not found)"])
diff --git a/src/Makefile.sources b/src/Makefile.sources
index 3cd6c484..c1d88e6b 100644
--- a/src/Makefile.sources
+++ b/src/Makefile.sources
@@ -195,7 +195,6 @@ cairo_sources += $(_cairo_font_subset_sources)
 
 cairo_glx_sources =
 cairo_egl_sources =
-cairo_eagle_sources =
 
 _cairo_pdf_operators_private = cairo-pdf-operators-private.h
 _cairo_pdf_operators_sources = cairo-pdf-operators.c
@@ -316,7 +315,6 @@ cairo_gl_headers = cairo-gl.h
 cairo_gl_private = cairo-gl-private.h
 cairo_gl_sources = cairo-gl-surface.c cairo-gl-glyphs.c cairo-gl-shaders.c
 cairo_glx_sources += cairo-glx-context.c
-cairo_eagle_sources += cairo-eagle-context.c
 
 cairo_directfb_headers = cairo-directfb.h
 cairo_directfb_sources = cairo-directfb-surface.c
diff --git a/src/Makefile.win32.features b/src/Makefile.win32.features
index 5e734869..42fb6964 100644
--- a/src/Makefile.win32.features
+++ b/src/Makefile.win32.features
@@ -315,20 +315,6 @@ ifeq ($(CAIRO_HAS_VG_SURFACE),1)
 enabled_cairo_pkgconf += cairo-vg.pc
 endif
 
-supported_cairo_headers += $(cairo_eagle_headers)
-all_cairo_headers += $(cairo_eagle_headers)
-all_cairo_private += $(cairo_eagle_private)
-all_cairo_sources += $(cairo_eagle_sources)
-ifeq ($(CAIRO_HAS_EAGLE_FUNCTIONS),1)
-enabled_cairo_headers += $(cairo_eagle_headers)
-enabled_cairo_private += $(cairo_eagle_private)
-enabled_cairo_sources += $(cairo_eagle_sources)
-endif
-all_cairo_pkgconf += cairo-eagle.pc
-ifeq ($(CAIRO_HAS_EAGLE_FUNCTIONS),1)
-enabled_cairo_pkgconf += cairo-eagle.pc
-endif
-
 supported_cairo_headers += $(cairo_egl_headers)
 all_cairo_headers += $(cairo_egl_headers)
 all_cairo_private += $(cairo_egl_private)
diff --git a/src/cairo-eagle-context.c b/src/cairo-eagle-context.c
deleted file mode 100644
index 199a34df..00000000
--- a/src/cairo-eagle-context.c
+++ /dev/null
@@ -1,185 +0,0 @@
-/* cairo - a vector graphics library with display and print output
- *
- * Copyright © 2009 Eric Anholt
- * Copyright © 2009 Chris Wilson
- * Copyright © 2005 Red Hat, Inc
- *
- * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 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 Red Hat, Inc.
- *
- * Contributor(s):
- *	Carl Worth <cworth@cworth.org>
- *	Chris Wilson <chris@chris-wilson.co.uk>
- */
-
-#include "cairoint.h"
-
-#include "cairo-gl-private.h"
-
-#include "cairo-error-private.h"
-
-#include <i915_drm.h> /* XXX dummy surface for glewInit() */
-#include <sys/ioctl.h>
-
-typedef struct _cairo_eagle_context {
-    cairo_gl_context_t base;
-
-    EGLDisplay display;
-    EGLContext context;
-} cairo_eagle_context_t;
-
-typedef struct _cairo_eagle_surface {
-    cairo_gl_surface_t base;
-
-    EGLSurface eagle;
-} cairo_eagle_surface_t;
-
-static void
-_eagle_make_current (void *abstract_ctx,
-	           cairo_gl_surface_t *abstract_surface)
-{
-    cairo_eagle_context_t *ctx = abstract_ctx;
-    cairo_eagle_surface_t *surface = (cairo_eagle_surface_t *) abstract_surface;
-
-    eagleMakeCurrent (ctx->display, surface->eagle, surface->eagle, ctx->context);
-}
-
-static void
-_eagle_swap_buffers (void *abstract_ctx,
-		   cairo_gl_surface_t *abstract_surface)
-{
-    cairo_eagle_context_t *ctx = abstract_ctx;
-    cairo_eagle_surface_t *surface = (cairo_eagle_surface_t *) abstract_surface;
-
-    eagleSwapBuffers (ctx->display, surface->eagle);
-}
-
-static void
-_eagle_destroy (void *abstract_ctx)
-{
-}
-
-static cairo_bool_t
-_eagle_init (EGLDisplay display, EGLContext context)
-{
-    const EGLint config_attribs[] = {
-	EGL_CONFIG_CAVEAT, EGL_NONE,
-	EGL_NONE
-    };
-    const EGLint surface_attribs[] = {
-	EGL_RENDER_BUFFER, EGL_BACK_BUFFER,
-	EGL_NONE
-    };
-    EGLConfig config;
-    EGLSurface dummy;
-    struct drm_i915_gem_create create;
-    struct drm_gem_flink flink;
-    int fd;
-    GLenum err;
-
-    if (! eagleChooseConfig (display, config_attribs, &config, 1, NULL)) {
-	fprintf (stderr, "Unable to choose config\n");
-	return FALSE;
-    }
-
-    /* XXX */
-    fd = eagleGetDisplayFD (display);
-
-    create.size = 4096;
-    if (ioctl (fd, DRM_IOCTL_I915_GEM_CREATE, &create) != 0) {
-	fprintf (stderr, "gem create failed: %m\n");
-	return FALSE;
-    }
-    flink.handle = create.handle;
-    if (ioctl (fd, DRM_IOCTL_GEM_FLINK, &flink) != 0) {
-	fprintf (stderr, "gem flink failed: %m\n");
-	return FALSE;
-    }
-
-    dummy = eagleCreateSurfaceForName (display, config, flink.name,
-				     1, 1, 4, surface_attribs);
-    if (dummy == NULL) {
-	fprintf (stderr, "Failed to create dummy surface\n");
-	return FALSE;
-    }
-
-    eagleMakeCurrent (display, dummy, dummy, context);
-}
-
-cairo_device_t *
-cairo_eagle_context_create (EGLDisplay display, EGLContext context)
-{
-    cairo_eagle_context_t *ctx;
-    cairo_status_t status;
-
-    if (! _eagle_init (display, context))
-	return _cairo_device_create_in_error (CAIRO_STATUS_NO_MEMORY);
-
-    ctx = calloc (1, sizeof (cairo_eagle_context_t));
-    if (ctx == NULL)
-	return _cairo_device_create_in_error (CAIRO_STATUS_NO_MEMORY);
-
-    ctx->display = display;
-    ctx->context = context;
-
-    ctx->base.make_current = _eagle_make_current;
-    ctx->base.swap_buffers = _eagle_swap_buffers;
-    ctx->base.destroy = _eagle_destroy;
-
-    status = _cairo_gl_context_init (&ctx->base);
-    if (status) {
-	free (ctx);
-	return _cairo_device_create_in_error (status);
-    }
-
-    return &ctx->base.base;
-}
-
-cairo_surface_t *
-cairo_gl_surface_create_for_eagle (cairo_device_t	*device,
-				   EGLSurface            eagle,
-				   int                   width,
-				   int                   height)
-{
-    cairo_eagle_surface_t *surface;
-
-    if (unlikely (device->status))
-	return _cairo_surface_create_in_error (device->status);
-
-    if (unlikely (device->backend->type != CAIRO_DEVICE_TYPE_GL))
-	return _cairo_surface_create_in_error (CAIRO_STATUS_DEVICE_TYPE_MISMATCH);
-
-    surface = calloc (1, sizeof (cairo_eagle_surface_t));
-    if (unlikely (surface == NULL))
-	return _cairo_surface_create_in_error (_cairo_error (CAIRO_STATUS_NO_MEMORY));
-
-    _cairo_gl_surface_init (device, &surface->base,
-			    CAIRO_CONTENT_COLOR_ALPHA, width, height);
-    surface->eagle = eagle;
-
-    return &surface->base.base;
-}
diff --git a/src/cairo-gl.h b/src/cairo-gl.h
index 79b241a9..9df9bb7e 100644
--- a/src/cairo-gl.h
+++ b/src/cairo-gl.h
@@ -72,18 +72,6 @@ cairo_gl_surface_create_for_window (cairo_device_t *device,
 				    int width, int height);
 #endif
 
-#if CAIRO_HAS_EAGLE_FUNCTIONS
-#include <eagle.h>
-
-cairo_public cairo_device_t *
-cairo_eagle_device_create (EGLDisplay display, EGLContext context);
-
-cairo_public cairo_surface_t *
-cairo_gl_surface_create_for_eagle (cairo_device_t *device,
-				   EGLSurface surface,
-				   int width, int height);
-#endif
-
 CAIRO_END_DECLS
 
 #else  /* CAIRO_HAS_GL_SURFACE */