GNOME.org
 

[mutter] Remove cogl-1.0 vs cogl-2.0 vs cogl experimental API split

commit d62d780a9526c4d4d739983be04c6c82146d3ef5
Author: Jonas Ådahl <jadahl gmail com>
Date:   Thu Jun 16 15:04:40 2016 -0400

    Remove cogl-1.0 vs cogl-2.0 vs cogl experimental API split
    
    Mutter (and libmutter users) are the only users of this version of
    cogl, and will more or less only use the cogl-1.0, cogl-2.0 and cogl
    experimental API variants, and having the possibility of having
    different API versions of the same API depending on what file includes
    it is error prone and confusing. Lets just remove the possibility of
    having different versions of the same API.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=768977

 clutter/clutter/Makefile.am                        |    2 -
 clutter/clutter/clutter-actor.h                    |    3 -
 clutter/clutter/clutter-backend.c                  |    2 +-
 clutter/clutter/clutter-backend.h                  |    4 -
 clutter/clutter/clutter-build-config.h.in          |    3 -
 clutter/clutter/clutter-cogl-compat.h              |   52 ---
 clutter/clutter/clutter-image.h                    |    2 -
 clutter/clutter/clutter-offscreen-effect.c         |    4 +-
 clutter/clutter/clutter-offscreen-effect.h         |    1 -
 clutter/clutter/clutter-paint-node.c               |    4 +-
 clutter/clutter/clutter-paint-node.h               |    3 +-
 clutter/clutter/clutter-paint-nodes.c              |    2 +-
 clutter/clutter/clutter-paint-nodes.h              |    2 -
 clutter/clutter/deprecated/clutter-texture.c       |   10 +-
 clutter/configure.ac                               |    6 -
 clutter/tests/interactive/test-cogl-primitives.c   |    1 -
 cogl/cogl-pango/Makefile.am                        |   18 +-
 cogl/cogl-pango/cogl-pango.h                       |    4 +-
 cogl/cogl-path/Makefile.am                         |    4 +-
 ...ogl2-path-functions.h => cogl-path-functions.h} |   10 +-
 cogl/cogl-path/cogl-path.h                         |    7 +-
 cogl/cogl-path/cogl1-path-functions.h              |  467 --------------------
 cogl/cogl-path/cogl1-path.c                        |  353 ---------------
 cogl/cogl/Makefile.am                              |   62 +--
 cogl/cogl/cogl-bitmap.h                            |   12 +-
 cogl/cogl/cogl-context.h                           |    8 -
 cogl/cogl/cogl-enum-types.c.in                     |   50 --
 cogl/cogl/cogl-enum-types.h.in                     |   25 -
 cogl/cogl/cogl-framebuffer.h                       |   15 -
 cogl/cogl/cogl-matrix.h                            |   14 -
 cogl/cogl/cogl-object.h                            |    4 -
 cogl/cogl/cogl-pango.h                             |    4 -
 cogl/cogl/cogl-pipeline-layer-state.h              |    4 -
 cogl/cogl/cogl-pipeline-state.h                    |    4 -
 cogl/cogl/cogl-pipeline.h                          |    5 -
 cogl/cogl/cogl-pixel-buffer.h                      |    4 +
 cogl/cogl/cogl-texture.h                           |    5 -
 cogl/cogl/cogl-xlib-renderer.h                     |    2 +-
 cogl/cogl/cogl.h                                   |   21 +-
 cogl/cogl/cogl2-experimental.h                     |   37 --
 cogl/cogl/deprecated/cogl-auto-texture.h           |    2 +
 cogl/cogl/deprecated/cogl-framebuffer-deprecated.h |    9 +-
 cogl/cogl/deprecated/cogl-material-compat.h        |    4 -
 cogl/cogl/winsys/cogl-texture-pixmap-x11.h         |    4 -
 cogl/configure.ac                                  |   19 -
 cogl/tests/conform/test-fence.c                    |    4 -
 cogl/tests/conform/test-path-clip.c                |    1 -
 cogl/tests/conform/test-path.c                     |    1 -
 cogl/tests/conform/test-point-size.c               |    2 +-
 cogl/tests/conform/test-point-sprite.c             |    2 +-
 cogl/tests/conform/test-read-texture-formats.c     |    2 +-
 cogl/tests/conform/test-sparse-pipeline.c          |    2 +-
 cogl/tests/conform/test-texture-3d.c               |    2 +-
 cogl/tests/conform/test-version.c                  |    4 -
 cogl/tests/conform/test-write-texture-formats.c    |    2 +-
 cogl/tests/micro-perf/Makefile.am                  |    5 +-
 cogl/tests/micro-perf/test-journal.c               |    2 +-
 57 files changed, 64 insertions(+), 1243 deletions(-)
---
diff --git a/clutter/clutter/Makefile.am b/clutter/clutter/Makefile.am
index d22fa6a..3a1370d 100644
--- a/clutter/clutter/Makefile.am
+++ b/clutter/clutter/Makefile.am
@@ -16,7 +16,6 @@ AM_CPPFLAGS = \
        -DCLUTTER_LOCALEDIR=\""$(localedir)"\"  \
        -DCLUTTER_SYSCONFDIR=\""$(sysconfdir)"\" \
        -DCLUTTER_COMPILATION=1                 \
-       -DCOGL_ENABLE_EXPERIMENTAL_API          \
        -DCOGL_DISABLE_DEPRECATION_WARNINGS     \
        -DG_LOG_DOMAIN=\"Clutter\"              \
        -I$(top_srcdir)                         \
@@ -62,7 +61,6 @@ source_h =                                    \
        clutter-canvas.h                \
        clutter-child-meta.h            \
        clutter-click-action.h  \
-       clutter-cogl-compat.h   \
        clutter-clone.h         \
        clutter-color-static.h  \
        clutter-color.h         \
diff --git a/clutter/clutter/clutter-actor.h b/clutter/clutter/clutter-actor.h
index bac78c1..0c5a08c 100644
--- a/clutter/clutter/clutter-actor.h
+++ b/clutter/clutter/clutter-actor.h
@@ -856,8 +856,6 @@ CLUTTER_AVAILABLE_IN_1_10
 void                            clutter_actor_remove_all_transitions            (ClutterActor               
*self);
 
 
-/* Experimental API */
-#ifdef CLUTTER_ENABLE_EXPERIMENTAL_API
 CLUTTER_AVAILABLE_IN_1_16
 gboolean                        clutter_actor_has_mapped_clones                 (ClutterActor *self);
 CLUTTER_AVAILABLE_IN_1_22
@@ -865,7 +863,6 @@ void                            clutter_actor_set_opacity_override
                                                                                  gint                        
opacity);
 CLUTTER_AVAILABLE_IN_1_22
 gint                            clutter_actor_get_opacity_override              (ClutterActor               
*self);
-#endif
 
 /**
  * ClutterActorCreateChildFunc:
diff --git a/clutter/clutter/clutter-backend.c b/clutter/clutter/clutter-backend.c
index 5a1d252..5a457a2 100644
--- a/clutter/clutter/clutter-backend.c
+++ b/clutter/clutter/clutter-backend.c
@@ -1214,7 +1214,7 @@ _clutter_backend_remove_event_translator (ClutterBackend         *backend,
 }
 
 /**
- * clutter_backend_get_cogl_context:
+ * clutter_backend_get_cogl_context: (skip)
  * @backend: a #ClutterBackend
  *
  * Retrieves the #CoglContext associated with the given clutter
diff --git a/clutter/clutter/clutter-backend.h b/clutter/clutter/clutter-backend.h
index 9470e2e..e50f044 100644
--- a/clutter/clutter/clutter-backend.h
+++ b/clutter/clutter/clutter-backend.h
@@ -31,9 +31,7 @@
 #include <cairo.h>
 #include <pango/pango.h>
 
-#ifdef COGL_ENABLE_EXPERIMENTAL_API
 #include <cogl/cogl.h>
-#endif
 
 #include <clutter/clutter-config.h>
 #include <clutter/clutter-types.h>
@@ -73,10 +71,8 @@ void                            clutter_backend_set_font_options        (Clutter
 CLUTTER_AVAILABLE_IN_ALL
 const cairo_font_options_t *    clutter_backend_get_font_options        (ClutterBackend             
*backend);
 
-#if defined (COGL_ENABLE_EXPERIMENTAL_API) && defined (CLUTTER_ENABLE_EXPERIMENTAL_API)
 CLUTTER_AVAILABLE_IN_1_8
 CoglContext *                   clutter_backend_get_cogl_context        (ClutterBackend             
*backend);
-#endif
 
 G_END_DECLS
 
diff --git a/clutter/clutter/clutter-build-config.h.in b/clutter/clutter/clutter-build-config.h.in
index d56ba98..1e06a65 100644
--- a/clutter/clutter/clutter-build-config.h.in
+++ b/clutter/clutter/clutter-build-config.h.in
@@ -6,9 +6,6 @@
 /* Use Generic EGL backend */
 #undef CLUTTER_EGL_BACKEND_GENERIC
 
