2008-10-30 Emmanuele Bassi <ebassi@linux.intel.com>

	Bug 1211 - Drop ClutterFeatureFlags usage from COGL

	* clutter/cogl/cogl.h.in:
	* clutter/cogl/gl/cogl.c:
	* clutter/cogl/gles/cogl.c: Do not use ClutterFeatureFlags
	when CoglFeatureFlags will do. This removes the last usage
	of Clutter API inside COGL.

diff --git a/ChangeLog b/ChangeLog
index c005acf..af06dc9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
 2008-10-30  Emmanuele Bassi  <ebassi@linux.intel.com>
 
+       Bug 1211 - Drop ClutterFeatureFlags usage from COGL
+
+       * clutter/cogl/cogl.h.in:
+       * clutter/cogl/gl/cogl.c:
+       * clutter/cogl/gles/cogl.c: Do not use ClutterFeatureFlags
+       when CoglFeatureFlags will do. This removes the last usage
+       of Clutter API inside COGL.
+
+2008-10-30  Emmanuele Bassi  <ebassi@linux.intel.com>
+
        Bug 1210 - Add CoglColor API
 
        * clutter/cogl/cogl-color.h:

diff --git a/clutter/cogl/cogl.h.in b/clutter/cogl/cogl.h.in
index 02d54dc..3f23621 100644 (file)
--- a/clutter/cogl/cogl.h.in
+++ b/clutter/cogl/cogl.h.in
@@ -43,7 +43,6 @@
 #define __COGL_H__
 
 #include <glib.h>
-#include <clutter/clutter-feature.h>
 
 #include <cogl/cogl-defines-@CLUTTER_COGL@.h>
 #include <cogl/cogl-fixed.h>
@@ -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/clutter/cogl/gl/cogl.c b/clutter/cogl/gl/cogl.c
index 2b9446b..e17a8ad 100644 (file)
--- a/clutter/cogl/gl/cogl.c
+++ b/clutter/cogl/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/clutter/cogl/gles/cogl.c b/clutter/cogl/gles/cogl.c
index 490c974..7e13e0d 100644 (file)
--- a/clutter/cogl/gles/cogl.c
+++ b/clutter/cogl/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);