diff --git a/cogl.h.in b/cogl.h.in index 02d54dce7..3f23621f9 100644 --- a/cogl.h.in +++ b/cogl.h.in @@ -43,7 +43,6 @@ #define __COGL_H__ #include -#include #include #include @@ -176,7 +175,6 @@ typedef enum COGL_FEATURE_OFFSCREEN_BLIT = (1 << 8), COGL_FEATURE_FOUR_CLIP_PLANES = (1 << 9), COGL_FEATURE_STENCIL_BUFFER = (1 << 10) - } CoglFeatureFlags; /** @@ -274,7 +272,7 @@ typedef void (* CoglFuncPtr) (void); * * Since: 0.8 */ -ClutterFeatureFlags cogl_get_features (void); +CoglFeatureFlags cogl_get_features (void); /** * cogl_features_available: diff --git a/gl/cogl.c b/gl/cogl.c index 2b9446b9d..e17a8adf9 100644 --- a/gl/cogl.c +++ b/gl/cogl.c @@ -939,9 +939,9 @@ really_enable_npot (void) static void _cogl_features_init () { - ClutterFeatureFlags flags = 0; - const gchar *gl_extensions; - GLint max_clip_planes = 0; + CoglFeatureFlags flags = 0; + const gchar *gl_extensions; + GLint max_clip_planes = 0; _COGL_GET_CONTEXT (ctx, NO_RETVAL); @@ -1121,7 +1121,7 @@ _cogl_features_init () ctx->features_cached = TRUE; } -ClutterFeatureFlags +CoglFeatureFlags cogl_get_features () { _COGL_GET_CONTEXT (ctx, 0); diff --git a/gles/cogl.c b/gles/cogl.c index 490c97447..7e13e0db0 100644 --- a/gles/cogl.c +++ b/gles/cogl.c @@ -816,8 +816,8 @@ cogl_setup_viewport (guint w, static void _cogl_features_init () { - ClutterFeatureFlags flags = 0; - int max_clip_planes = 0; + CoglFeatureFlags flags = 0; + int max_clip_planes = 0; _COGL_GET_CONTEXT (ctx, NO_RETVAL); @@ -838,7 +838,7 @@ _cogl_features_init () ctx->features_cached = TRUE; } -ClutterFeatureFlags +CoglFeatureFlags cogl_get_features () { _COGL_GET_CONTEXT (ctx, 0);