-/* Can use Cogl 2.0 API internally */
-#undef COGL_ENABLE_EXPERIMENTAL_2_0_API
-
 /* Define to 1 if you have the <dlfcn.h> header file. */
 #undef HAVE_DLFCN_H
 
diff --git a/clutter/clutter/clutter-image.h b/clutter/clutter/clutter-image.h
index 5be0572..5a4d063 100644
--- a/clutter/clutter/clutter-image.h
+++ b/clutter/clutter/clutter-image.h
@@ -131,10 +131,8 @@ gboolean                clutter_image_set_bytes         (ClutterImage
                                                          guint                         row_stride,
                                                          GError                      **error);
 
-#if defined(COGL_ENABLE_EXPERIMENTAL_API) && defined(CLUTTER_ENABLE_EXPERIMENTAL_API)
 CLUTTER_AVAILABLE_IN_1_10
 CoglTexture *           clutter_image_get_texture       (ClutterImage                 *image);
-#endif
 
 G_END_DECLS
 
diff --git a/clutter/clutter/clutter-offscreen-effect.c b/clutter/clutter/clutter-offscreen-effect.c
index 2b57bc1..1dbf29f 100644
--- a/clutter/clutter/clutter-offscreen-effect.c
+++ b/clutter/clutter/clutter-offscreen-effect.c
@@ -66,8 +66,6 @@
 #include "clutter-build-config.h"
 #endif
 
-#define CLUTTER_ENABLE_EXPERIMENTAL_API
-
 #include "clutter-offscreen-effect.h"
 
 #include "cogl/cogl.h"
@@ -520,7 +518,7 @@ clutter_offscreen_effect_get_texture (ClutterOffscreenEffect *effect)
 }
 
 /**
- * clutter_offscreen_effect_get_target:
+ * clutter_offscreen_effect_get_target: (skip)
  * @effect: a #ClutterOffscreenEffect
  *
  * Retrieves the material used as a render target for the offscreen
diff --git a/clutter/clutter/clutter-offscreen-effect.h b/clutter/clutter/clutter-offscreen-effect.h
index c61fbab..3c88f67 100644
--- a/clutter/clutter/clutter-offscreen-effect.h
+++ b/clutter/clutter/clutter-offscreen-effect.h
@@ -31,7 +31,6 @@
 
 #include <cogl/cogl.h>
 #include <clutter/clutter-effect.h>
-#include <clutter/clutter-cogl-compat.h>
 
 G_BEGIN_DECLS
 
diff --git a/clutter/clutter/clutter-paint-node.c b/clutter/clutter/clutter-paint-node.c
index 5ebfb6b..391f483 100644
--- a/clutter/clutter/clutter-paint-node.c
+++ b/clutter/clutter/clutter-paint-node.c
@@ -884,7 +884,7 @@ clutter_paint_node_add_texture_rectangle (ClutterPaintNode      *node,
 }
 
 /**
- * clutter_paint_node_add_path:
+ * clutter_paint_node_add_path: (skip)
  * @node: a #ClutterPaintNode
  * @path: a Cogl path
  *
@@ -912,7 +912,7 @@ clutter_paint_node_add_path (ClutterPaintNode *node,
 }
 
 /**
- * clutter_paint_node_add_primitive:
+ * clutter_paint_node_add_primitive: (skip)
  * @node: a #ClutterPaintNode
  * @primitive: a Cogl primitive
  *
diff --git a/clutter/clutter/clutter-paint-node.h b/clutter/clutter/clutter-paint-node.h
index 1f1a739..5f3e962 100644
--- a/clutter/clutter/clutter-paint-node.h
+++ b/clutter/clutter/clutter-paint-node.h
@@ -66,14 +66,13 @@ void                    clutter_paint_node_add_texture_rectangle        (Clutter
                                                                          float                  y_1,
                                                                          float                  x_2,
                                                                          float                  y_2);
-#if defined(COGL_ENABLE_EXPERIMENTAL_API) && defined(CLUTTER_ENABLE_EXPERIMENTAL_API)
+
 CLUTTER_AVAILABLE_IN_1_10
 void                    clutter_paint_node_add_path                     (ClutterPaintNode      *node,
                                                                          CoglPath              *path);
 CLUTTER_AVAILABLE_IN_1_10
 void                    clutter_paint_node_add_primitive                (ClutterPaintNode      *node,
                                                                          CoglPrimitive         *primitive);
-#endif /* COGL_ENABLE_EXPERIMENTAL_API && CLUTTER_ENABLE_EXPERIMENTAL_API */
 
 /**
  * CLUTTER_VALUE_HOLDS_PAINT_NODE:
diff --git a/clutter/clutter/clutter-paint-nodes.c b/clutter/clutter/clutter-paint-nodes.c
index 44e7727..3870ba6 100644
--- a/clutter/clutter/clutter-paint-nodes.c
+++ b/clutter/clutter/clutter-paint-nodes.c
@@ -511,7 +511,7 @@ clutter_pipeline_node_init (ClutterPipelineNode *self)
 }
 
 /**
- * clutter_pipeline_node_new:
+ * clutter_pipeline_node_new: (skip)
  * @pipeline: (allow-none): a Cogl pipeline state object, or %NULL
  *
  * Creates a new #ClutterPaintNode that will use the @pipeline to
diff --git a/clutter/clutter/clutter-paint-nodes.h b/clutter/clutter/clutter-paint-nodes.h
index 28709ed..c86132c 100644
--- a/clutter/clutter/clutter-paint-nodes.h
+++ b/clutter/clutter/clutter-paint-nodes.h
@@ -118,10 +118,8 @@ typedef struct _ClutterPipelineNodeClass        ClutterPipelineNodeClass;
 CLUTTER_AVAILABLE_IN_1_10
 GType clutter_pipeline_node_get_type (void) G_GNUC_CONST;
 
-#if defined(COGL_ENABLE_EXPERIMENTAL_API) && defined(CLUTTER_ENABLE_EXPERIMENTAL_API)
 CLUTTER_AVAILABLE_IN_1_10
 ClutterPaintNode *      clutter_pipeline_node_new       (CoglPipeline          *pipeline);
-#endif /* COGL_ENABLE_EXPERIMENTAL_API && CLUTTER_ENABLE_EXPERIMENTAL_API */
 
 #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))
diff --git a/clutter/clutter/deprecated/clutter-texture.c b/clutter/clutter/deprecated/clutter-texture.c
index 09a8c1e..ee57155 100644
--- a/clutter/clutter/deprecated/clutter-texture.c
+++ b/clutter/clutter/deprecated/clutter-texture.c
@@ -50,17 +50,8 @@
 /* sadly, we are still using ClutterShader internally */
 #define CLUTTER_DISABLE_DEPRECATION_WARNINGS
 
-/* This file depends on the glib enum types which aren't exposed
- * by cogl.h when COGL_ENABLE_EXPERIMENTAL_2_0_API is defined.
- *
- * Undefining COGL_ENABLE_EXPERIMENTAL_2_0_API will still expose
- * us experimental api but will also expose Cogl 1.x api too...
- */
-#undef COGL_ENABLE_EXPERIMENTAL_2_0_API
 #include <cogl/cogl.h>
 
-#define CLUTTER_ENABLE_EXPERIMENTAL_API
-
 #include "clutter-texture.h"
 
 #include "clutter-actor-private.h"
@@ -73,6 +64,7 @@
 #include "clutter-private.h"
 #include "clutter-scriptable.h"
 #include "clutter-stage-private.h"
