isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-12-23 19:42:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

glx: Deprecate ClutterGLXTexturePixmap

Browse Source 
Since 1.4 the ClutterGLXTexturePixmap is just a wrapper around
ClutterX11TexturePixmap, so we can safely deprecate it. All the
functionality it provided is now effectively available from the
superclass or directly from Cogl.
This commit is contained in:
Emmanuele Bassi 2011-01-20 13:19:03 +00:00
parent 770bcd5b40
commit cd96e631f1
2 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
clutter/glx/clutter-glx-texture-pixmap.c
View File

@ -43,23 +43,21 @@
* may use the extension if it is possible.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "clutter-glx-texture-pixmap.h"
#include <string.h>
#include "../x11/clutter-x11-texture-pixmap.h"
#include "clutter-glx-texture-pixmap.h"
#include <GL/glx.h>
#include "x11/clutter-x11-texture-pixmap.h"
#include "cogl/winsys/cogl-texture-pixmap-x11.h"
G_DEFINE_TYPE (ClutterGLXTexturePixmap, \
clutter_glx_texture_pixmap, \
CLUTTER_X11_TYPE_TEXTURE_PIXMAP);
static void
clutter_glx_texture_pixmap_init (ClutterGLXTexturePixmap *self)
{
@ -83,6 +81,9 @@ clutter_glx_texture_pixmap_class_init (ClutterGLXTexturePixmapClass *klass)
* 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
@ -107,6 +108,8 @@ clutter_glx_texture_pixmap_using_extension (ClutterGLXTexturePixmap *texture)
* 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)
@ -125,7 +128,9 @@ clutter_glx_texture_pixmap_new_with_pixmap (Pixmap pixmap)
* 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)
{
@ -142,6 +147,8 @@ clutter_glx_texture_pixmap_new_with_window (Window window)
* 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)

12
clutter/glx/clutter-glx-texture-pixmap.h
View File

@ -26,11 +26,9 @@
#ifndef __CLUTTER_GLX_TEXTURE_PIXMAP_H__
#define __CLUTTER_GLX_TEXTURE_PIXMAP_H__
#include <glib.h>
#include <glib-object.h>
#include <clutter/x11/clutter-x11-texture-pixmap.h>
#include <GL/glx.h>
#if !defined(CLUTTER_COMPILATION) || defined(CLUTTER_DISABLE_DEPRECATED)
G_BEGIN_DECLS
@ -51,6 +49,8 @@ typedef struct _ClutterGLXTexturePixmapPrivate ClutterGLXTexturePixmapPrivate;
* The #ClutterGLXTexturePixmapClass structure contains only private data
*
* Since: 0.8
*
* Deprecated: 1.6: Use #ClutterX11TexturePixmapClass instead
*/
struct _ClutterGLXTexturePixmapClass
{
@ -64,6 +64,8 @@ struct _ClutterGLXTexturePixmapClass
* The #ClutterGLXTexturePixmap structure contains only private data
*
* Since: 0.8
*
* Deprecated: 1.6: Use #ClutterX11TexturePixmap instead
*/
struct _ClutterGLXTexturePixmap
{
@ -85,4 +87,6 @@ gboolean clutter_glx_texture_pixmap_using_extension (ClutterGLXTexturePixm
G_END_DECLS
#endif
#endif /* !CLUTTER_DISABLE_DEPRECATED || CLUTTER_COMPILATION */
#endif /* __CLUTTER_GLX_TEXTURE_PIXMAP_H__ */