brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't do anything special with COGL_ENABLE_EXPERIMENTAL_2_0_API

Browse Source 
This flag solely disables deprecated Cogl 1.0 API, so it
shouldn't be used for feature checks.

https://bugzilla.gnome.org/show_bug.cgi?id=694229
This commit is contained in:
Jasper St. Pierre 2013-02-19 19:53:43 -05:00 committed by Emmanuele Bassi
parent 6bef2cff19
commit 534e994972
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clutter/clutter-backend.h
View File

@ -31,7 +31,7 @@
#include <cairo.h> #include <cairo.h>
#include <pango/pango.h> #include <pango/pango.h>
#ifdef COGL_ENABLE_EXPERIMENTAL_2_0_API #ifdef COGL_ENABLE_EXPERIMENTAL_API
#include <cogl/cogl.h> #include <cogl/cogl.h>
#endif #endif

4
clutter/clutter-paint-node.h
View File

@ -66,14 +66,14 @@ void clutter_paint_node_add_texture_rectangle (Clutter
float y_1, float y_1,
float x_2, float x_2,
float y_2); float y_2);
#if defined(COGL_ENABLE_EXPERIMENTAL_2_0_API) && defined(CLUTTER_ENABLE_EXPERIMENTAL_API) #if defined(COGL_ENABLE_EXPERIMENTAL_API) && defined(CLUTTER_ENABLE_EXPERIMENTAL_API)
CLUTTER_AVAILABLE_IN_1_10 CLUTTER_AVAILABLE_IN_1_10
void clutter_paint_node_add_path (ClutterPaintNode *node, void clutter_paint_node_add_path (ClutterPaintNode *node,
CoglPath *path); CoglPath *path);
CLUTTER_AVAILABLE_IN_1_10 CLUTTER_AVAILABLE_IN_1_10
void clutter_paint_node_add_primitive (ClutterPaintNode *node, void clutter_paint_node_add_primitive (ClutterPaintNode *node,
CoglPrimitive *primitive); CoglPrimitive *primitive);
#endif /* COGL_ENABLE_EXPERIMENTAL_2_0_API && CLUTTER_ENABLE_EXPERIMENTAL_API */ #endif /* COGL_ENABLE_EXPERIMENTAL_API && CLUTTER_ENABLE_EXPERIMENTAL_API */
/** /**
* CLUTTER_VALUE_HOLDS_PAINT_NODE: * CLUTTER_VALUE_HOLDS_PAINT_NODE:

4
clutter/clutter-paint-nodes.h
View File

@ -118,10 +118,10 @@ typedef struct _ClutterPipelineNodeClass ClutterPipelineNodeClass;
CLUTTER_AVAILABLE_IN_1_10 CLUTTER_AVAILABLE_IN_1_10
GType clutter_pipeline_node_get_type (void) G_GNUC_CONST; GType clutter_pipeline_node_get_type (void) G_GNUC_CONST;
#if defined(COGL_ENABLE_EXPERIMENTAL_2_0_API) && defined(CLUTTER_ENABLE_EXPERIMENTAL_API) #if defined(COGL_ENABLE_EXPERIMENTAL_API) && defined(CLUTTER_ENABLE_EXPERIMENTAL_API)
CLUTTER_AVAILABLE_IN_1_10 CLUTTER_AVAILABLE_IN_1_10
ClutterPaintNode * clutter_pipeline_node_new (CoglPipeline *pipeline); ClutterPaintNode * clutter_pipeline_node_new (CoglPipeline *pipeline);
#endif /* COGL_ENABLE_EXPERIMENTAL_2_0_API && CLUTTER_ENABLE_EXPERIMENTAL_API */ #endif /* COGL_ENABLE_EXPERIMENTAL_API && CLUTTER_ENABLE_EXPERIMENTAL_API */
#define CLUTTER_TYPE_TEXT_NODE (clutter_text_node_get_type ()) #define CLUTTER_TYPE_TEXT_NODE (clutter_text_node_get_type ())
#define CLUTTER_TEXT_NODE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CLUTTER_TYPE_TEXT_NODE, ClutterTextNode)) #define CLUTTER_TEXT_NODE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CLUTTER_TYPE_TEXT_NODE, ClutterTextNode))