+#include "clutter-backend.h"
 
 #include "deprecated/clutter-shader.h"
 #include "deprecated/clutter-texture.h"
diff --git a/clutter/configure.ac b/clutter/configure.ac
index d24d3b8..80f73f6 100644
--- a/clutter/configure.ac
+++ b/clutter/configure.ac
@@ -250,12 +250,6 @@ AS_IF([test "x$enable_wayland_egl_server" = "xyes"],
 
 AM_CONDITIONAL(SUPPORT_WAYLAND, [test "x$enable_wayland_egl_server" = "xyes"])
 
-dnl Instead of using AM_CFLAGS to ensure
-dnl COGL_ENABLE_EXPERIMENTAL_2_0_API is defined while compiling clutter
-dnl and cogl code we use a define in config.h instead. This helps ensure
-dnl other tools such as glib-mkenums and gir-scanner don't end up
-dnl using the define also.
-AC_DEFINE([COGL_ENABLE_EXPERIMENTAL_2_0_API], [1], [Can use Cogl 2.0 API internally])
 AC_DEFINE_UNQUOTED([CLUTTER_DRIVERS], ["*"], [List of Cogl drivers])
 
 dnl strip leading spaces
diff --git a/clutter/tests/interactive/test-cogl-primitives.c 
b/clutter/tests/interactive/test-cogl-primitives.c
index 7b237e2..8880d71 100644
--- a/clutter/tests/interactive/test-cogl-primitives.c
+++ b/clutter/tests/interactive/test-cogl-primitives.c
@@ -2,7 +2,6 @@
 #include <gmodule.h>
 #include <stdlib.h>
 
-#undef COGL_ENABLE_EXPERIMENTAL_2_0_API
 #include <cogl/cogl.h>
 #include <clutter/clutter.h>
 
diff --git a/cogl/cogl-pango/Makefile.am b/cogl/cogl-pango/Makefile.am
index 3fd4bdc..c9d5170 100644
--- a/cogl/cogl-pango/Makefile.am
+++ b/cogl/cogl-pango/Makefile.am
@@ -81,23 +81,7 @@ CoglPango_1_0_gir_SCANNERFLAGS = \
        --c-include='cogl-pango/cogl-pango.h' \
        --include-uninstalled=$(top_builddir)/cogl/Cogl-1.0.gir
 
-CoglPango-2.0.gir: libmutter-cogl-pango.la Makefile
-
-CoglPango_2_0_gir_NAMESPACE = CoglPango
-CoglPango_2_0_gir_VERSION = 2.0
-CoglPango_2_0_gir_LIBS = $(top_builddir)/cogl/libmutter-cogl.la libmutter-cogl-pango.la
-CoglPango_2_0_gir_FILES = $(source_h) $(source_c)
-CoglPango_2_0_gir_CFLAGS = $(AM_CPPFLAGS) $(COGL_DEP_CFLAGS) $(COGL_PANGO_DEP_CFLAGS)
-CoglPango_2_0_gir_INCLUDES = Pango-1.0 PangoCairo-1.0
-CoglPango_2_0_gir_EXPORT_PACKAGES = mutter-cogl-pango-2.0-experimental
-CoglPango_2_0_gir_SCANNERFLAGS = \
-       --warn-all \
-       --identifier-prefix=CoglPango \
-       --symbol-prefix=cogl_pango \
-       --c-include='cogl-pango/cogl-pango.h' \
-       --include-uninstalled=$(top_builddir)/cogl/Cogl-2.0.gir
-
-INTROSPECTION_GIRS += CoglPango-1.0.gir CoglPango-2.0.gir
+INTROSPECTION_GIRS += CoglPango-1.0.gir
 
 girdir = $(mutterlibdir)
 gir_DATA = $(INTROSPECTION_GIRS)
diff --git a/cogl/cogl-pango/cogl-pango.h b/cogl/cogl-pango/cogl-pango.h
index c926851..787aaa8 100644
--- a/cogl/cogl-pango/cogl-pango.h
+++ b/cogl/cogl-pango/cogl-pango.h
@@ -174,7 +174,7 @@ PangoRenderer *
 cogl_pango_font_map_get_renderer (CoglPangoFontMap *font_map);
 
 /**
- * cogl_pango_show_layout:
+ * cogl_pango_show_layout: (skip)
  * @framebuffer: A #CoglFramebuffer to draw too.
  * @layout: a #PangoLayout
  * @x: X coordinate to render the layout at
@@ -195,7 +195,7 @@ cogl_pango_show_layout (CoglFramebuffer *framebuffer,
                         const CoglColor *color);
 
 /**
- * cogl_pango_show_layout_line:
+ * cogl_pango_show_layout_line: (skip)
  * @framebuffer: A #CoglFramebuffer to draw too.
  * @line: a #PangoLayoutLine
  * @x: X coordinate to render the line at
diff --git a/cogl/cogl-path/Makefile.am b/cogl/cogl-path/Makefile.am
index c283fb4..7827f92 100644
--- a/cogl/cogl-path/Makefile.am
+++ b/cogl/cogl-path/Makefile.am
@@ -39,7 +39,6 @@ cogl_tesselator_sources = \
 source_c = \
        $(cogl_tesselator_sources) \
        cogl-path-private.h \
-       cogl1-path.c \
        cogl-path.c \
        $(NULL)
 
@@ -51,13 +50,12 @@ EXTRA_DIST += \
 
 source_1_x_h = \
        cogl-path-types.h \
-       cogl1-path-functions.h \
        $(NULL)
 
 source_h = \
        cogl-path.h \
        $(source_1_x_h) \
-       cogl2-path-functions.h \
+       cogl-path-functions.h \
        $(NULL)
 
 # glib-mkenums rules
diff --git a/cogl/cogl-path/cogl2-path-functions.h b/cogl/cogl-path/cogl-path-functions.h
similarity index 98%
rename from cogl/cogl-path/cogl2-path-functions.h
rename to cogl/cogl-path/cogl-path-functions.h
index 72c1fc8..489b25c 100644
--- a/cogl/cogl-path/cogl2-path-functions.h
+++ b/cogl/cogl-path/cogl-path-functions.h
@@ -32,8 +32,8 @@
 #error "Only <cogl/cogl.h> can be included directly."
 #endif
 
-#ifndef __COGL2_PATH_FUNCTIONS_H__
-#define __COGL2_PATH_FUNCTIONS_H__
+#ifndef __COGL_PATH_FUNCTIONS_H__
+#define __COGL_PATH_FUNCTIONS_H__
 
 #include <cogl/cogl-types.h>
 #ifdef COGL_COMPILATION
@@ -41,20 +41,16 @@
 #else
 #include <cogl/cogl.h>
 #endif
-#ifdef COGL_HAS_GTYPE_SUPPORT
 #include <glib-object.h>
-#endif
 
 COGL_BEGIN_DECLS
 
-#ifdef COGL_HAS_GTYPE_SUPPORT
 /**
  * cogl_path_get_gtype:
  *
  * Returns: a #GType that can be used with the GLib type system.
  */
 GType cogl_path_get_gtype (void);
-#endif
 
 #define cogl_path_new cogl2_path_new
 /**
@@ -541,5 +537,5 @@ cogl_clip_push_from_path (CoglPath *path);
 
 COGL_END_DECLS
 
-#endif /* __COGL2_PATH_FUNCTIONS_H__ */
+#endif /* __COGL_PATH_FUNCTIONS_H__ */
 
diff --git a/cogl/cogl-path/cogl-path.h b/cogl/cogl-path/cogl-path.h
index 4991bbe..22b7dc3 100644
--- a/cogl/cogl-path/cogl-path.h
+++ b/cogl/cogl-path/cogl-path.h
@@ -57,12 +57,7 @@
 #endif
 
 #include <cogl-path/cogl-path-types.h>
-
-#ifdef COGL_ENABLE_EXPERIMENTAL_2_0_API
-#include <cogl-path/cogl2-path-functions.h>
-#else
-#include <cogl-path/cogl1-path-functions.h>
-#endif
+#include <cogl-path/cogl-path-functions.h>
 
 #endif /* __COGL_PATH_H__ */
 
diff --git a/cogl/cogl/Makefile.am b/cogl/cogl/Makefile.am
index 7c1eac4..346bd48 100644
--- a/cogl/cogl/Makefile.am
+++ b/cogl/cogl/Makefile.am
@@ -54,10 +54,13 @@ cogl_deprecated_h = \
        deprecated/cogl-shader.h                \
        deprecated/cogl-clutter.h               \
        deprecated/cogl-type-casts.h            \
-       deprecated/cogl-framebuffer-deprecated.h \
        deprecated/cogl-auto-texture.h  \
        $(NULL)
 
+cogl_deprecated_nonintrospected_h = \
+       deprecated/cogl-framebuffer-deprecated.h \
+       $(NULL)
+
 # public 1.x api headers
 cogl_1_public_h = \
        $(cogl_deprecated_h)                    \
@@ -72,9 +75,7 @@ cogl_1_public_h = \
        cogl.h                  \
        $(NULL)
 
-# experimental 2.0 api headers
-# Note: we don't run glib-mkenums over these headers
-cogl_experimental_h = \
+cogl_nonintrospected_h = \
        cogl-object.h           \
        cogl-renderer.h                 \
        cogl-swap-chain.h               \
@@ -113,14 +114,10 @@ cogl_experimental_h = \
        cogl-depth-state.h              \
        cogl-buffer.h           \
        cogl-pixel-buffer.h             \
-       cogl2-experimental.h            \
        cogl-macros.h                   \
        cogl-fence.h                    \
        cogl-version.h          \
        cogl-error.h                    \
-       $(NULL)
-
-cogl_additional_experimental_h = \
        cogl-bitmap.h                   \
        cogl-color.h                    \
        cogl-matrix.h                   \
@@ -129,7 +126,7 @@ cogl_additional_experimental_h = \
        cogl-gtype-private.h            \
        $(NULL)
 
-cogl_nodist_experimental_h = \
+cogl_nodist_h = \
        $(NULL)
 
 # nop driver
@@ -392,14 +389,14 @@ cogl_sources_c = \
        deprecated/cogl-framebuffer-deprecated.c      \
        $(NULL)
 
-cogl_experimental_h += cogl-glib-source.h
+cogl_nonintrospected_h += cogl-glib-source.h
 cogl_sources_c += cogl-glib-source.c
 
 if SUPPORT_XLIB
-cogl_deprecated_h += deprecated/cogl-clutter-xlib.h
+cogl_deprecated_nonintrospected_h += deprecated/cogl-clutter-xlib.h
 cogl_1_public_h += cogl-xlib-renderer.h
 
-cogl_experimental_h += \
+cogl_nonintrospected_h += \
        winsys/cogl-texture-pixmap-x11.h \
        cogl-xlib.h
 
@@ -413,7 +410,7 @@ cogl_sources_c += \
        winsys/cogl-texture-pixmap-x11-private.h
 endif
 if SUPPORT_GLX
-cogl_experimental_h += cogl-glx.h
+cogl_nonintrospected_h += cogl-glx.h
 cogl_sources_c += \
        cogl-glx-renderer-private.h \
        cogl-glx-display-private.h \
@@ -422,7 +419,7 @@ cogl_sources_c += \
        winsys/cogl-winsys-glx.c
 endif
 if SUPPORT_WAYLAND_EGL_SERVER
-cogl_experimental_h += cogl-wayland-server.h
+cogl_nonintrospected_h += cogl-wayland-server.h
 endif
 if SUPPORT_EGL_PLATFORM_XLIB
 cogl_sources_c += \
@@ -430,8 +427,8 @@ cogl_sources_c += \
        winsys/cogl-winsys-egl-x11-private.h
 endif
 if SUPPORT_EGL
-cogl_experimental_h += cogl-egl.h
-cogl_nodist_experimental_h += cogl-egl-defines.h
+cogl_nonintrospected_h += cogl-egl.h
+cogl_nodist_h += cogl-egl-defines.h
 
 cogl_sources_c += \
        cogl-egl-private.h \
@@ -440,12 +437,6 @@ cogl_sources_c += \
        winsys/cogl-winsys-egl-private.h
 endif
 
-# glib-mkenums rules
-glib_enum_h = cogl-enum-types.h
-glib_enum_c = cogl-enum-types.c
-glib_enum_headers = $(cogl_1_public_h)
-include $(top_srcdir)/build/autotools/Makefile.am.enums
-
 mutterlibdir = $(libdir)/mutter
 mutterlib_LTLIBRARIES = libmutter-cogl.la
 
@@ -474,11 +465,11 @@ cogl_headers = \
 
 cogl_base_includedir = $(includedir)/mutter
 cogldeprecatedincludedir = $(cogl_base_includedir)/cogl/cogl/deprecated
-cogldeprecatedinclude_HEADERS = $(cogl_deprecated_h)
+cogldeprecatedinclude_HEADERS = $(cogl_deprecated_h) $(cogl_deprecated_nonintrospected_h)
 
 coglincludedir = $(cogl_base_includedir)/cogl/cogl
-coglinclude_HEADERS = $(cogl_headers) $(cogl_experimental_h)
-nodist_coglinclude_HEADERS = $(cogl_nodist_experimental_h) cogl-defines.h cogl-enum-types.h
+coglinclude_HEADERS = $(cogl_headers) $(cogl_nonintrospected_h)
+nodist_coglinclude_HEADERS = $(cogl_nodist_h) cogl-defines.h
 
 cogl_proto_includedir = $(cogl_base_includedir)/cogl/cogl/gl-prototypes
 cogl_proto_include_HEADERS = $(cogl_gl_prototypes_h)
@@ -499,29 +490,14 @@ Cogl_1_0_gir_LIBS = libmutter-cogl.la
 if UNIT_TESTS
 Cogl_1_0_gir_LIBS += $(top_builddir)/test-fixtures/libtest-fixtures.la
 endif
-Cogl_1_0_gir_FILES = $(cogl_1_public_h) cogl-enum-types.h
-
-Cogl-2.0.gir: libmutter-cogl.la Makefile
-
-Cogl_2_0_gir_NAMESPACE = Cogl
-Cogl_2_0_gir_VERSION = 2.0
-Cogl_2_0_gir_LIBS = libmutter-cogl.la
-if UNIT_TESTS
-Cogl_2_0_gir_LIBS += $(top_builddir)/test-fixtures/libtest-fixtures.la
-endif
-Cogl_2_0_gir_FILES = $(cogl_experimental_h) $(cogl_additional_experimental_h) cogl-enum-types.h
+Cogl_1_0_gir_FILES = $(cogl_1_public_h)
 
-Cogl_1_0_gir_CFLAGS = $(AM_CPPFLAGS) $(COGL_DEP_CFLAGS) -UCOGL_ENABLE_EXPERIMENTAL_API 
-UCOGL_ENABLE_EXPERIMENTAL_2_0_API -UCOGL_COMPILATION -D__COGL_H_INSIDE__ -D__COGL_XLIB_H_INSIDE__ 
-D__COGL_EGL_H_INSIDE__ -D__COGL_GLX_H_INSIDE__ -DCOGL_GIR_SCANNING
+Cogl_1_0_gir_CFLAGS = $(AM_CPPFLAGS) $(COGL_DEP_CFLAGS) -UCOGL_COMPILATION -D__COGL_H_INSIDE__ 
-D__COGL_XLIB_H_INSIDE__ -D__COGL_EGL_H_INSIDE__ -D__COGL_GLX_H_INSIDE__ -DCOGL_GIR_SCANNING
 Cogl_1_0_gir_INCLUDES = GL-1.0 GObject-2.0
 Cogl_1_0_gir_EXPORT_PACKAGES = mutter-cogl-1.0
 Cogl_1_0_gir_SCANNERFLAGS = --warn-all --c-include='cogl/cogl.h'
 
-Cogl_2_0_gir_CFLAGS = $(AM_CPPFLAGS) $(COGL_DEP_CFLAGS) -DCOGL_ENABLE_EXPERIMENTAL_API=1 -UCOGL_COMPILATION 
-D__COGL_H_INSIDE__ -D__COGL_XLIB_H_INSIDE__ -DCOGL_GIR_SCANNING
-Cogl_2_0_gir_INCLUDES = GL-1.0 GObject-2.0
-Cogl_2_0_gir_EXPORT_PACKAGES = mutter-cogl-2.0-experimental
-Cogl_2_0_gir_SCANNERFLAGS = --warn-all --c-include='cogl/cogl.h' --symbol-prefix=cogl --symbol-prefix=cogl2
-
-INTROSPECTION_GIRS += Cogl-1.0.gir Cogl-2.0.gir
+INTROSPECTION_GIRS += Cogl-1.0.gir
 
 girdir = $(mutterlibdir)
 gir_DATA = $(INTROSPECTION_GIRS)
diff --git a/cogl/cogl/cogl-bitmap.h b/cogl/cogl/cogl-bitmap.h
index 2ef5299..1da52ec 100644
--- a/cogl/cogl/cogl-bitmap.h
+++ b/cogl/cogl/cogl-bitmap.h
@@ -87,10 +87,8 @@ CoglBitmap *
 cogl_bitmap_new_from_file (const char *filename,
                            CoglError **error);
 
-#if defined (COGL_ENABLE_EXPERIMENTAL_API)
-
 /**
- * cogl_bitmap_new_from_buffer:
+ * cogl_bitmap_new_from_buffer: (skip)
  * @buffer: A #CoglBuffer containing image data
  * @format: The #CoglPixelFormat defining the format of the image data
  *          in the given @buffer.
@@ -117,7 +115,7 @@ cogl_bitmap_new_from_buffer (CoglBuffer *buffer,
                              int offset);
 
 /**
- * cogl_bitmap_new_with_size:
+ * cogl_bitmap_new_with_size: (skip)
  * @context: A #CoglContext
  * @width: width of the bitmap in pixels
  * @height: height of the bitmap in pixels
@@ -152,7 +150,7 @@ cogl_bitmap_new_with_size (CoglContext *context,
                            CoglPixelFormat format);
 
 /**
- * cogl_bitmap_new_for_data:
+ * cogl_bitmap_new_for_data: (skip)
  * @context: A #CoglContext
  * @width: The width of the bitmap.
  * @height: The height of the bitmap.
@@ -226,7 +224,7 @@ int
 cogl_bitmap_get_rowstride (CoglBitmap *bitmap);
 
 /**
- * cogl_bitmap_get_buffer:
+ * cogl_bitmap_get_buffer: (skip)
  * @bitmap: A #CoglBitmap
  *
  * Return value: (transfer none): the #CoglPixelBuffer that this
@@ -239,8 +237,6 @@ cogl_bitmap_get_rowstride (CoglBitmap *bitmap);
 CoglPixelBuffer *
 cogl_bitmap_get_buffer (CoglBitmap *bitmap);
 
-#endif /* COGL_ENABLE_EXPERIMENTAL_API */
-
 /**
  * cogl_bitmap_get_size_from_file:
  * @filename: the file to check
diff --git a/cogl/cogl/cogl-context.h b/cogl/cogl/cogl-context.h
index b0fdc27..d3680c0 100644
--- a/cogl/cogl/cogl-context.h
+++ b/cogl/cogl/cogl-context.h
@@ -94,8 +94,6 @@ COGL_BEGIN_DECLS
  * context.</para></note>
  */
 
-#ifdef COGL_ENABLE_EXPERIMENTAL_API
-
 #define COGL_CONTEXT(OBJECT) ((CoglContext *)OBJECT)
 
 #ifdef COGL_HAS_GTYPE_SUPPORT
@@ -175,8 +173,6 @@ cogl_context_get_renderer (CoglContext *context);
 CoglBool
 cogl_is_context (void *object);
 
-#endif /* COGL_ENABLE_EXPERIMENTAL_2_0_API */
-
 /* XXX: not guarded by the EXPERIMENTAL_API defines to avoid
  * upsetting glib-mkenums, but this can still be considered implicitly
  * experimental since it's only useable with experimental API... */
@@ -276,8 +272,6 @@ typedef enum _CoglFeatureID
 } CoglFeatureID;
 
 
