diff options
| author | Robert Bragg <robert@linux.intel.com> | 2010-11-05 12:28:33 +0000 |
|---|---|---|
| committer | Robert Bragg <robert@linux.intel.com> | 2011-04-11 17:54:36 +0100 |
| commit | d40cdfa3e1c0fd43660002418ce5594b81d80bc1 (patch) | |
| tree | 7d6de9cac0afdbb67e7f53ef3a87fc12b9424983 /cogl/cogl.h | |
| parent | bcd97f35ead2efc48b905e43ed981cd4d5850229 (diff) | |
| download | cogl-d40cdfa3e1c0fd43660002418ce5594b81d80bc1.tar.gz | |
Moves all GLX code down from Clutter to Cogl
This migrates all the GLX window system code down from the Clutter
backend code into a Cogl winsys. Moving OpenGL window system binding
code down from Clutter into Cogl is the biggest blocker to having Cogl
become a standalone 3D graphics library, so this is an important step in
that direction.
Diffstat (limited to 'cogl/cogl.h')
| -rw-r--r-- | cogl/cogl.h | 52 |
1 files changed, 12 insertions, 40 deletions
diff --git a/cogl/cogl.h b/cogl/cogl.h index fffc12c6..cbd2d0c0 100644 --- a/cogl/cogl.h +++ b/cogl/cogl.h @@ -67,7 +67,12 @@ #include <cogl/cogl-deprecated.h> +typedef struct _CoglFramebuffer CoglFramebuffer; + #if defined (COGL_ENABLE_EXPERIMENTAL_API) +#include <cogl/cogl-swap-chain.h> +#include <cogl/cogl-renderer.h> +#include <cogl/cogl-display.h> #include <cogl/cogl-context.h> #include <cogl/cogl-buffer.h> #include <cogl/cogl-pixel-array.h> @@ -79,6 +84,13 @@ #include <cogl/cogl-attribute.h> #include <cogl/cogl-primitive.h> #include <cogl/cogl-pipeline.h> +#include <cogl/cogl-framebuffer.h> +#ifdef COGL_HAS_XLIB +#include <cogl/cogl-xlib.h> +#endif +/* XXX: This will definitly go away once all the Clutter winsys + * code has been migrated down into Cogl! */ +#include <cogl/cogl-clutter.h> #endif G_BEGIN_DECLS @@ -90,8 +102,6 @@ G_BEGIN_DECLS * General utility functions for COGL. */ -typedef struct _CoglFramebuffer CoglFramebuffer; - /** * cogl_get_option_group: * @@ -1245,44 +1255,6 @@ cogl_begin_gl (void); void cogl_end_gl (void); -/* - * Internal API available only to Clutter. - * - * These are typically only to deal with the poor seperation of - * responsabilities that currently exists between Clutter and Cogl. - * Eventually a lot of the backend code currently in Clutter will - * move down into Cogl and these functions will be removed. - */ - -void -_cogl_destroy_context (void); - -/*< private >*/ -#define COGL_DRIVER_ERROR (_cogl_driver_error_quark ()) - -typedef enum { /*< prefix=COGL_DRIVER_ERROR >*/ - COGL_DRIVER_ERROR_UNKNOWN_VERSION, - COGL_DRIVER_ERROR_INVALID_VERSION -} CoglDriverError; - -gboolean -_cogl_check_extension (const char *name, const char *ext); - -void -_cogl_set_indirect_context (gboolean indirect); - -gboolean -_cogl_check_driver_valid (GError **error); - -GQuark -_cogl_driver_error_quark (void); - -#ifdef COGL_ENABLE_EXPERIMENTAL_API -#define cogl_get_draw_framebuffer cogl_get_draw_framebuffer_EXP -CoglFramebuffer * -cogl_get_draw_framebuffer (void); -#endif - G_END_DECLS #undef __COGL_H_INSIDE__ |