mirror of
https://github.com/brl/mutter.git
synced 2024-09-19 22:15:54 -04:00
clutter: Remove unused clutter-glx-texture-pixmap.c and friends
https://gitlab.gnome.org/GNOME/mutter/merge_requests/452
This commit is contained in:
Adam Jackson
Georges Basile Stavracas Neto
parent
8f0b4767de
commit
5669b64021
@ -1,159 +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 "clutter-build-config.h"
|
||||
|
||||
#include <string.h>
|
||||
|
||||
#define CLUTTER_DISABLE_DEPRECATION_WARNINGS
|
||||
#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);
|
||||
}
|
||||
@ -1,93 +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>
|
||||
|
||||
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;
|
||||
};
|
||||
|
||||
CLUTTER_DEPRECATED_FOR(clutter_x11_texture_pixmap_get_type)
|
||||
GType clutter_glx_texture_pixmap_get_type (void);
|
||||
|
||||
CLUTTER_DEPRECATED_FOR(clutter_x11_texture_pixmap_new)
|
||||
ClutterActor * clutter_glx_texture_pixmap_new (void);
|
||||
|
||||
CLUTTER_DEPRECATED_FOR(clutter_x11_texture_pixmap_new_with_pixmap)
|
||||
ClutterActor * clutter_glx_texture_pixmap_new_with_pixmap (Pixmap pixmap);
|
||||
|
||||
CLUTTER_DEPRECATED_FOR(clutter_x11_texture_pixmap_new_with_window)
|
||||
ClutterActor * clutter_glx_texture_pixmap_new_with_window (Window window);
|
||||
|
||||
CLUTTER_DEPRECATED_FOR(cogl_texture_pixmap_x11_is_using_tfp_extension)
|
||||
gboolean clutter_glx_texture_pixmap_using_extension (ClutterGLXTexturePixmap *texture);
|
||||
|
||||
G_END_DECLS
|
||||
|
||||
#endif /* __CLUTTER_GLX_TEXTURE_PIXMAP_H__ */
|
||||
@ -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__ */
|
||||
Loading…
Reference in New Issue
Block a user