-#ifdef COGL_ENABLE_EXPERIMENTAL_API
-
 /**
  * cogl_has_feature:
  * @context: A #CoglContext pointer
@@ -415,8 +409,6 @@ typedef enum _CoglGraphicsResetStatus
 CoglGraphicsResetStatus
 cogl_get_graphics_reset_status (CoglContext *context);
 
-#endif /* COGL_ENABLE_EXPERIMENTAL_API */
-
 COGL_END_DECLS
 
 #endif /* __COGL_CONTEXT_H__ */
diff --git a/cogl/cogl/cogl-framebuffer.h b/cogl/cogl/cogl-framebuffer.h
index 67931f8..27bf9c9 100644
--- a/cogl/cogl/cogl-framebuffer.h
+++ b/cogl/cogl/cogl-framebuffer.h
@@ -50,11 +50,9 @@ typedef struct _CoglFramebuffer CoglFramebuffer;
 #include <cogl/cogl-pipeline.h>
 #include <cogl/cogl-indices.h>
 #include <cogl/cogl-bitmap.h>
-#ifdef COGL_ENABLE_EXPERIMENTAL_API
 #include <cogl/cogl-quaternion.h>
 #include <cogl/cogl-euler.h>
 #include <cogl/cogl-texture.h>
-#endif
 #ifdef COGL_HAS_GTYPE_SUPPORT
 #include <glib-object.h>
 #endif
