[2.0] Remove deprecated GLX API

7 files changed, 2 insertions, 329 deletions

diff --git a/clutter/Makefile.am b/clutter/Makefile.am
index 039ff3268..51e7cee71 100644
--- a/clutter/Makefile.am
+++ b/clutter/Makefile.am
@@ -345,21 +345,9 @@ cogl_source_h_priv = \
 
 cogl_source_c_priv =
 
-if SUPPORT_X11
-# For compatability with the old GLX backend
-#
-# Note: there wasn't actually anything GLX specific so we can add
-# the compatability if clutter supports x11
-glx_source_c = $(srcdir)/cogl/clutter-glx-texture-pixmap.c
-glx_source_h = $(srcdir)/cogl/clutter-glx-texture-pixmap.h \
-	       $(srcdir)/cogl/clutter-glx.h
-clutterglx_includedir = $(clutter_includedir)/glx
-clutterglx_include_HEADERS = $(glx_source_h)
-endif
-
 if SUPPORT_GLX
-backend_source_h += $(cogl_source_h) $(glx_source_h)
-backend_source_c += $(cogl_source_c) $(glx_source_c)
+backend_source_h += $(cogl_source_h)
+backend_source_c += $(cogl_source_c)
 backend_source_h_priv += $(cogl_source_h_priv)
 endif # SUPPORT_GLX
 
