diff options
| author | Jonas Ådahl <jadahl@gmail.com> | 2016-06-16 15:04:40 -0400 |
|---|---|---|
| committer | Jonas Ådahl <jadahl@gmail.com> | 2016-07-20 14:23:48 +0800 |
| commit | d62d780a9526c4d4d739983be04c6c82146d3ef5 (patch) | |
| tree | 250b15bef4e5b619a118234c4618f29b61b8e820 /cogl/cogl/cogl.h | |
| parent | eed71654ba6ac810ad835cb5a19624a29a9d18dd (diff) | |
| download | mutter-d62d780a9526c4d4d739983be04c6c82146d3ef5.tar.gz | |
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
Diffstat (limited to 'cogl/cogl/cogl.h')
| -rw-r--r-- | cogl/cogl/cogl.h | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/cogl/cogl/cogl.h b/cogl/cogl/cogl.h index 885683753..5210e3c59 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 |