@@ -99,16 +97,12 @@ COGL_BEGIN_DECLS
  * configuration.
  */
 
-#ifdef COGL_ENABLE_EXPERIMENTAL_API
-
-#ifdef COGL_HAS_GTYPE_SUPPORT
 /**
  * cogl_framebuffer_get_gtype:
  *
  * Returns: a #GType that can be used with the GLib type system.
  */
 GType cogl_framebuffer_get_gtype (void);
-#endif
 
 /**
  * cogl_framebuffer_allocate:
@@ -368,8 +362,6 @@ cogl_framebuffer_rotate (CoglFramebuffer *framebuffer,
                          float y,
                          float z);
 
-#ifdef COGL_ENABLE_EXPERIMENTAL_API
-
 /**
  * cogl_framebuffer_rotate_quaternion:
  * @framebuffer: A #CoglFramebuffer pointer
@@ -400,8 +392,6 @@ void
 cogl_framebuffer_rotate_euler (CoglFramebuffer *framebuffer,
                                const CoglEuler *euler);
 
-#endif /* COGL_ENABLE_EXPERIMENTAL_API */
-
 /**
  * cogl_framebuffer_transform:
  * @framebuffer: A #CoglFramebuffer pointer
@@ -1828,11 +1818,6 @@ cogl_framebuffer_read_pixels (CoglFramebuffer *framebuffer,
 CoglFramebuffer *
 cogl_get_draw_framebuffer (void);
 
-#endif /* COGL_ENABLE_EXPERIMENTAL_API */
-
-/* XXX: Note these are defined outside the COGL_ENABLE_EXPERIMENTAL_API guard since
- * otherwise the glib-mkenums stuff will get upset. */
-
 uint32_t
 cogl_framebuffer_error_quark (void);
 
diff --git a/cogl/cogl/cogl-matrix.h b/cogl/cogl/cogl-matrix.h
index 58ec5c7..b102d32 100644
--- a/cogl/cogl/cogl-matrix.h
+++ b/cogl/cogl/cogl-matrix.h
@@ -43,9 +43,7 @@
 #include <cogl/cogl-types.h>
 #include <cogl/cogl-macros.h>
 
-#ifdef COGL_ENABLE_EXPERIMENTAL_API
 #include <cogl/cogl-quaternion.h>
-#endif
 #ifdef COGL_HAS_GTYPE_SUPPORT
 #include <glib-object.h>
 #endif
@@ -202,7 +200,6 @@ cogl_matrix_rotate (CoglMatrix *matrix,
                    float y,
                    float z);
 
