[mutter] Do not use ClutterGLXTexturePixmap

[Emmanuele Bassi <ebassi src gnome org>]

commit f396a7aeb42c701ef5b980442daa007ce18e2439
Author: Emmanuele Bassi <ebassi linux intel com>
Date:   Thu Jul 21 17:45:19 2011 +0100

    Do not use ClutterGLXTexturePixmap
    
    MetaShapedTexture can be a ClutterX11TexturePixmap sub-class, given that
    ClutterGLXTexturePixmap is just a shim compatibility layer since Clutter
    1.4, and it's been deprecated.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=655064

 src/compositor/meta-shaped-texture.c |    5 -----
 src/compositor/meta-shaped-texture.h |   12 ------------
 2 files changed, 0 insertions(+), 17 deletions(-)
---
diff --git a/src/compositor/meta-shaped-texture.c b/src/compositor/meta-shaped-texture.c
index feeedda..fa6d5f2 100644
--- a/src/compositor/meta-shaped-texture.c
+++ b/src/compositor/meta-shaped-texture.c
@@ -50,13 +50,8 @@ static void meta_shaped_texture_update_area (ClutterX11TexturePixmap *texture,
 
 static void meta_shaped_texture_dirty_mask (MetaShapedTexture *stex);
 
-#ifdef HAVE_GLX_TEXTURE_PIXMAP
-G_DEFINE_TYPE (MetaShapedTexture, meta_shaped_texture,
-               CLUTTER_GLX_TYPE_TEXTURE_PIXMAP);
-#else /* HAVE_GLX_TEXTURE_PIXMAP */
 G_DEFINE_TYPE (MetaShapedTexture, meta_shaped_texture,
                CLUTTER_X11_TYPE_TEXTURE_PIXMAP);
-#endif /* HAVE_GLX_TEXTURE_PIXMAP */
 
 #define META_SHAPED_TEXTURE_GET_PRIVATE(obj) \
   (G_TYPE_INSTANCE_GET_PRIVATE ((obj), META_TYPE_SHAPED_TEXTURE, \
diff --git a/src/compositor/meta-shaped-texture.h b/src/compositor/meta-shaped-texture.h
index da19449..be53268 100644
--- a/src/compositor/meta-shaped-texture.h
+++ b/src/compositor/meta-shaped-texture.h
@@ -29,11 +29,7 @@
 #include <config.h>
 
 #include <clutter/clutter.h>
-#ifdef HAVE_GLX_TEXTURE_PIXMAP
-#include <clutter/glx/clutter-glx.h>
-#else
 #include <clutter/x11/clutter-x11.h>
-#endif /* HAVE_GLX_TEXTURE_PIXMAP */
 
 G_BEGIN_DECLS
 
@@ -50,20 +46,12 @@ typedef struct _MetaShapedTexturePrivate MetaShapedTexturePrivate;
 
 struct _MetaShapedTextureClass
 {
-#ifdef HAVE_GLX_TEXTURE_PIXMAP
-  ClutterGLXTexturePixmapClass parent_class;
-#else
   ClutterX11TexturePixmapClass parent_class;
-#endif
 };
 
 struct _MetaShapedTexture
 {
-#ifdef HAVE_GLX_TEXTURE_PIXMAP
-  ClutterGLXTexturePixmap parent;
-#else
   ClutterX11TexturePixmap parent;
-#endif
 
   MetaShapedTexturePrivate *priv;
 };