[clutter/clutter-1.99] [2.0] Remove deprecated GLX API
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [clutter/clutter-1.99] [2.0] Remove deprecated GLX API
- Date: Wed, 22 Jun 2011 12:01:13 +0000 (UTC)
commit c4a53e92de9105951f8a41cedd882459e331aab6
Author: Emmanuele Bassi <ebassi linux intel com>
Date: Wed Jun 22 12:55:25 2011 +0100
[2.0] Remove deprecated GLX API
clutter/Makefile.am | 16 +---
clutter/cogl/clutter-glx-texture-pixmap.c | 160 ----------------------------
clutter/cogl/clutter-glx-texture-pixmap.h | 92 ----------------
clutter/cogl/clutter-glx.h | 36 ------
doc/reference/clutter/Makefile.am | 2 -
doc/reference/clutter/clutter-docs.xml.in | 1 -
doc/reference/clutter/clutter-sections.txt | 24 ----
7 files changed, 2 insertions(+), 329 deletions(-)
---
diff --git a/clutter/Makefile.am b/clutter/Makefile.am
index 039ff32..51e7cee 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/doc/reference/clutter/Makefile.am b/doc/reference/clutter/Makefile.am
index 7dc39ee..e38d088 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 7a2c7b5..12879d2 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 a6f7758..8c10e89 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
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]