-#ifdef COGL_ENABLE_EXPERIMENTAL_API
 /**
  * cogl_matrix_rotate_quaternion:
  * @matrix: A 4x4 transformation matrix
@@ -230,7 +227,6 @@ cogl_matrix_rotate_quaternion (CoglMatrix *matrix,
 void
 cogl_matrix_rotate_euler (CoglMatrix *matrix,
                           const CoglEuler *euler);
-#endif
 
 /**
  * cogl_matrix_translate:
@@ -367,7 +363,6 @@ cogl_matrix_perspective (CoglMatrix *matrix,
                          float       z_near,
                          float       z_far);
 
-#ifdef COGL_ENABLE_EXPERIMENTAL_API
 /**
  * cogl_matrix_orthographic:
  * @matrix: A 4x4 transformation matrix
@@ -395,7 +390,6 @@ cogl_matrix_orthographic (CoglMatrix *matrix,
                           float y_2,
                           float near,
                           float far);
-#endif
 
 /**
  * cogl_matrix_ortho:
@@ -425,7 +419,6 @@ cogl_matrix_ortho (CoglMatrix *matrix,
                    float       near,
                    float       far);
 
-#ifdef COGL_ENABLE_EXPERIMENTAL_API
 /**
  * cogl_matrix_view_2d_in_frustum:
  * @matrix: A 4x4 transformation matrix
@@ -504,8 +497,6 @@ cogl_matrix_view_2d_in_perspective (CoglMatrix *matrix,
                                     float width_2d,
                                     float height_2d);
 
-#endif
-
 /**
  * cogl_matrix_init_from_array:
  * @matrix: A 4x4 transformation matrix
@@ -528,7 +519,6 @@ cogl_matrix_init_from_array (CoglMatrix *matrix,
 const float *
 cogl_matrix_get_array (const CoglMatrix *matrix);
 
-#ifdef COGL_ENABLE_EXPERIMENTAL_API
 /**
  * cogl_matrix_init_from_quaternion:
  * @matrix: A 4x4 transformation matrix
@@ -550,7 +540,6 @@ cogl_matrix_init_from_quaternion (CoglMatrix *matrix,
 void
 cogl_matrix_init_from_euler (CoglMatrix *matrix,
                              const CoglEuler *euler);
-#endif
 
 /**
  * cogl_matrix_equal:
@@ -640,7 +629,6 @@ cogl_matrix_transform_point (const CoglMatrix *matrix,
                              float *z,
                              float *w);
 
-#ifdef COGL_ENABLE_EXPERIMENTAL_API
 /**
  * cogl_matrix_transform_points:
  * @matrix: A transformation matrix
@@ -754,8 +742,6 @@ cogl_matrix_project_points (const CoglMatrix *matrix,
                             void *points_out,
                             int n_points);
 
-#endif /* COGL_ENABLE_EXPERIMENTAL_API */
-
 /**
  * cogl_matrix_is_identity:
  * @matrix: A #CoglMatrix
diff --git a/cogl/cogl/cogl-object.h b/cogl/cogl/cogl-object.h
index 6bdcd50..96f54cc 100644
--- a/cogl/cogl/cogl-object.h
+++ b/cogl/cogl/cogl-object.h
@@ -207,8 +207,6 @@ void *
 cogl_object_get_user_data (CoglObject *object,
                            CoglUserDataKey *key);
 
-#ifdef COGL_ENABLE_EXPERIMENTAL_API
-
 /**
  * cogl_debug_object_foreach_type:
  * @func: (scope call): A callback function for each type
@@ -240,8 +238,6 @@ cogl_debug_object_foreach_type (CoglDebugObjectForeachTypeCallback func,
 void
 cogl_debug_object_print_instances (void);
 
-#endif /* COGL_ENABLE_EXPERIMENTAL_API */
-
 COGL_END_DECLS
 
 #endif /* __COGL_OBJECT_H */
diff --git a/cogl/cogl/cogl-pango.h b/cogl/cogl/cogl-pango.h
index b24c1b8..8082c56 100644
--- a/cogl/cogl/cogl-pango.h
+++ b/cogl/cogl/cogl-pango.h
@@ -30,11 +30,7 @@
 #ifndef __COGL_PANGO_H_COMPAT__
 #define __COGL_PANGO_H_COMPAT__
 
-#ifdef COGL_ENABLE_EXPERIMENTAL_2_0_API
-#error "#include <cogl/cogl-pango.h> is unsupported; please #include <cogl-pango/cogl-pango.h>"
-#else
 #warning "#include <cogl/cogl-pango.h> is deprecated; please #include <cogl-pango/cogl-pango.h>"
 #include <cogl-pango/cogl-pango.h>
-#endif
 
 #endif /* __COGL_PANGO_H_COMPAT__ */
diff --git a/cogl/cogl/cogl-pipeline-layer-state.h b/cogl/cogl/cogl-pipeline-layer-state.h
index 4be7d39..96ae1b4 100644
--- a/cogl/cogl/cogl-pipeline-layer-state.h
+++ b/cogl/cogl/cogl-pipeline-layer-state.h
@@ -42,8 +42,6 @@
 
 COGL_BEGIN_DECLS
 
-#ifdef COGL_ENABLE_EXPERIMENTAL_API
-
 /**
  * CoglPipelineFilter:
  * @COGL_PIPELINE_FILTER_NEAREST: Measuring in manhatten distance from the,
@@ -613,8 +611,6 @@ cogl_pipeline_add_layer_snippet (CoglPipeline *pipeline,
                                  int layer,
                                  CoglSnippet *snippet);
 
-#endif /* COGL_ENABLE_EXPERIMENTAL_API */
-
 COGL_END_DECLS
 
 #endif /* __COGL_PIPELINE_LAYER_STATE_H__ */
diff --git a/cogl/cogl/cogl-pipeline-state.h b/cogl/cogl/cogl-pipeline-state.h
index 6acbb6d..67e6ef8 100644
--- a/cogl/cogl/cogl-pipeline-state.h
+++ b/cogl/cogl/cogl-pipeline-state.h
@@ -41,8 +41,6 @@
 
 COGL_BEGIN_DECLS
 
-#ifdef COGL_ENABLE_EXPERIMENTAL_API
-
 /**
  * cogl_pipeline_set_color:
  * @pipeline: A #CoglPipeline object
@@ -973,8 +971,6 @@ void
 cogl_pipeline_add_snippet (CoglPipeline *pipeline,
                            CoglSnippet *snippet);
 
-#endif /* COGL_ENABLE_EXPERIMENTAL_API */
-
 COGL_END_DECLS
 
 #endif /* __COGL_PIPELINE_STATE_H__ */
diff --git a/cogl/cogl/cogl-pipeline.h b/cogl/cogl/cogl-pipeline.h
index 08ae3f6..0ec7aa0 100644
--- a/cogl/cogl/cogl-pipeline.h
+++ b/cogl/cogl/cogl-pipeline.h
@@ -50,8 +50,6 @@ typedef struct _CoglPipeline CoglPipeline;
 
 COGL_BEGIN_DECLS
 
-#ifdef COGL_ENABLE_EXPERIMENTAL_API
-
 /**
  * SECTION:cogl-pipeline
  * @short_description: Functions for creating and manipulating the GPU
@@ -186,9 +184,6 @@ int
 cogl_pipeline_get_uniform_location (CoglPipeline *pipeline,
                                     const char *uniform_name);
 
-
-#endif /* COGL_ENABLE_EXPERIMENTAL_API */
-
 COGL_END_DECLS
 
 #endif /* __COGL_PIPELINE_H__ */
diff --git a/cogl/cogl/cogl-pixel-buffer.h b/cogl/cogl/cogl-pixel-buffer.h
index 8ae6164..e451856 100644
--- a/cogl/cogl/cogl-pixel-buffer.h
+++ b/cogl/cogl/cogl-pixel-buffer.h
@@ -54,6 +54,10 @@ COGL_BEGIN_DECLS
 
 #define COGL_PIXEL_BUFFER(buffer) ((CoglPixelBuffer *)(buffer))
 
