isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-26 18:11:05 -05:00
Code Issues Packages Projects Releases Wiki Activity

Removed unused conditional

Browse Source 
USE_COGL_MATERIAL is a left-over from the development branch.
This commit is contained in:
Emmanuele Bassi 2009-01-27 16:40:51 +00:00
parent 3cfc7fb1ca
commit 865f04decd
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
clutter/clutter-texture.h
View File

@ -33,8 +33,6 @@
G_BEGIN_DECLS G_BEGIN_DECLS
#define USE_COGL_MATERIAL 1
#define CLUTTER_TYPE_TEXTURE (clutter_texture_get_type ()) #define CLUTTER_TYPE_TEXTURE (clutter_texture_get_type ())
#define CLUTTER_TEXTURE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CLUTTER_TYPE_TEXTURE, ClutterTexture)) #define CLUTTER_TEXTURE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CLUTTER_TYPE_TEXTURE, ClutterTexture))
#define CLUTTER_TEXTURE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), CLUTTER_TYPE_TEXTURE, ClutterTextureClass)) #define CLUTTER_TEXTURE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), CLUTTER_TYPE_TEXTURE, ClutterTextureClass))
@ -43,9 +41,7 @@ G_BEGIN_DECLS
#define CLUTTER_TEXTURE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), CLUTTER_TYPE_TEXTURE, ClutterTextureClass)) #define CLUTTER_TEXTURE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), CLUTTER_TYPE_TEXTURE, ClutterTextureClass))
#define CLUTTER_TYPE_TEXTURE_HANDLE (clutter_texture_handle_get_type ()) #define CLUTTER_TYPE_TEXTURE_HANDLE (clutter_texture_handle_get_type ())
#if USE_COGL_MATERIAL
#define CLUTTER_TYPE_MATERIAL_HANDLE (clutter_material_handle_get_type ()) #define CLUTTER_TYPE_MATERIAL_HANDLE (clutter_material_handle_get_type ())
#endif
/** /**
* ClutterTextureError: * ClutterTextureError:
@ -141,9 +137,7 @@ typedef enum { /*< prefix=CLUTTER_TEXTURE_QUALITY >*/
GType clutter_texture_get_type (void) G_GNUC_CONST; GType clutter_texture_get_type (void) G_GNUC_CONST;
GType clutter_texture_handle_get_type (void) G_GNUC_CONST; GType clutter_texture_handle_get_type (void) G_GNUC_CONST;
#if USE_COGL_MATERIAL
GType clutter_material_handle_get_type (void) G_GNUC_CONST; GType clutter_material_handle_get_type (void) G_GNUC_CONST;
#endif
ClutterActor * clutter_texture_new (void); ClutterActor * clutter_texture_new (void);
ClutterActor * clutter_texture_new_from_file (const gchar *filename, ClutterActor * clutter_texture_new_from_file (const gchar *filename,
@ -190,11 +184,9 @@ gint clutter_texture_get_max_tile_waste (ClutterTexture
CoglHandle clutter_texture_get_cogl_texture (ClutterTexture *texture); CoglHandle clutter_texture_get_cogl_texture (ClutterTexture *texture);
void clutter_texture_set_cogl_texture (ClutterTexture *texture, void clutter_texture_set_cogl_texture (ClutterTexture *texture,
CoglHandle cogl_tex); CoglHandle cogl_tex);
#if USE_COGL_MATERIAL
CoglHandle clutter_texture_get_cogl_material (ClutterTexture *texture); CoglHandle clutter_texture_get_cogl_material (ClutterTexture *texture);
void clutter_texture_set_cogl_material (ClutterTexture *texture, void clutter_texture_set_cogl_material (ClutterTexture *texture,
CoglHandle cogl_material); CoglHandle cogl_material);
#endif
G_END_DECLS G_END_DECLS