diff options
| author | Robert Bragg <robert@linux.intel.com> | 2012-02-17 21:46:39 +0000 |
|---|---|---|
| committer | Robert Bragg <robert@linux.intel.com> | 2012-02-20 23:12:44 +0000 |
| commit | ee940a3d0d0a67d67ad7ebb4b2356a1ae614ca44 (patch) | |
| tree | abea4d8aefa470460c8da5748f18bfd9ee0af8f6 /cogl/cogl-framebuffer.h | |
| parent | 1022c285c6f7313972d8ec96a12b71f3e07880d4 (diff) | |
| download | cogl-ee940a3d0d0a67d67ad7ebb4b2356a1ae614ca44.tar.gz | |
Move all types/prototypes from cogl.h -> cogl[1]-context.h
So we can get to the point where cogl.h is merely an aggregation of
header includes for the 1.x api this moves all the function prototypes
and type definitions into a cogl-context.h and a new cogl1-context.h.
Ideally no code internally should ever need to include cogl.h as it just
represents the public facing header for accessing the 1.x api which
should only be used by Clutter.
Reviewed-by: Neil Roberts <neil@linux.intel.com>
Diffstat (limited to 'cogl/cogl-framebuffer.h')
| -rw-r--r-- | cogl/cogl-framebuffer.h | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/cogl/cogl-framebuffer.h b/cogl/cogl-framebuffer.h index f57334b5..1fbd23d4 100644 --- a/cogl/cogl-framebuffer.h +++ b/cogl/cogl-framebuffer.h @@ -28,8 +28,6 @@ #ifndef __COGL_FRAMEBUFFER_H #define __COGL_FRAMEBUFFER_H -#include <cogl/cogl.h> - #include <glib.h> #ifdef COGL_HAS_WIN32_SUPPORT @@ -40,6 +38,15 @@ #include <wayland-client.h> #endif /* COGL_HAS_EGL_PLATFORM_WAYLAND_SUPPORT */ +#ifdef COGL_ENABLE_EXPERIMENTAL_2_0_API +#include <cogl/cogl2-path.h> +#else +#include <cogl/cogl-path.h> +#endif + +#include <cogl/cogl-pipeline.h> +#include <cogl/cogl-indices.h> + G_BEGIN_DECLS /** @@ -80,6 +87,8 @@ G_BEGIN_DECLS * configuration. */ +typedef struct _CoglFramebuffer CoglFramebuffer; + #ifdef COGL_ENABLE_EXPERIMENTAL_API #define COGL_FRAMEBUFFER(X) ((CoglFramebuffer *)(X)) |