+/**
+ * CoglPixelBuffer: (skip)
+ */
+
 #ifdef COGL_HAS_GTYPE_SUPPORT
 /**
  * cogl_pixel_buffer_get_gtype:
diff --git a/cogl/cogl/cogl-texture.h b/cogl/cogl/cogl-texture.h
index 3757667..e1243f0 100644
--- a/cogl/cogl/cogl-texture.h
+++ b/cogl/cogl/cogl-texture.h
@@ -51,9 +51,7 @@ typedef struct _CoglTexture CoglTexture;
 #include <cogl/cogl-types.h>
 #include <cogl/cogl-macros.h>
 #include <cogl/cogl-defines.h>
-#if defined (COGL_ENABLE_EXPERIMENTAL_API)
 #include <cogl/cogl-pixel-buffer.h>
-#endif
 #include <cogl/cogl-bitmap.h>
 
 #ifdef COGL_HAS_GTYPE_SUPPORT
@@ -399,8 +397,6 @@ cogl_texture_set_region (CoglTexture *texture,
                          unsigned int rowstride,
                          const uint8_t *data);
 
-#if defined (COGL_ENABLE_EXPERIMENTAL_API)
-
 /**
  * cogl_texture_set_data:
  * @texture a #CoglTexture.
@@ -495,7 +491,6 @@ cogl_texture_set_region_from_bitmap (CoglTexture *texture,
                                      unsigned int dst_width,
                                      unsigned int dst_height,
                                      CoglBitmap *bitmap);
-#endif
 
 /**
  * cogl_texture_allocate:
diff --git a/cogl/cogl/cogl-xlib-renderer.h b/cogl/cogl/cogl-xlib-renderer.h
index e81d594..04811b4 100644
--- a/cogl/cogl/cogl-xlib-renderer.h
+++ b/cogl/cogl/cogl-xlib-renderer.h
@@ -147,7 +147,7 @@ cogl_xlib_renderer_set_foreign_display (CoglRenderer *renderer,
                                         Display *display);
 
 /**
- * cogl_xlib_renderer_set_event_retrieval_enabled:
+ * cogl_xlib_renderer_set_event_retrieval_enabled: (skip)
  * @renderer: a #CoglRenderer
  * @enable: The new value
  *
diff --git a/cogl/cogl/cogl.h b/cogl/cogl/cogl.h
index 8856837..5210e3c 100644
--- a/cogl/cogl/cogl.h
+++ b/cogl/cogl/cogl.h
@@ -42,12 +42,6 @@
 #define __COGL_MUST_UNDEF_COGL_H_INSIDE__
 #endif
 
-#ifdef COGL_ENABLE_EXPERIMENTAL_2_0_API
-#ifndef COGL_ENABLE_EXPERIMENTAL_API
-#define COGL_ENABLE_EXPERIMENTAL_API
-#endif
-#endif
-
 /* We currently keep gtype integration delimited in case we eventually
  * want to split it out into a separate utility library when Cogl
  * becomes a standalone project. (like cairo-gobject.so)
@@ -78,10 +72,10 @@
 /*
  * 1.x only api...
  */
+#if 0
 #ifndef COGL_ENABLE_EXPERIMENTAL_2_0_API
-#include <cogl/cogl-enum-types.h>
-#include <cogl/deprecated/cogl-vertex-buffer.h>
-#include <cogl/deprecated/cogl-material-compat.h>
+#warning
+#endif
 #endif
 
 /* It would be good to move these casts up into 1.x only api if we can
@@ -92,15 +86,13 @@
 #include <cogl/deprecated/cogl-framebuffer-deprecated.h>
 #include <cogl/deprecated/cogl-auto-texture.h>
 #include <cogl/deprecated/cogl-shader.h>
+#include <cogl/deprecated/cogl-material-compat.h>
+#include <cogl/deprecated/cogl-vertex-buffer.h>
 
 #ifdef COGL_ENABLE_MUTTER_API
 #include <cogl/cogl-mutter.h>
 #endif
 
-/*
- * 2.0 api that's compatible with the 1.x api...
- */
-#if defined (COGL_ENABLE_EXPERIMENTAL_API)
 #include <cogl/cogl-swap-chain.h>
 #include <cogl/cogl-renderer.h>
 #include <cogl/cogl-output.h>
@@ -135,13 +127,10 @@
 #include <cogl/cogl-frame-info.h>
 #include <cogl/cogl-poll.h>
 #include <cogl/cogl-fence.h>
-#ifdef COGL_HAS_GLIB_SUPPORT
 #include <cogl/cogl-glib-source.h>
-#endif
 /* XXX: This will definitly go away once all the Clutter winsys
  * code has been migrated down into Cogl! */
 #include <cogl/deprecated/cogl-clutter.h>
-#endif
 
 /*
  * API deprecations
diff --git a/cogl/cogl/deprecated/cogl-auto-texture.h b/cogl/cogl/deprecated/cogl-auto-texture.h
index 331c5a9..44e868d 100644
--- a/cogl/cogl/deprecated/cogl-auto-texture.h
+++ b/cogl/cogl/deprecated/cogl-auto-texture.h
@@ -33,6 +33,8 @@
 
 COGL_BEGIN_DECLS
 
+#include <cogl/cogl-texture.h>
+
 /**
  * cogl_texture_new_with_size:
  * @width: width of texture in pixels.
diff --git a/cogl/cogl/deprecated/cogl-framebuffer-deprecated.h 
b/cogl/cogl/deprecated/cogl-framebuffer-deprecated.h
index 68ed9d3..64c3413 100644
--- a/cogl/cogl/deprecated/cogl-framebuffer-deprecated.h
+++ b/cogl/cogl/deprecated/cogl-framebuffer-deprecated.h
@@ -31,12 +31,13 @@
 #ifndef __COGL_FRAMEBUFFER_DEPRECATED_H__
 #define __COGL_FRAMEBUFFER_DEPRECATED_H__
 
+#include <cogl/cogl-framebuffer.h>
 #include <cogl/cogl-macros.h>
 
 COGL_BEGIN_DECLS
 
 /**
- * cogl_set_framebuffer:
+ * cogl_set_framebuffer: (skip)
  * @buffer: A #CoglFramebuffer object, either onscreen or offscreen.
  *
  * This redirects all subsequent drawing to the specified framebuffer. This can
@@ -53,7 +54,7 @@ void
 cogl_set_framebuffer (CoglFramebuffer *buffer);
 
 /**
- * cogl_push_framebuffer:
+ * cogl_push_framebuffer: (skip)
  * @buffer: A #CoglFramebuffer object, either onscreen or offscreen.
  *
  * Redirects all subsequent drawing to the specified framebuffer. This can
@@ -138,7 +139,7 @@ void
 cogl_push_framebuffer (CoglFramebuffer *buffer);
 
 /**
- * cogl_pop_framebuffer:
+ * cogl_pop_framebuffer: (skip)
  *
  * Restores the framebuffer that was previously at the top of the stack.
  * All subsequent drawing will be redirected to this framebuffer.
@@ -237,7 +238,7 @@ cogl_read_pixels (int x,
 /* XXX: Since this api was marked unstable, maybe we can just
  * remove this api if we can't find anyone is using it. */
 /**
- * cogl_framebuffer_get_color_format:
+ * cogl_framebuffer_get_color_format: (skip)
  * @framebuffer: A #CoglFramebuffer framebuffer
  *
  * Queries the common #CoglPixelFormat of all color buffers attached
diff --git a/cogl/cogl/deprecated/cogl-material-compat.h b/cogl/cogl/deprecated/cogl-material-compat.h
index 57b7df7..d046f45 100644
--- a/cogl/cogl/deprecated/cogl-material-compat.h
+++ b/cogl/cogl/deprecated/cogl-material-compat.h
@@ -1306,8 +1306,6 @@ COGL_DEPRECATED_IN_1_16_FOR (cogl_pipeline_layer_get_wrap_mode_p)
 CoglMaterialWrapMode
 cogl_material_layer_get_wrap_mode_p (CoglMaterialLayer *layer);
 
-#ifdef COGL_ENABLE_EXPERIMENTAL_API
-
 /**
  * cogl_material_set_depth_state:
  * @material: A #CoglMaterial object
@@ -1388,8 +1386,6 @@ cogl_material_foreach_layer (CoglMaterial *material,
                              CoglMaterialLayerCallback callback,
                              void *user_data);
 
-#endif /* COGL_ENABLE_EXPERIMENTAL_API */
-
 G_END_DECLS
 
 #endif /* __COGL_MATERIAL_H__ */
diff --git a/cogl/cogl/winsys/cogl-texture-pixmap-x11.h b/cogl/cogl/winsys/cogl-texture-pixmap-x11.h
index c3590ec..8587dfd 100644
--- a/cogl/cogl/winsys/cogl-texture-pixmap-x11.h
+++ b/cogl/cogl/winsys/cogl-texture-pixmap-x11.h
@@ -56,8 +56,6 @@
 
 COGL_BEGIN_DECLS
 
