diff --git a/src/compositor/meta-shaped-texture.c b/src/compositor/meta-shaped-texture.c index feeeddae4..fa6d5f2f2 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 da194497e..be53268bb 100644 --- a/src/compositor/meta-shaped-texture.h +++ b/src/compositor/meta-shaped-texture.h @@ -29,11 +29,7 @@ #include #include -#ifdef HAVE_GLX_TEXTURE_PIXMAP -#include -#else #include -#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; };