diff --git a/clutter/cogl/clutter-glx-texture-pixmap.c b/clutter/cogl/clutter-glx-texture-pixmap.c
deleted file mode 100644
index c1bcdfe9e..000000000
--- a/clutter/cogl/clutter-glx-texture-pixmap.c
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
- * Clutter.
- *
- * An OpenGL based 'interactive canvas' library.
- *
- * Authored By Johan Bilien  <johan.bilien@nokia.com>
- *             Matthew Allum <mallum@o-hand.com>
- *             Robert Bragg  <bob@o-hand.com>
- *             Neil Roberts <neil@linux.intel.com>
- *
- * Copyright (C) 2007 OpenedHand
- * Copyright (C) 2010 Intel Corporation.
- *
- * 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 <http://www.gnu.org/licenses/>.
- *
- *
- */
-
-/**
- * SECTION:clutter-glx-texture-pixmap
- * @Title: ClutterGLXTexturePixmap
- * @short_description: A texture which displays the content of an X Pixmap
- * @Deprecated: 1.4: Use #ClutterX11TexturePixmap instead.
- *
- * #ClutterGLXTexturePixmap is a class for displaying the content of an
- * X Pixmap as a ClutterActor. Used together with the X Composite extension,
- * it allows to display the content of X Windows inside Clutter.
- *
- * This class used to be necessary to use the
- * GLX_EXT_texture_from_pixmap extension to get fast texture
- * updates. However since Clutter 1.4 the handling of this extension
- * has moved down to Cogl. ClutterX11TexturePixmap and
- * ClutterGLXTexturePixmap are now equivalent and either one of them
- * may use the extension if it is possible.
- */
-
-#include "config.h"
-
-#include <string.h>
-
-#include <GL/glx.h>
-
-#include "x11/clutter-x11-texture-pixmap.h"
-
-#include <cogl/cogl-texture-pixmap-x11.h>
-
-#include "clutter-glx-texture-pixmap.h"
-
-G_DEFINE_TYPE (ClutterGLXTexturePixmap,    \
-               clutter_glx_texture_pixmap, \
-               CLUTTER_X11_TYPE_TEXTURE_PIXMAP);
-
-static void
-clutter_glx_texture_pixmap_init (ClutterGLXTexturePixmap *self)
-{
-}
-
-static void
-clutter_glx_texture_pixmap_class_init (ClutterGLXTexturePixmapClass *klass)
-{
-}
-
-/**
- * clutter_glx_texture_pixmap_using_extension:
- * @texture: A #ClutterGLXTexturePixmap
- *
- * Checks whether @texture is using the GLX_EXT_texture_from_pixmap
- * extension; this extension can be optionally (though it is strongly
- * encouraged) implemented as a zero-copy between a GLX pixmap and
- * a GL texture.
- *
- * Return value: %TRUE if the texture is using the
- *   GLX_EXT_texture_from_pixmap OpenGL extension or falling back to the
- *   slower software mechanism.
- *
- * Deprecated: 1.6: Use cogl_texture_pixmap_x11_is_using_tfp_extension()
- *   on the texture handle instead.
- *
- * Since: 0.8
- */
-gboolean
-clutter_glx_texture_pixmap_using_extension (ClutterGLXTexturePixmap *texture)
-{
-  CoglHandle cogl_texture;
-
-  g_return_val_if_fail (CLUTTER_GLX_IS_TEXTURE_PIXMAP (texture), FALSE);
-
-  cogl_texture = clutter_texture_get_cogl_texture (CLUTTER_TEXTURE (texture));
-
-  return (cogl_is_texture_pixmap_x11 (cogl_texture) &&
-          cogl_texture_pixmap_x11_is_using_tfp_extension (cogl_texture));
-}
-
-/**
- * clutter_glx_texture_pixmap_new_with_pixmap:
- * @pixmap: the X Pixmap to which this texture should be bound
- *
- * Creates a new #ClutterGLXTexturePixmap for @pixmap
- *
- * Return value: A new #ClutterGLXTexturePixmap bound to the given X Pixmap
- *
- * Since: 0.8
- *
- * Deprecated: 1.6: Use clutter_x11_texture_pixmap_new_with_pixmap() instead
- */
-ClutterActor *
-clutter_glx_texture_pixmap_new_with_pixmap (Pixmap pixmap)
-{
-  return g_object_new (CLUTTER_GLX_TYPE_TEXTURE_PIXMAP,
-                       "pixmap", pixmap,
-                       NULL);
-}
-
-/**
- * clutter_glx_texture_pixmap_new_with_window:
- * @window: the X window to which this texture should be bound
- *
- * Creates a new #ClutterGLXTexturePixmap for @window
- *
- * Return value: A new #ClutterGLXTexturePixmap bound to the given X window
- *
- * Since: 0.8
- *
- * Deprecated: 1.6: Use clutter_x11_texture_pixmap_new_with_window() instead
- */
-ClutterActor *
-clutter_glx_texture_pixmap_new_with_window (Window window)
-{
-  return g_object_new (CLUTTER_GLX_TYPE_TEXTURE_PIXMAP,
-                       "window", window,
-                       NULL);
-}
-
-/**
- * clutter_glx_texture_pixmap_new:
- *
- * Creates a new, empty #ClutterGLXTexturePixmap
- *
- * Return value: A new #ClutterGLXTexturePixmap
- *
- * Since: 0.8
- *
- * Deprecated: 1.6: Use clutter_x11_texture_pixmap_new() instead
- */
-ClutterActor *
-clutter_glx_texture_pixmap_new (void)
-{
-  return g_object_new (CLUTTER_GLX_TYPE_TEXTURE_PIXMAP, NULL);
-}
diff --git a/clutter/cogl/clutter-glx-texture-pixmap.h b/clutter/cogl/clutter-glx-texture-pixmap.h
deleted file mode 100644
index 5479510d2..000000000
--- a/clutter/cogl/clutter-glx-texture-pixmap.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Clutter.
- *
- * An OpenGL based 'interactive canvas' library.
- *
- * Authored By Johan Bilien  <johan.bilien@nokia.com>
- *
- * Copyright (C) 2007 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 <http://www.gnu.org/licenses/>.
- *
- *
- */
-
-#ifndef __CLUTTER_GLX_TEXTURE_PIXMAP_H__
-#define __CLUTTER_GLX_TEXTURE_PIXMAP_H__
-
-#include <clutter/x11/clutter-x11-texture-pixmap.h>
-
-#if !defined(CLUTTER_DISABLE_DEPRECATED) || defined(CLUTTER_COMPILATION)
-
-G_BEGIN_DECLS
-
-#define CLUTTER_GLX_TYPE_TEXTURE_PIXMAP            (clutter_glx_texture_pixmap_get_type ())
-#define CLUTTER_GLX_TEXTURE_PIXMAP(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), CLUTTER_GLX_TYPE_TEXTURE_PIXMAP, ClutterGLXTexturePixmap))
-#define CLUTTER_GLX_TEXTURE_PIXMAP_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), CLUTTER_GLX_TYPE_TEXTURE_PIXMAP, ClutterGLXTexturePixmapClass))
-#define CLUTTER_GLX_IS_TEXTURE_PIXMAP(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CLUTTER_GLX_TYPE_TEXTURE_PIXMAP))
-#define CLUTTER_GLX_IS_TEXTURE_PIXMAP_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CLUTTER_GLX_TYPE_TEXTURE_PIXMAP))
-#define CLUTTER_GLX_TEXTURE_PIXMAP_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), CLUTTER_GLX_TYPE_TEXTURE_PIXMAP, ClutterGLXTexturePixmapClass))
-
-typedef struct _ClutterGLXTexturePixmap        ClutterGLXTexturePixmap;
-typedef struct _ClutterGLXTexturePixmapClass   ClutterGLXTexturePixmapClass;
-typedef struct _ClutterGLXTexturePixmapPrivate ClutterGLXTexturePixmapPrivate;
-
-/**
- * ClutterGLXTexturePixmapClass:
- *
- * The #ClutterGLXTexturePixmapClass structure contains only private data
- *
- * Since: 0.8
- *
- * Deprecated: 1.6: Use #ClutterX11TexturePixmapClass instead
- */
-struct _ClutterGLXTexturePixmapClass
-{
-  /*< private >*/
-  ClutterX11TexturePixmapClass   parent_class;
-};
-
-/**
- * ClutterGLXTexturePixmap:
- *
- * The #ClutterGLXTexturePixmap structure contains only private data
- *
- * Since: 0.8
- *
- * Deprecated: 1.6: Use #ClutterX11TexturePixmap instead
- */
-struct _ClutterGLXTexturePixmap
-{
-  /*< private >*/
-  ClutterX11TexturePixmap         parent;
-
-  ClutterGLXTexturePixmapPrivate *priv;
-};
-
-GType clutter_glx_texture_pixmap_get_type (void);
-
-ClutterActor * clutter_glx_texture_pixmap_new (void);
-
-ClutterActor * clutter_glx_texture_pixmap_new_with_pixmap (Pixmap pixmap);
-
-ClutterActor * clutter_glx_texture_pixmap_new_with_window (Window window);
-
-gboolean       clutter_glx_texture_pixmap_using_extension (ClutterGLXTexturePixmap *texture);
-
-G_END_DECLS
-
-#endif /* !CLUTTER_DISABLE_DEPRECATED || !CLUTTER_COMPILATION */
-
-#endif /* __CLUTTER_GLX_TEXTURE_PIXMAP_H__ */
diff --git a/clutter/cogl/clutter-glx.h b/clutter/cogl/clutter-glx.h
deleted file mode 100644
index 04b001e99..000000000
--- a/clutter/cogl/clutter-glx.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Clutter.
- *
- * An OpenGL based 'interactive canvas' library.
- *
- * Authored By Matthew Allum  <mallum@openedhand.com>
- *
- * 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 <http://www.gnu.org/licenses/>.
- *
- *
- */
-
-#ifndef __CLUTTER_GLX_H__
-#define __CLUTTER_GLX_H__
-
-#include <glib.h>
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-#include <X11/Xatom.h>
-#include <clutter/clutter.h>
-#include <clutter/glx/clutter-glx-texture-pixmap.h>
-
-#endif /* __CLUTTER_GLX_H__ */
diff --git a/doc/reference/clutter/Makefile.am b/doc/reference/clutter/Makefile.am
index 7dc39eeca..e38d08840 100644
--- a/doc/reference/clutter/Makefile.am
+++ b/doc/reference/clutter/Makefile.am
@@ -52,7 +52,6 @@ HFILE_GLOB=\
 	$(top_builddir)/clutter/*.h \
 	$(top_srcdir)/clutter/x11/clutter-x11.h \
 	$(top_srcdir)/clutter/x11/clutter-x11-texture-pixmap.h \
-	$(top_srcdir)/clutter/cogl/clutter-glx-texture-pixmap.h \
 	$(top_srcdir)/clutter/cogl/clutter-egl.h \
 	$(top_srcdir)/clutter/cogl/clutter-cex100.h \
 	$(top_srcdir)/clutter/win32/clutter-win32.h
@@ -105,7 +104,6 @@ IGNORE_HFILES=\
 EXTRA_HFILES=\
         $(top_srcdir)/clutter/x11/clutter-x11.h \
 	$(top_srcdir)/clutter/x11/clutter-x11-texture-pixmap.h \
-	$(top_srcdir)/clutter/cogl/clutter-glx-texture-pixmap.h \
 	$(top_srcdir)/clutter/cogl/clutter-egl.h \
 	$(top_srcdir)/clutter/cogl/clutter-cex100.h \
 	$(top_srcdir)/clutter/wayland/clutter-wayland.h \
diff --git a/doc/reference/clutter/clutter-docs.xml.in b/doc/reference/clutter/clutter-docs.xml.in
index 7a2c7b5cc..12879d253 100644
--- a/doc/reference/clutter/clutter-docs.xml.in
+++ b/doc/reference/clutter/clutter-docs.xml.in
@@ -220,7 +220,6 @@
     <xi:include href="xml/clutter-backend.xml"/>
     <xi:include href="xml/clutter-x11.xml"/>
     <xi:include href="xml/clutter-x11-texture-pixmap.xml"/>
-    <xi:include href="xml/clutter-glx-texture-pixmap.xml"/>
     <xi:include href="xml/clutter-win32.xml"/>
     <xi:include href="xml/clutter-egl.xml"/>
     <xi:include href="xml/clutter-cex100.xml"/>
diff --git a/doc/reference/clutter/clutter-sections.txt b/doc/reference/clutter/clutter-sections.txt
index a6f775889..8c10e8915 100644
--- a/doc/reference/clutter/clutter-sections.txt
+++ b/doc/reference/clutter/clutter-sections.txt
@@ -1302,30 +1302,6 @@ ClutterX11TexturePixmapPrivate
 </SECTION>
 
 <SECTION>
-<FILE>clutter-glx-texture-pixmap</FILE>
-ClutterGLXTexturePixmap
-ClutterGLXTexturePixmapClass
-clutter_glx_texture_pixmap_new
-clutter_glx_texture_pixmap_new_with_pixmap
-clutter_glx_texture_pixmap_new_with_window
-
-<SUBSECTION>
-clutter_glx_texture_pixmap_using_extension
-
-<SUBSECTION Standard>
-CLUTTER_GLX_TYPE_TEXTURE_PIXMAP
-CLUTTER_GLX_TEXTURE_PIXMAP
-CLUTTER_GLX_IS_TEXTURE_PIXMAP
-CLUTTER_GLX_TEXTURE_PIXMAP_CLASS
-CLUTTER_GLX_IS_TEXTURE_PIXMAP_CLASS
-CLUTTER_GLX_TEXTURE_PIXMAP_GET_CLASS
-
-<SUBSECTION Private>
-ClutterGLXTexturePixmapPrivate
-clutter_glx_texture_pixmap_get_type
-</SECTION>
-
-<SECTION>
 <FILE>clutter-win32</FILE>
 <TITLE>Win32 Specific Support</TITLE>
 clutter_win32_disable_event_retrieval