-#ifdef COGL_ENABLE_EXPERIMENTAL_API
-
 /**
  * SECTION:cogl-texture-pixmap-x11
  * @short_description: Functions for creating and manipulating 2D meta
@@ -274,8 +272,6 @@ cogl_texture_pixmap_x11_set_damage_object (CoglTexturePixmapX11 *texture,
 CoglBool
 cogl_is_texture_pixmap_x11 (void *object);
 
-#endif /* COGL_ENABLE_EXPERIMENTAL_API */
-
 COGL_END_DECLS
 
 /* The gobject introspection scanner seems to parse public headers in
diff --git a/cogl/configure.ac b/cogl/configure.ac
index 586b6e1..8fbc260 100644
--- a/cogl/configure.ac
+++ b/cogl/configure.ac
@@ -930,11 +930,6 @@ done;
 AC_SUBST(COGL_GL_HEADER_INCLUDES)
 AM_SUBST_NOTMAKE(COGL_GL_HEADER_INCLUDES)
 
-AC_DEFINE([COGL_ENABLE_EXPERIMENTAL_2_0_API], [1],
-          [Can use Cogl 2.0 API internally])
-AC_DEFINE([COGL_ENABLE_EXPERIMENTAL_API], [1],
-          [Can use experimental API internally])
-
 AC_SUBST(COGL_DEP_CFLAGS)
 AC_SUBST(COGL_DEP_LIBS)
 AC_SUBST(COGL_PANGO_DEP_CFLAGS)
@@ -1019,17 +1014,3 @@ echo "        Build introspection data: ${enable_introspection}"
 echo "        Build unit tests: ${enable_unit_tests}"
 
 echo ""
-
-# General warning about experimental features
-if test "x$EXPERIMENTAL_CONFIG" = "xyes"; then
-echo ""
-echo "☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠"
-echo " *WARNING*"
-echo ""
-echo "  The stability of your build might be affected by one or more"
-echo "  experimental configuration options."
-echo
-echo "  experimental options: $EXPERIMENTAL_OPTIONS"
-echo "☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠"
-echo ""
-fi
diff --git a/cogl/tests/conform/test-fence.c b/cogl/tests/conform/test-fence.c
index ab8dbac..1386bce 100644
--- a/cogl/tests/conform/test-fence.c
+++ b/cogl/tests/conform/test-fence.c
@@ -1,9 +1,5 @@
 #include <cogl/cogl.h>
 
-/* These will be redefined in config.h */
-#undef COGL_ENABLE_EXPERIMENTAL_2_0_API
-#undef COGL_ENABLE_EXPERIMENTAL_API
-
 #include "test-utils.h"
 #include "cogl-config.h"
 
diff --git a/cogl/tests/conform/test-path-clip.c b/cogl/tests/conform/test-path-clip.c
index 95ad00b..ec21061 100644
--- a/cogl/tests/conform/test-path-clip.c
+++ b/cogl/tests/conform/test-path-clip.c
@@ -1,4 +1,3 @@
-#define COGL_ENABLE_EXPERIMENTAL_2_0_API
 #include <cogl/cogl.h>
 #include <cogl-path/cogl-path.h>
 
diff --git a/cogl/tests/conform/test-path.c b/cogl/tests/conform/test-path.c
index 11f7f15..65cebfe 100644
--- a/cogl/tests/conform/test-path.c
+++ b/cogl/tests/conform/test-path.c
@@ -1,4 +1,3 @@
-#define COGL_ENABLE_EXPERIMENTAL_2_0_API
 #include <cogl/cogl.h>
 #include <cogl-path/cogl-path.h>
 
diff --git a/cogl/tests/conform/test-point-size.c b/cogl/tests/conform/test-point-size.c
index 3c3af0f..49d0833 100644
--- a/cogl/tests/conform/test-point-size.c
+++ b/cogl/tests/conform/test-point-size.c
@@ -1,4 +1,4 @@
-#include <cogl/cogl2-experimental.h>
+#include <cogl/cogl.h>
 
 #include "test-utils.h"
 
diff --git a/cogl/tests/conform/test-point-sprite.c b/cogl/tests/conform/test-point-sprite.c
index eb80cfb..65ce9a8 100644
--- a/cogl/tests/conform/test-point-sprite.c
+++ b/cogl/tests/conform/test-point-sprite.c
@@ -1,4 +1,4 @@
-#include <cogl/cogl2-experimental.h>
+#include <cogl/cogl.h>
 
 #include "test-utils.h"
 
diff --git a/cogl/tests/conform/test-read-texture-formats.c b/cogl/tests/conform/test-read-texture-formats.c
index 3fa4d8e..b4e3b0f 100644
--- a/cogl/tests/conform/test-read-texture-formats.c
+++ b/cogl/tests/conform/test-read-texture-formats.c
@@ -1,4 +1,4 @@
-#include <cogl/cogl2-experimental.h>
+#include <cogl/cogl.h>
 #include <stdarg.h>
 
 #include "test-utils.h"
diff --git a/cogl/tests/conform/test-sparse-pipeline.c b/cogl/tests/conform/test-sparse-pipeline.c
index 04c81d2..2b618dc 100644
--- a/cogl/tests/conform/test-sparse-pipeline.c
+++ b/cogl/tests/conform/test-sparse-pipeline.c
@@ -1,4 +1,4 @@
-#include <cogl/cogl2-experimental.h>
+#include <cogl/cogl.h>
 #include <string.h>
 
 #include "test-utils.h"
diff --git a/cogl/tests/conform/test-texture-3d.c b/cogl/tests/conform/test-texture-3d.c
index 8cc5bb5..80d077a 100644
--- a/cogl/tests/conform/test-texture-3d.c
+++ b/cogl/tests/conform/test-texture-3d.c
@@ -1,4 +1,4 @@
-#include <cogl/cogl2-experimental.h>
+#include <cogl/cogl.h>
 #include <string.h>
 
 #include "test-utils.h"
diff --git a/cogl/tests/conform/test-version.c b/cogl/tests/conform/test-version.c
index 1b2e2e7..c316de2 100644
--- a/cogl/tests/conform/test-version.c
+++ b/cogl/tests/conform/test-version.c
@@ -1,9 +1,5 @@
 #include <cogl/cogl.h>
 
-/* These will be redefined in config.h */
-#undef COGL_ENABLE_EXPERIMENTAL_2_0_API
-#undef COGL_ENABLE_EXPERIMENTAL_API
-
 #include "test-utils.h"
 #include "cogl-config.h"
 
diff --git a/cogl/tests/conform/test-write-texture-formats.c b/cogl/tests/conform/test-write-texture-formats.c
index d415df0..76c4348 100644
--- a/cogl/tests/conform/test-write-texture-formats.c
+++ b/cogl/tests/conform/test-write-texture-formats.c
@@ -1,4 +1,4 @@
-#include <cogl/cogl2-experimental.h>
+#include <cogl/cogl.h>
 #include <stdarg.h>
 
 #include "test-utils.h"
diff --git a/cogl/tests/micro-perf/Makefile.am b/cogl/tests/micro-perf/Makefile.am
index 75d02b2..5462f79 100644
--- a/cogl/tests/micro-perf/Makefile.am
+++ b/cogl/tests/micro-perf/Makefile.am
@@ -1,11 +1,10 @@
 NULL =
 
 AM_CPPFLAGS = \
-       -I$(top_srcdir)
+       -I$(top_srcdir) \
+       -DCOGL_DISABLE_DEPRECATED
 
 test_conformance_CPPFLAGS = \
-       -DCOGL_ENABLE_EXPERIMENTAL_API \
-       -DCOGL_DISABLE_DEPRECATED \
        -DTESTS_DATADIR=\""$(top_srcdir)/tests/data"\"
 
 
diff --git a/cogl/tests/micro-perf/test-journal.c b/cogl/tests/micro-perf/test-journal.c
index 35e3cd5..7bfdcf7 100644
--- a/cogl/tests/micro-perf/test-journal.c
+++ b/cogl/tests/micro-perf/test-journal.c
@@ -1,5 +1,5 @@
 #include <glib.h>
-#include <cogl/cogl2-experimental.h>
+#include <cogl/cogl.h>
 #include <math.h>
 
 #include "cogl/cogl-profile.h"
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]