brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes for --disable-glib

Browse Source 
This fixes some problems which were stopping --disable-glib from
working properly:

• A lot of the public headers were including glib.h. This shouldn't be
  necessary because the API doesn't expose any glib types. Otherwise
  any apps would require glib in order to get the header.

• The public headers were using G_BEGIN_DECLS. There is now a
  replacement macro called COGL_BEGIN_DECLS which is defined in
  cogl-types.h.

• A similar fix has been done for G_GNUC_NULL_TERMINATED and
  G_GNUC_DEPRECATED.

• The CFLAGS were not including $(builddir)/deps/glib which was
  preventing it finding the generated glibconfig.h when building out
  of tree.

Reviewed-by: Robert Bragg <robert@linux.intel.com>

(cherry picked from commit 4138b3141c2f39cddaea3d72bfc04342ed5092d0)
This commit is contained in:
Neil Roberts 2012-11-22 18:01:10 +00:00 committed by Robert Bragg
parent 5c8eebb3d9
commit 4f6fe6f0e2
83 changed files with 195 additions and 214 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cogl-pango/cogl-pango-display-list.h
View File

@ -28,7 +28,7 @@
#include <cogl/cogl.h> #include <cogl/cogl.h>
#include "cogl-pango-pipeline-cache.h" #include "cogl-pango-pipeline-cache.h"
G_BEGIN_DECLS COGL_BEGIN_DECLS
typedef struct _CoglPangoDisplayList CoglPangoDisplayList; typedef struct _CoglPangoDisplayList CoglPangoDisplayList;
@ -64,6 +64,6 @@ void _cogl_pango_display_list_clear (CoglPangoDisplayList *dl);
void _cogl_pango_display_list_free (CoglPangoDisplayList *dl); void _cogl_pango_display_list_free (CoglPangoDisplayList *dl);
G_END_DECLS COGL_END_DECLS
#endif /* __COGL_PANGO_DISPLAY_LIST_H__ */ #endif /* __COGL_PANGO_DISPLAY_LIST_H__ */

4
cogl-pango/cogl-pango-glyph-cache.h
View File

@ -28,7 +28,7 @@
#include <cogl/cogl.h> #include <cogl/cogl.h>
#include <pango/pango-font.h> #include <pango/pango-font.h>
G_BEGIN_DECLS COGL_BEGIN_DECLS
typedef struct _CoglPangoGlyphCache CoglPangoGlyphCache; typedef struct _CoglPangoGlyphCache CoglPangoGlyphCache;
typedef struct _CoglPangoGlyphCacheValue CoglPangoGlyphCacheValue; typedef struct _CoglPangoGlyphCacheValue CoglPangoGlyphCacheValue;
@ -88,6 +88,6 @@ void
_cogl_pango_glyph_cache_set_dirty_glyphs (CoglPangoGlyphCache *cache, _cogl_pango_glyph_cache_set_dirty_glyphs (CoglPangoGlyphCache *cache,
CoglPangoGlyphCacheDirtyFunc func); CoglPangoGlyphCacheDirtyFunc func);
G_END_DECLS COGL_END_DECLS
#endif /* __COGL_PANGO_GLYPH_CACHE_H__ */ #endif /* __COGL_PANGO_GLYPH_CACHE_H__ */

4
cogl-pango/cogl-pango-pipeline-cache.h
View File

@ -31,7 +31,7 @@
#include <glib.h> #include <glib.h>
#include <cogl/cogl.h> #include <cogl/cogl.h>
G_BEGIN_DECLS COGL_BEGIN_DECLS
typedef struct _CoglPangoPipelineCache CoglPangoPipelineCache; typedef struct _CoglPangoPipelineCache CoglPangoPipelineCache;
@ -48,6 +48,6 @@ _cogl_pango_pipeline_cache_get (CoglPangoPipelineCache *cache,
void void
_cogl_pango_pipeline_cache_free (CoglPangoPipelineCache *cache); _cogl_pango_pipeline_cache_free (CoglPangoPipelineCache *cache);
G_END_DECLS COGL_END_DECLS
#endif /* __COGL_PANGO_PIPELINE_CACHE_H__ */ #endif /* __COGL_PANGO_PIPELINE_CACHE_H__ */

4
cogl-pango/cogl-pango-private.h
View File

@ -26,13 +26,13 @@
#include "cogl-pango.h" #include "cogl-pango.h"
G_BEGIN_DECLS COGL_BEGIN_DECLS
void _cogl_pango_renderer_clear_glyph_cache (CoglPangoRenderer *renderer); void _cogl_pango_renderer_clear_glyph_cache (CoglPangoRenderer *renderer);
void _cogl_pango_renderer_set_use_mipmapping (CoglPangoRenderer *renderer, void _cogl_pango_renderer_set_use_mipmapping (CoglPangoRenderer *renderer,
CoglBool value); CoglBool value);
CoglBool _cogl_pango_renderer_get_use_mipmapping (CoglPangoRenderer *renderer); CoglBool _cogl_pango_renderer_get_use_mipmapping (CoglPangoRenderer *renderer);
G_END_DECLS COGL_END_DECLS
#endif /* __COGL_PANGO_PRIVATE_H__ */ #endif /* __COGL_PANGO_PRIVATE_H__ */

4
cogl-pango/cogl-pango.h
View File

@ -29,7 +29,7 @@
#include <pango/pangocairo.h> #include <pango/pangocairo.h>
#include <cogl/cogl.h> #include <cogl/cogl.h>
G_BEGIN_DECLS COGL_BEGIN_DECLS
/* It's too difficult to actually subclass the pango cairo font /* It's too difficult to actually subclass the pango cairo font
* map. Instead we just make a fake set of macros that actually just * map. Instead we just make a fake set of macros that actually just
@ -80,6 +80,6 @@ void cogl_pango_render_layout_line (PangoLayoutLine *line,
int y, int y,
const CoglColor *color); const CoglColor *color);
G_END_DECLS COGL_END_DECLS
#endif /* __PANGO_CLUTTER_H__ */ #endif /* __PANGO_CLUTTER_H__ */

4
cogl/cogl-attribute-buffer.h
View File

@ -38,7 +38,7 @@ typedef struct _CoglAttributeBuffer CoglAttributeBuffer;
#include <cogl/cogl-context.h> #include <cogl/cogl-context.h>
G_BEGIN_DECLS COGL_BEGIN_DECLS
/** /**
* SECTION:cogl-attribute-buffer * SECTION:cogl-attribute-buffer
@ -86,7 +86,7 @@ cogl_attribute_buffer_new (CoglContext *context,
CoglBool CoglBool
cogl_is_attribute_buffer (void *object); cogl_is_attribute_buffer (void *object);
G_END_DECLS COGL_END_DECLS
#endif /* __COGL_ATTRIBUTE_BUFFER_H__ */ #endif /* __COGL_ATTRIBUTE_BUFFER_H__ */

4
cogl/cogl-attribute.h
View File

@ -39,7 +39,7 @@ typedef struct _CoglAttribute CoglAttribute;
#include <cogl/cogl-attribute-buffer.h> #include <cogl/cogl-attribute-buffer.h>
#include <cogl/cogl-indices.h> #include <cogl/cogl-indices.h>
G_BEGIN_DECLS COGL_BEGIN_DECLS
/** /**
* SECTION:cogl-attribute * SECTION:cogl-attribute
@ -215,7 +215,7 @@ cogl_attribute_set_buffer (CoglAttribute *attribute,
CoglBool CoglBool
cogl_is_attribute (void *object); cogl_is_attribute (void *object);
G_END_DECLS COGL_END_DECLS
#endif /* __COGL_ATTRIBUTE_H__ */ #endif /* __COGL_ATTRIBUTE_H__ */

4
cogl/cogl-bitmap.h
View File

@ -37,7 +37,7 @@
#include <android/asset_manager.h> #include <android/asset_manager.h>
#endif #endif
G_BEGIN_DECLS COGL_BEGIN_DECLS
typedef struct _CoglBitmap CoglBitmap; typedef struct _CoglBitmap CoglBitmap;
@ -309,6 +309,6 @@ typedef enum {
uint32_t cogl_bitmap_error_quark (void); uint32_t cogl_bitmap_error_quark (void);
G_END_DECLS COGL_END_DECLS
#endif /* __COGL_BITMAP_H__ */ #endif /* __COGL_BITMAP_H__ */

4
cogl/cogl-bitmask.h
View File

@ -30,7 +30,7 @@
#include <glib.h> #include <glib.h>
#include "cogl-util.h" #include "cogl-util.h"
G_BEGIN_DECLS COGL_BEGIN_DECLS
/* /*
* CoglBitmask implements a growable array of bits. A CoglBitmask can * CoglBitmask implements a growable array of bits. A CoglBitmask can
@ -302,6 +302,6 @@ _cogl_bitmask_popcount_upto (const CoglBitmask *bitmask,
((1UL << upto) - 1)); ((1UL << upto) - 1));
} }
G_END_DECLS COGL_END_DECLS
#endif /* __COGL_BITMASK_H */ #endif /* __COGL_BITMASK_H */

4
cogl/cogl-buffer-private.h
View File

@ -35,7 +35,7 @@
#include "cogl-context.h" #include "cogl-context.h"
#include "cogl-gl-header.h" #include "cogl-gl-header.h"
G_BEGIN_DECLS COGL_BEGIN_DECLS
typedef struct _CoglBufferVtable CoglBufferVtable; typedef struct _CoglBufferVtable CoglBufferVtable;
@ -153,6 +153,6 @@ _cogl_buffer_map_for_fill_or_fallback (CoglBuffer *buffer);
void void
_cogl_buffer_unmap_for_fill_or_fallback (CoglBuffer *buffer); _cogl_buffer_unmap_for_fill_or_fallback (CoglBuffer *buffer);
G_END_DECLS COGL_END_DECLS
#endif /* __COGL_BUFFER_PRIVATE_H__ */ #endif /* __COGL_BUFFER_PRIVATE_H__ */

5
cogl/cogl-buffer.h
View File

@ -32,10 +32,9 @@
#ifndef __COGL_BUFFER_H__ #ifndef __COGL_BUFFER_H__
#define __COGL_BUFFER_H__ #define __COGL_BUFFER_H__
#include <glib.h>
#include <cogl/cogl-types.h> #include <cogl/cogl-types.h>
G_BEGIN_DECLS COGL_BEGIN_DECLS
/** /**
* SECTION:cogl-buffer * SECTION:cogl-buffer
@ -283,6 +282,6 @@ cogl_buffer_set_data (CoglBuffer *buffer,
const void *data, const void *data,
size_t size); size_t size);
G_END_DECLS COGL_END_DECLS
#endif /* __COGL_BUFFER_H__ */ #endif /* __COGL_BUFFER_H__ */

4
cogl/cogl-clip-state.h
View File

@ -30,7 +30,7 @@
#include <cogl/cogl-types.h> #include <cogl/cogl-types.h>
G_BEGIN_DECLS COGL_BEGIN_DECLS
/** /**
* cogl_clip_push_from_path: * cogl_clip_push_from_path:
@ -45,6 +45,6 @@ G_BEGIN_DECLS
void void
cogl_clip_push_from_path (void); cogl_clip_push_from_path (void);
G_END_DECLS COGL_END_DECLS
#endif /* __COGL_CLIP_STATE_H */ #endif /* __COGL_CLIP_STATE_H */

4
cogl/cogl-clutter-xlib.h
View File

@ -30,12 +30,12 @@
#include <X11/Xutil.h> #include <X11/Xutil.h>
G_BEGIN_DECLS COGL_BEGIN_DECLS
#define cogl_clutter_winsys_xlib_get_visual_info cogl_clutter_winsys_xlib_get_visual_info_CLUTTER #define cogl_clutter_winsys_xlib_get_visual_info cogl_clutter_winsys_xlib_get_visual_info_CLUTTER
XVisualInfo * XVisualInfo *
cogl_clutter_winsys_xlib_get_visual_info (void); cogl_clutter_winsys_xlib_get_visual_info (void);
G_END_DECLS COGL_END_DECLS
#endif /* __COGL_CLUTTER_XLIB_H__ */ #endif /* __COGL_CLUTTER_XLIB_H__ */

4
cogl/cogl-clutter.h
View File

@ -28,7 +28,7 @@
#ifndef __COGL_CLUTTER_H__ #ifndef __COGL_CLUTTER_H__
#define __COGL_CLUTTER_H__ #define __COGL_CLUTTER_H__
G_BEGIN_DECLS COGL_BEGIN_DECLS
#define cogl_clutter_check_extension cogl_clutter_check_extension_CLUTTER #define cogl_clutter_check_extension cogl_clutter_check_extension_CLUTTER
CoglBool CoglBool
@ -42,6 +42,6 @@ cogl_clutter_winsys_has_feature (CoglWinsysFeature feature);
void void
cogl_onscreen_clutter_backend_set_size (int width, int height); cogl_onscreen_clutter_backend_set_size (int width, int height);
G_END_DECLS COGL_END_DECLS
#endif /* __COGL_CLUTTER_H__ */ #endif /* __COGL_CLUTTER_H__ */

4
cogl/cogl-color.h
View File

@ -40,7 +40,7 @@
#include <cogl/cogl-types.h> #include <cogl/cogl-types.h>
G_BEGIN_DECLS COGL_BEGIN_DECLS
/** /**
* cogl_color_new: * cogl_color_new:
@ -538,6 +538,6 @@ cogl_color_unpremultiply (CoglColor *color);
CoglBool CoglBool
cogl_color_equal (const void *v1, const void *v2); cogl_color_equal (const void *v1, const void *v2);
G_END_DECLS COGL_END_DECLS
#endif /* __COGL_COLOR_H__ */ #endif /* __COGL_COLOR_H__ */

4
cogl/cogl-context.h
View File

@ -43,7 +43,7 @@ typedef struct _CoglContext CoglContext;
#include <android/native_window.h> #include <android/native_window.h>
#endif #endif
G_BEGIN_DECLS COGL_BEGIN_DECLS
/** /**
* SECTION:cogl-context * SECTION:cogl-context
@ -318,7 +318,7 @@ cogl_foreach_feature (CoglContext *context,
#endif /* COGL_ENABLE_EXPERIMENTAL_API */ #endif /* COGL_ENABLE_EXPERIMENTAL_API */
G_END_DECLS COGL_END_DECLS
#endif /* __COGL_CONTEXT_H__ */ #endif /* __COGL_CONTEXT_H__ */

4
cogl/cogl-debug.h
View File

@ -30,7 +30,7 @@
#include <glib.h> #include <glib.h>
G_BEGIN_DECLS COGL_BEGIN_DECLS
typedef enum { typedef enum {
COGL_DEBUG_SLICING, COGL_DEBUG_SLICING,
@ -113,7 +113,7 @@ _cogl_parse_debug_string (const char *value,
CoglBool enable, CoglBool enable,
CoglBool ignore_help); CoglBool ignore_help);
G_END_DECLS COGL_END_DECLS
#endif /* __COGL_DEBUG_H__ */ #endif /* __COGL_DEBUG_H__ */

6
cogl/cogl-defines.h.in
View File

@ -28,10 +28,6 @@
#ifndef __COGL_DEFINES_H__ #ifndef __COGL_DEFINES_H__
#define __COGL_DEFINES_H__ #define __COGL_DEFINES_H__
#include <glib.h>
G_BEGIN_DECLS
@COGL_DEFINES@ @COGL_DEFINES@
#define COGL_VERSION_MAJOR_INTERNAL 1 #define COGL_VERSION_MAJOR_INTERNAL 1
@ -39,6 +35,4 @@ G_BEGIN_DECLS
#define COGL_VERSION_MICRO_INTERNAL @COGL_1_MICRO_VERSION@ #define COGL_VERSION_MICRO_INTERNAL @COGL_1_MICRO_VERSION@
#define COGL_VERSION_STRING_INTERNAL "@COGL_1_VERSION@" #define COGL_VERSION_STRING_INTERNAL "@COGL_1_VERSION@"
G_END_DECLS
#endif #endif

4
cogl/cogl-depth-state.h
View File

@ -31,7 +31,7 @@
#ifndef __COGL_DEPTH_STATE_H__ #ifndef __COGL_DEPTH_STATE_H__
#define __COGL_DEPTH_STATE_H__ #define __COGL_DEPTH_STATE_H__
G_BEGIN_DECLS COGL_BEGIN_DECLS
/** /**
* SECTION:cogl-depth-state * SECTION:cogl-depth-state
@ -255,6 +255,6 @@ cogl_depth_state_get_range (CoglDepthState *state,
float *near_val, float *near_val,
float *far_val); float *far_val);
G_END_DECLS COGL_END_DECLS
#endif /* __COGL_DEPTH_STATE_H__ */ #endif /* __COGL_DEPTH_STATE_H__ */

4
cogl/cogl-display.h
View File

@ -34,7 +34,7 @@
#include <cogl/cogl-renderer.h> #include <cogl/cogl-renderer.h>
#include <cogl/cogl-onscreen-template.h> #include <cogl/cogl-onscreen-template.h>
G_BEGIN_DECLS COGL_BEGIN_DECLS
#ifdef COGL_HAS_EGL_PLATFORM_GDL_SUPPORT #ifdef COGL_HAS_EGL_PLATFORM_GDL_SUPPORT
#include <libgdl.h> #include <libgdl.h>
@ -185,7 +185,7 @@ cogl_gdl_display_set_plane (CoglDisplay *display,
CoglBool CoglBool
cogl_is_display (void *object); cogl_is_display (void *object);
G_END_DECLS COGL_END_DECLS
#endif /* __COGL_DISPLAY_H__ */ #endif /* __COGL_DISPLAY_H__ */

4
cogl/cogl-egl.h
View File

@ -28,7 +28,7 @@
#include "cogl-egl-defines.h" #include "cogl-egl-defines.h"
G_BEGIN_DECLS COGL_BEGIN_DECLS
#define NativeDisplayType EGLNativeDisplayType #define NativeDisplayType EGLNativeDisplayType
#define NativeWindowType EGLNativeWindowType #define NativeWindowType EGLNativeWindowType
@ -53,7 +53,7 @@ G_BEGIN_DECLS
EGLDisplay EGLDisplay
cogl_egl_context_get_egl_display (CoglContext *context); cogl_egl_context_get_egl_display (CoglContext *context);
G_END_DECLS COGL_END_DECLS
#endif /* COGL_HAS_EGL_SUPPORT */ #endif /* COGL_HAS_EGL_SUPPORT */

6
cogl/cogl-euler.h
View File

@ -33,9 +33,7 @@
#include <cogl/cogl-types.h> #include <cogl/cogl-types.h>
#include <glib.h> COGL_BEGIN_DECLS
G_BEGIN_DECLS
/** /**
* SECTION:cogl-euler * SECTION:cogl-euler
@ -247,7 +245,7 @@ cogl_euler_copy (const CoglEuler *src);
void void
cogl_euler_free (CoglEuler *euler); cogl_euler_free (CoglEuler *euler);
G_END_DECLS COGL_END_DECLS
#endif /* __COGL_EULER_H */ #endif /* __COGL_EULER_H */

4
cogl/cogl-fixed.h
View File

@ -66,7 +66,7 @@
* The fixed point API is available since COGL 1.0. * The fixed point API is available since COGL 1.0.
*/ */
G_BEGIN_DECLS COGL_BEGIN_DECLS
/** /**
* COGL_FIXED_BITS: * COGL_FIXED_BITS:
@ -799,6 +799,6 @@ cogl_double_to_int (double value);
unsigned int unsigned int
cogl_double_to_uint (double value); cogl_double_to_uint (double value);
G_END_DECLS COGL_END_DECLS
#endif /* __COGL_FIXED_H__ */ #endif /* __COGL_FIXED_H__ */

4
cogl/cogl-flags.h
View File

@ -31,7 +31,7 @@
#include "cogl-util.h" #include "cogl-util.h"
G_BEGIN_DECLS COGL_BEGIN_DECLS
/* These are macros used to implement a fixed-size array of bits. This /* These are macros used to implement a fixed-size array of bits. This
should be used instead of CoglBitmask when the maximum bit number should be used instead of CoglBitmask when the maximum bit number
@ -119,7 +119,7 @@ G_BEGIN_DECLS
#define COGL_FLAGS_FOREACH_END \ #define COGL_FLAGS_FOREACH_END \
} } } G_STMT_END } } } G_STMT_END
G_END_DECLS COGL_END_DECLS
#endif /* __COGL_FLAGS_H */ #endif /* __COGL_FLAGS_H */

10
cogl/cogl-framebuffer.h
View File

@ -28,8 +28,6 @@
#ifndef __COGL_FRAMEBUFFER_H #ifndef __COGL_FRAMEBUFFER_H
#define __COGL_FRAMEBUFFER_H #define __COGL_FRAMEBUFFER_H
#include <glib.h>
#ifdef COGL_HAS_WIN32_SUPPORT #ifdef COGL_HAS_WIN32_SUPPORT
#include <windows.h> #include <windows.h>
#endif /* COGL_HAS_WIN32_SUPPORT */ #endif /* COGL_HAS_WIN32_SUPPORT */
@ -49,7 +47,7 @@
#include <cogl/cogl-texture.h> #include <cogl/cogl-texture.h>
#endif #endif
G_BEGIN_DECLS COGL_BEGIN_DECLS
/** /**
* SECTION:cogl-framebuffer * SECTION:cogl-framebuffer
@ -1141,7 +1139,7 @@ cogl_framebuffer_vdraw_attributes (CoglFramebuffer *framebuffer,
CoglVerticesMode mode, CoglVerticesMode mode,
int first_vertex, int first_vertex,
int n_vertices, int n_vertices,
...) G_GNUC_NULL_TERMINATED; ...) COGL_GNUC_NULL_TERMINATED;
/** /**
* cogl_framebuffer_draw_attributes: * cogl_framebuffer_draw_attributes:
@ -1249,7 +1247,7 @@ cogl_framebuffer_vdraw_indexed_attributes (CoglFramebuffer *framebuffer,
int first_vertex, int first_vertex,
int n_vertices, int n_vertices,
CoglIndices *indices, CoglIndices *indices,
...) G_GNUC_NULL_TERMINATED; ...) COGL_GNUC_NULL_TERMINATED;
/** /**
* cogl_framebuffer_draw_indexed_attributes: * cogl_framebuffer_draw_indexed_attributes:
@ -1811,7 +1809,7 @@ typedef enum { /*< prefix=COGL_FRAMEBUFFER_ERROR >*/
CoglBool CoglBool
cogl_is_framebuffer (void *object); cogl_is_framebuffer (void *object);
G_END_DECLS COGL_END_DECLS
#endif /* __COGL_FRAMEBUFFER_H */ #endif /* __COGL_FRAMEBUFFER_H */

4
cogl/cogl-gles2.h
View File

@ -49,7 +49,7 @@
#include <cogl/cogl-gles2-types.h> #include <cogl/cogl-gles2-types.h>
#endif #endif
G_BEGIN_DECLS COGL_BEGIN_DECLS
/** /**
* SECTION:cogl-gles2 * SECTION:cogl-gles2
@ -362,7 +362,7 @@ cogl_gles2_texture_get_handle (CoglTexture *texture,
CoglBool CoglBool
cogl_is_gles2_context (void *object); cogl_is_gles2_context (void *object);
G_END_DECLS COGL_END_DECLS
#endif /* __COGL_GLES2_H__ */ #endif /* __COGL_GLES2_H__ */

4
cogl/cogl-index-buffer.h
View File

@ -33,7 +33,7 @@
#include <cogl/cogl-context.h> #include <cogl/cogl-context.h>
G_BEGIN_DECLS COGL_BEGIN_DECLS
/** /**
* SECTION:cogl-index-buffer * SECTION:cogl-index-buffer
@ -79,7 +79,7 @@ cogl_index_buffer_new (CoglContext *context,
CoglBool CoglBool
cogl_is_index_buffer (void *object); cogl_is_index_buffer (void *object);
G_END_DECLS COGL_END_DECLS
#endif /* __COGL_INDEX_BUFFER_H__ */ #endif /* __COGL_INDEX_BUFFER_H__ */

4
cogl/cogl-indices.h
View File

@ -38,7 +38,7 @@ typedef struct _CoglIndices CoglIndices;
#include <cogl/cogl-index-buffer.h> #include <cogl/cogl-index-buffer.h>
G_BEGIN_DECLS COGL_BEGIN_DECLS
/** /**
* SECTION:cogl-index-range * SECTION:cogl-index-range
@ -140,7 +140,7 @@ cogl_get_rectangle_indices (CoglContext *context, int n_rectangles);
CoglBool CoglBool
cogl_is_indices (void *object); cogl_is_indices (void *object);
G_END_DECLS COGL_END_DECLS
#endif /* __COGL_INDICES_H__ */ #endif /* __COGL_INDICES_H__ */

4
cogl/cogl-kms-display.h
View File

@ -32,7 +32,7 @@
#include <cogl/cogl-types.h> #include <cogl/cogl-types.h>
#include <cogl/cogl-display.h> #include <cogl/cogl-display.h>
G_BEGIN_DECLS COGL_BEGIN_DECLS
/** /**
* cogl_kms_display_queue_modes_reset: * cogl_kms_display_queue_modes_reset:
@ -54,5 +54,5 @@ G_BEGIN_DECLS
void void
cogl_kms_display_queue_modes_reset (CoglDisplay *display); cogl_kms_display_queue_modes_reset (CoglDisplay *display);
G_END_DECLS COGL_END_DECLS
#endif /* __COGL_KMS_DISPLAY_H__ */ #endif /* __COGL_KMS_DISPLAY_H__ */

4
cogl/cogl-kms-renderer.h
View File

@ -31,7 +31,7 @@
#include <cogl/cogl-types.h> #include <cogl/cogl-types.h>
#include <cogl/cogl-renderer.h> #include <cogl/cogl-renderer.h>
G_BEGIN_DECLS COGL_BEGIN_DECLS
/** /**
* cogl_kms_renderer_get_kms_fd: * cogl_kms_renderer_get_kms_fd:
@ -47,5 +47,5 @@ G_BEGIN_DECLS
int int
cogl_kms_renderer_get_kms_fd (CoglRenderer *renderer); cogl_kms_renderer_get_kms_fd (CoglRenderer *renderer);
G_END_DECLS COGL_END_DECLS
#endif /* __COGL_KMS_RENDERER_H__ */ #endif /* __COGL_KMS_RENDERER_H__ */

8
cogl/cogl-magazine-private.h
View File

@ -21,10 +21,6 @@
* *
*/ */
#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
#error "Only <cogl/cogl.h> can be included directly."
#endif
#ifndef __COGL_MAGAZINE_PRIVATE_H__ #ifndef __COGL_MAGAZINE_PRIVATE_H__
#define __COGL_MAGAZINE_PRIVATE_H__ #define __COGL_MAGAZINE_PRIVATE_H__
@ -32,8 +28,6 @@
#include "cogl-memory-stack-private.h" #include "cogl-memory-stack-private.h"
G_BEGIN_DECLS
typedef struct _CoglMagazineChunk CoglMagazineChunk; typedef struct _CoglMagazineChunk CoglMagazineChunk;
struct _CoglMagazineChunk struct _CoglMagazineChunk
@ -77,6 +71,4 @@ _cogl_magazine_chunk_free (CoglMagazine *magazine, void *data)
void void
_cogl_magazine_free (CoglMagazine *magazine); _cogl_magazine_free (CoglMagazine *magazine);
G_END_DECLS
#endif /* __COGL_MAGAZINE_PRIVATE_H__ */ #endif /* __COGL_MAGAZINE_PRIVATE_H__ */

4
cogl/cogl-matrix-private.h
View File

@ -29,7 +29,7 @@
#include <glib.h> #include <glib.h>
G_BEGIN_DECLS COGL_BEGIN_DECLS
#define _COGL_MATRIX_DEBUG_PRINT(MATRIX) \ #define _COGL_MATRIX_DEBUG_PRINT(MATRIX) \
if (G_UNLIKELY (COGL_DEBUG_ENABLED (COGL_DEBUG_MATRICES))) \ if (G_UNLIKELY (COGL_DEBUG_ENABLED (COGL_DEBUG_MATRICES))) \
@ -45,7 +45,7 @@ void
_cogl_matrix_init_from_matrix_without_inverse (CoglMatrix *matrix, _cogl_matrix_init_from_matrix_without_inverse (CoglMatrix *matrix,
const CoglMatrix *src); const CoglMatrix *src);
G_END_DECLS COGL_END_DECLS
#endif /* __COGL_MATRIX_PRIVATE_H */ #endif /* __COGL_MATRIX_PRIVATE_H */

9
cogl/cogl-matrix.h
View File

@ -27,14 +27,17 @@
#ifndef __COGL_MATRIX_H #ifndef __COGL_MATRIX_H
#define __COGL_MATRIX_H #define __COGL_MATRIX_H
#include <glib.h> #ifdef COGL_HAS_GTYPE_SUPPORT
#include <glib-object.h>
#endif /* COGL_HAS_GTYPE_SUPPORT */
#include "cogl-types.h" #include "cogl-types.h"
#ifdef COGL_ENABLE_EXPERIMENTAL_API #ifdef COGL_ENABLE_EXPERIMENTAL_API
#include "cogl-quaternion.h" #include "cogl-quaternion.h"
#endif #endif
G_BEGIN_DECLS COGL_BEGIN_DECLS
/** /**
* SECTION:cogl-matrix * SECTION:cogl-matrix
@ -789,7 +792,7 @@ cogl_gtype_matrix_get_type (void);
#endif /* _COGL_SUPPORTS_GTYPE_INTEGRATION */ #endif /* _COGL_SUPPORTS_GTYPE_INTEGRATION */
G_END_DECLS COGL_END_DECLS
#endif /* __COGL_MATRIX_H */ #endif /* __COGL_MATRIX_H */

10
cogl/cogl-memory-stack-private.h
View File

@ -21,16 +21,10 @@
* *
*/ */
#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
#error "Only <cogl/cogl.h> can be included directly."
#endif
#include <glib.h>
#ifndef __COGL_MEMORY_STACK__ #ifndef __COGL_MEMORY_STACK__
#define __COGL_MEMORY_STACK__ #define __COGL_MEMORY_STACK__
G_BEGIN_DECLS #include <glib.h>
typedef struct _CoglMemoryStack CoglMemoryStack; typedef struct _CoglMemoryStack CoglMemoryStack;
@ -46,6 +40,4 @@ _cogl_memory_stack_rewind (CoglMemoryStack *stack);
void void
_cogl_memory_stack_free (CoglMemoryStack *stack); _cogl_memory_stack_free (CoglMemoryStack *stack);
G_END_DECLS
#endif /* __COGL_MEMORY_STACK__ */ #endif /* __COGL_MEMORY_STACK__ */

5
cogl/cogl-meta-texture.h
View File

@ -30,9 +30,8 @@
#define __COGL_META_TEXTURE_H__ #define __COGL_META_TEXTURE_H__
#include <cogl/cogl-pipeline-layer-state.h> #include <cogl/cogl-pipeline-layer-state.h>
#include <glib.h>
G_BEGIN_DECLS COGL_BEGIN_DECLS
/** /**
* SECTION:cogl-meta-texture * SECTION:cogl-meta-texture
@ -176,6 +175,6 @@ cogl_meta_texture_foreach_in_region (CoglMetaTexture *meta_texture,
CoglMetaTextureCallback callback, CoglMetaTextureCallback callback,
void *user_data); void *user_data);
G_END_DECLS COGL_END_DECLS
#endif /* __COGL_META_TEXTURE_H__ */ #endif /* __COGL_META_TEXTURE_H__ */

4
cogl/cogl-offscreen.h
View File

@ -31,7 +31,7 @@
#include <cogl/cogl-types.h> #include <cogl/cogl-types.h>
#include <cogl/cogl-texture.h> #include <cogl/cogl-texture.h>
G_BEGIN_DECLS COGL_BEGIN_DECLS
/** /**
* SECTION:cogl-offscreen * SECTION:cogl-offscreen
@ -112,6 +112,6 @@ cogl_offscreen_unref (void *offscreen) G_GNUC_DEPRECATED;
#endif /* COGL_DISABLE_DEPRECATED */ #endif /* COGL_DISABLE_DEPRECATED */
G_END_DECLS COGL_END_DECLS
#endif /* __COGL_OFFSCREEN_H__ */ #endif /* __COGL_OFFSCREEN_H__ */

4
cogl/cogl-onscreen-template.h
View File

@ -33,7 +33,7 @@
#include <cogl/cogl-swap-chain.h> #include <cogl/cogl-swap-chain.h>
G_BEGIN_DECLS COGL_BEGIN_DECLS
typedef struct _CoglOnscreenTemplate CoglOnscreenTemplate; typedef struct _CoglOnscreenTemplate CoglOnscreenTemplate;
@ -101,6 +101,6 @@ cogl_onscreen_template_set_swap_throttled (
CoglBool CoglBool
cogl_is_onscreen_template (void *object); cogl_is_onscreen_template (void *object);
G_END_DECLS COGL_END_DECLS
#endif /* __COGL_ONSCREEN_TEMPLATE_H__ */ #endif /* __COGL_ONSCREEN_TEMPLATE_H__ */

5
cogl/cogl-onscreen.h
View File

@ -34,9 +34,8 @@
#include <cogl/cogl-context.h> #include <cogl/cogl-context.h>
#include <cogl/cogl-framebuffer.h> #include <cogl/cogl-framebuffer.h>
#include <glib.h>
G_BEGIN_DECLS COGL_BEGIN_DECLS
typedef struct _CoglOnscreen CoglOnscreen; typedef struct _CoglOnscreen CoglOnscreen;
#define COGL_ONSCREEN(X) ((CoglOnscreen *)(X)) #define COGL_ONSCREEN(X) ((CoglOnscreen *)(X))
@ -532,6 +531,6 @@ cogl_onscreen_remove_resize_handler (CoglOnscreen *onscreen,
CoglBool CoglBool
cogl_is_onscreen (void *object); cogl_is_onscreen (void *object);
G_END_DECLS COGL_END_DECLS
#endif /* __COGL_ONSCREEN_H */ #endif /* __COGL_ONSCREEN_H */

4
cogl/cogl-path-functions.h
View File

@ -34,7 +34,7 @@
#include <cogl/cogl-types.h> #include <cogl/cogl-types.h>
G_BEGIN_DECLS COGL_BEGIN_DECLS
/** /**
* cogl_is_path: * cogl_is_path:
@ -424,7 +424,7 @@ cogl_set_path (CoglPath *path);
CoglPath * CoglPath *
cogl_path_copy (CoglPath *path); cogl_path_copy (CoglPath *path);
G_END_DECLS COGL_END_DECLS
#endif /* __COGL_PATH_FUNCTIONS_H__ */ #endif /* __COGL_PATH_FUNCTIONS_H__ */

4
cogl/cogl-path.h
View File

@ -30,7 +30,7 @@
#include <cogl/cogl-types.h> #include <cogl/cogl-types.h>
G_BEGIN_DECLS COGL_BEGIN_DECLS
/** /**
* SECTION:cogl-paths * SECTION:cogl-paths
@ -97,7 +97,7 @@ typedef enum {
COGL_PATH_FILL_RULE_EVEN_ODD COGL_PATH_FILL_RULE_EVEN_ODD
} CoglPathFillRule; } CoglPathFillRule;
G_END_DECLS COGL_END_DECLS
#include "cogl-path-functions.h" #include "cogl-path-functions.h"

5
cogl/cogl-pipeline-layer-state.h
View File

@ -32,9 +32,8 @@
#include <cogl/cogl-color.h> #include <cogl/cogl-color.h>
#include <cogl/cogl-matrix.h> #include <cogl/cogl-matrix.h>
#include <cogl/cogl-texture.h> #include <cogl/cogl-texture.h>
#include <glib.h>
G_BEGIN_DECLS COGL_BEGIN_DECLS
#ifdef COGL_ENABLE_EXPERIMENTAL_API #ifdef COGL_ENABLE_EXPERIMENTAL_API
@ -603,6 +602,6 @@ cogl_pipeline_add_layer_snippet (CoglPipeline *pipeline,
#endif /* COGL_ENABLE_EXPERIMENTAL_API */ #endif /* COGL_ENABLE_EXPERIMENTAL_API */
G_END_DECLS COGL_END_DECLS
#endif /* __COGL_PIPELINE_LAYER_STATE_H__ */ #endif /* __COGL_PIPELINE_LAYER_STATE_H__ */

2
cogl/cogl-pipeline-snippet-private.h
View File

@ -28,6 +28,8 @@
#ifndef __COGL_PIPELINE_SNIPPET_PRIVATE_H #ifndef __COGL_PIPELINE_SNIPPET_PRIVATE_H
#define __COGL_PIPELINE_SNIPPET_PRIVATE_H #define __COGL_PIPELINE_SNIPPET_PRIVATE_H
#include <glib.h>
#include "cogl-snippet.h" #include "cogl-snippet.h"
#include "cogl-queue.h" #include "cogl-queue.h"

5
cogl/cogl-pipeline-state.h
View File

@ -31,9 +31,8 @@
#include <cogl/cogl-pipeline.h> #include <cogl/cogl-pipeline.h>
#include <cogl/cogl-color.h> #include <cogl/cogl-color.h>
#include <cogl/cogl-depth-state.h> #include <cogl/cogl-depth-state.h>
#include <glib.h>
G_BEGIN_DECLS COGL_BEGIN_DECLS
#ifdef COGL_ENABLE_EXPERIMENTAL_API #ifdef COGL_ENABLE_EXPERIMENTAL_API
@ -915,6 +914,6 @@ cogl_pipeline_add_snippet (CoglPipeline *pipeline,
#endif /* COGL_ENABLE_EXPERIMENTAL_API */ #endif /* COGL_ENABLE_EXPERIMENTAL_API */
G_END_DECLS COGL_END_DECLS
#endif /* __COGL_PIPELINE_STATE_H__ */ #endif /* __COGL_PIPELINE_STATE_H__ */

4
cogl/cogl-pipeline.h
View File

@ -37,7 +37,7 @@ typedef struct _CoglPipeline CoglPipeline;
#include <cogl/cogl-context.h> #include <cogl/cogl-context.h>
#include <cogl/cogl-snippet.h> #include <cogl/cogl-snippet.h>
G_BEGIN_DECLS COGL_BEGIN_DECLS
#ifdef COGL_ENABLE_EXPERIMENTAL_API #ifdef COGL_ENABLE_EXPERIMENTAL_API
@ -168,6 +168,6 @@ cogl_pipeline_get_uniform_location (CoglPipeline *pipeline,
#endif /* COGL_ENABLE_EXPERIMENTAL_API */ #endif /* COGL_ENABLE_EXPERIMENTAL_API */
G_END_DECLS COGL_END_DECLS
#endif /* __COGL_PIPELINE_H__ */ #endif /* __COGL_PIPELINE_H__ */

4
cogl/cogl-pixel-buffer-private.h
View File

@ -33,13 +33,13 @@
#include <glib.h> #include <glib.h>
G_BEGIN_DECLS COGL_BEGIN_DECLS
struct _CoglPixelBuffer struct _CoglPixelBuffer
{ {
CoglBuffer _parent; CoglBuffer _parent;
}; };
G_END_DECLS COGL_END_DECLS
#endif /* __COGL_PIXEL_BUFFER_PRIVATE_H__ */ #endif /* __COGL_PIXEL_BUFFER_PRIVATE_H__ */

5
cogl/cogl-pixel-buffer.h
View File

@ -32,11 +32,10 @@
#ifndef __COGL_PIXEL_BUFFER_H__ #ifndef __COGL_PIXEL_BUFFER_H__
#define __COGL_PIXEL_BUFFER_H__ #define __COGL_PIXEL_BUFFER_H__
#include <glib.h>
#include <cogl/cogl-types.h> #include <cogl/cogl-types.h>
#include <cogl/cogl-context.h> #include <cogl/cogl-context.h>
G_BEGIN_DECLS COGL_BEGIN_DECLS
#define COGL_PIXEL_BUFFER(buffer) ((CoglPixelBuffer *)(buffer)) #define COGL_PIXEL_BUFFER(buffer) ((CoglPixelBuffer *)(buffer))
@ -110,6 +109,6 @@ cogl_pixel_buffer_set_region (CoglPixelBuffer *buffer,
unsigned int dst_y); unsigned int dst_y);
#endif #endif
G_END_DECLS COGL_END_DECLS
#endif /* __COGL_PIXEL_BUFFER_H__ */ #endif /* __COGL_PIXEL_BUFFER_H__ */

4
cogl/cogl-point-in-poly-private.h
View File

@ -25,7 +25,7 @@
#include <glib.h> #include <glib.h>
G_BEGIN_DECLS COGL_BEGIN_DECLS
int int
_cogl_util_point_in_screen_poly (float point_x, _cogl_util_point_in_screen_poly (float point_x,
@ -34,7 +34,7 @@ _cogl_util_point_in_screen_poly (float point_x,
size_t stride, size_t stride,
int n_vertices); int n_vertices);
G_END_DECLS COGL_END_DECLS
#endif /* __COGL_POINT_INT_POLYGON_PRIVATE_H */ #endif /* __COGL_POINT_INT_POLYGON_PRIVATE_H */

5
cogl/cogl-poll.h
View File

@ -31,11 +31,10 @@
#ifndef __COGL_POLL_H__ #ifndef __COGL_POLL_H__
#define __COGL_POLL_H__ #define __COGL_POLL_H__
#include <glib.h>
#include <cogl/cogl-defines.h> #include <cogl/cogl-defines.h>
#include <cogl/cogl-context.h> #include <cogl/cogl-context.h>
G_BEGIN_DECLS COGL_BEGIN_DECLS
/** /**
* SECTION:cogl-poll * SECTION:cogl-poll
@ -163,6 +162,6 @@ cogl_poll_dispatch (CoglContext *context,
const CoglPollFD *poll_fds, const CoglPollFD *poll_fds,
int n_poll_fds); int n_poll_fds);
G_END_DECLS COGL_END_DECLS
#endif /* __COGL_POLL_H__ */ #endif /* __COGL_POLL_H__ */

4
cogl/cogl-primitive-texture.h
View File

@ -31,7 +31,7 @@
#include "cogl-types.h" #include "cogl-types.h"
G_BEGIN_DECLS COGL_BEGIN_DECLS
/** /**
* SECTION:cogl-primitive-texture * SECTION:cogl-primitive-texture
@ -93,6 +93,6 @@ void
cogl_primitive_texture_set_auto_mipmap (CoglPrimitiveTexture *primitive_texture, cogl_primitive_texture_set_auto_mipmap (CoglPrimitiveTexture *primitive_texture,
CoglBool value); CoglBool value);
G_END_DECLS COGL_END_DECLS
#endif /* __COGL_PRIMITIVE_TEXTURE_H__ */ #endif /* __COGL_PRIMITIVE_TEXTURE_H__ */

4
cogl/cogl-primitive.h
View File

@ -39,7 +39,7 @@ typedef struct _CoglPrimitive CoglPrimitive;
#include <cogl/cogl-vertex-buffer.h> /* for CoglVerticesMode */ #include <cogl/cogl-vertex-buffer.h> /* for CoglVerticesMode */
#include <cogl/cogl-attribute.h> #include <cogl/cogl-attribute.h>
G_BEGIN_DECLS COGL_BEGIN_DECLS
/** /**
* SECTION:cogl-primitive * SECTION:cogl-primitive
@ -868,7 +868,7 @@ cogl_primitive_foreach_attribute (CoglPrimitive *primitive,
CoglPrimitiveAttributeCallback callback, CoglPrimitiveAttributeCallback callback,
void *user_data); void *user_data);
G_END_DECLS COGL_END_DECLS
#endif /* __COGL_PRIMITIVE_H__ */ #endif /* __COGL_PRIMITIVE_H__ */

4
cogl/cogl-primitives-private.h
View File

@ -26,7 +26,7 @@
#include <glib.h> #include <glib.h>
G_BEGIN_DECLS COGL_BEGIN_DECLS
/* Draws a rectangle without going through the journal so that it will /* Draws a rectangle without going through the journal so that it will
be flushed immediately. This should only be used in situations be flushed immediately. This should only be used in situations
@ -55,6 +55,6 @@ _cogl_framebuffer_draw_multitextured_rectangles (
int n_rects, int n_rects,
CoglBool disable_legacy_state); CoglBool disable_legacy_state);
G_END_DECLS COGL_END_DECLS
#endif /* __COGL_PRIMITIVES_PRIVATE_H */ #endif /* __COGL_PRIMITIVES_PRIVATE_H */

4
cogl/cogl-primitives.h
View File

@ -26,7 +26,7 @@
#include <glib.h> #include <glib.h>
G_BEGIN_DECLS COGL_BEGIN_DECLS
/** /**
* SECTION:cogl-primitives * SECTION:cogl-primitives
@ -185,6 +185,6 @@ cogl_polygon (const CoglTextureVertex *vertices,
unsigned int n_vertices, unsigned int n_vertices,
CoglBool use_color); CoglBool use_color);
G_END_DECLS COGL_END_DECLS
#endif /* __COGL_PRIMITIVES_H */ #endif /* __COGL_PRIMITIVES_H */

4
cogl/cogl-private.h
View File

@ -28,7 +28,7 @@
#include "cogl-context.h" #include "cogl-context.h"
G_BEGIN_DECLS COGL_BEGIN_DECLS
CoglBool CoglBool
_cogl_check_extension (const char *name, char * const *ext); _cogl_check_extension (const char *name, char * const *ext);
@ -96,6 +96,6 @@ _cogl_pixel_format_is_endian_dependant (CoglPixelFormat format);
#define COGL_PIXEL_FORMAT_CAN_HAVE_PREMULT(format) \ #define COGL_PIXEL_FORMAT_CAN_HAVE_PREMULT(format) \
(((format) & COGL_A_BIT) && (format) != COGL_PIXEL_FORMAT_A_8) (((format) & COGL_A_BIT) && (format) != COGL_PIXEL_FORMAT_A_8)
G_END_DECLS COGL_END_DECLS
#endif /* __COGL_PRIVATE_H__ */ #endif /* __COGL_PRIVATE_H__ */

4
cogl/cogl-quaternion.h
View File

@ -34,7 +34,7 @@
#include <cogl/cogl-types.h> #include <cogl/cogl-types.h>
#include <cogl/cogl-vector.h> #include <cogl/cogl-vector.h>
G_BEGIN_DECLS COGL_BEGIN_DECLS
/** /**
* SECTION:cogl-quaternion * SECTION:cogl-quaternion
@ -523,7 +523,7 @@ cogl_get_static_identity_quaternion (void);
const CoglQuaternion * const CoglQuaternion *
cogl_get_static_zero_quaternion (void); cogl_get_static_zero_quaternion (void);
G_END_DECLS COGL_END_DECLS
#endif /* __COGL_QUATERNION_H__ */ #endif /* __COGL_QUATERNION_H__ */

1
cogl/cogl-rectangle-map.h
View File

@ -24,6 +24,7 @@
#ifndef __COGL_RECTANGLE_MAP_H #ifndef __COGL_RECTANGLE_MAP_H
#define __COGL_RECTANGLE_MAP_H #define __COGL_RECTANGLE_MAP_H
#include <glib.h>
#include "cogl-types.h" #include "cogl-types.h"
typedef struct _CoglRectangleMap CoglRectangleMap; typedef struct _CoglRectangleMap CoglRectangleMap;

6
cogl/cogl-renderer.h
View File

@ -28,13 +28,11 @@
#ifndef __COGL_RENDERER_H__ #ifndef __COGL_RENDERER_H__
#define __COGL_RENDERER_H__ #define __COGL_RENDERER_H__
#include <glib.h>
#include <cogl/cogl-types.h> #include <cogl/cogl-types.h>
#include <cogl/cogl-onscreen-template.h> #include <cogl/cogl-onscreen-template.h>
#include <cogl/cogl-error.h> #include <cogl/cogl-error.h>
G_BEGIN_DECLS COGL_BEGIN_DECLS
/** /**
* SECTION:cogl-renderer * SECTION:cogl-renderer
@ -385,7 +383,7 @@ cogl_renderer_set_driver (CoglRenderer *renderer,
CoglDriver CoglDriver
cogl_renderer_get_driver (CoglRenderer *renderer); cogl_renderer_get_driver (CoglRenderer *renderer);
G_END_DECLS COGL_END_DECLS
#endif /* __COGL_RENDERER_H__ */ #endif /* __COGL_RENDERER_H__ */

4
cogl/cogl-sdl.h
View File

@ -41,7 +41,7 @@
#pragma comment (lib, "SDLmain.lib") #pragma comment (lib, "SDLmain.lib")
#endif #endif
G_BEGIN_DECLS COGL_BEGIN_DECLS
/** /**
* SECTION:cogl-sdl * SECTION:cogl-sdl
@ -219,6 +219,6 @@ cogl_sdl_onscreen_get_window (CoglOnscreen *onscreen);
#endif /* SDL_MAJOR_VERSION */ #endif /* SDL_MAJOR_VERSION */
G_END_DECLS COGL_END_DECLS
#endif /* __COGL_SDL_H__ */ #endif /* __COGL_SDL_H__ */

4
cogl/cogl-shader.h
View File

@ -31,7 +31,7 @@
#include <cogl/cogl-types.h> #include <cogl/cogl-types.h>
#include <cogl/cogl-defines.h> #include <cogl/cogl-defines.h>
G_BEGIN_DECLS COGL_BEGIN_DECLS
/** /**
* SECTION:cogl-shaders * SECTION:cogl-shaders
@ -649,6 +649,6 @@ cogl_program_uniform_matrix (int uniform_no,
#endif /* COGL_DISABLE_DEPRECATED */ #endif /* COGL_DISABLE_DEPRECATED */
G_END_DECLS COGL_END_DECLS
#endif /* __COGL_SHADER_H__ */ #endif /* __COGL_SHADER_H__ */

6
cogl/cogl-snippet.h
View File

@ -32,9 +32,7 @@
#ifndef __COGL_SNIPPET_H__ #ifndef __COGL_SNIPPET_H__
#define __COGL_SNIPPET_H__ #define __COGL_SNIPPET_H__
#include <glib.h> COGL_BEGIN_DECLS
G_BEGIN_DECLS
/** /**
* SECTION:cogl-snippet * SECTION:cogl-snippet
@ -751,6 +749,6 @@ cogl_snippet_set_post (CoglSnippet *snippet,
const char * const char *
cogl_snippet_get_post (CoglSnippet *snippet); cogl_snippet_get_post (CoglSnippet *snippet);
G_END_DECLS COGL_END_DECLS
#endif /* __COGL_SNIPPET_H__ */ #endif /* __COGL_SNIPPET_H__ */

6
cogl/cogl-sub-texture.h
View File

@ -31,9 +31,7 @@
#ifndef __COGL_SUB_TEXTURE_H #ifndef __COGL_SUB_TEXTURE_H
#define __COGL_SUB_TEXTURE_H #define __COGL_SUB_TEXTURE_H
#include <glib.h> COGL_BEGIN_DECLS
G_BEGIN_DECLS
/** /**
* SECTION:cogl-sub-texture * SECTION:cogl-sub-texture
@ -119,6 +117,6 @@ cogl_sub_texture_get_parent (CoglSubTexture *sub_texture);
CoglBool CoglBool
cogl_is_sub_texture (void *object); cogl_is_sub_texture (void *object);
G_END_DECLS COGL_END_DECLS
#endif /* __COGL_SUB_TEXTURE_H */ #endif /* __COGL_SUB_TEXTURE_H */

4
cogl/cogl-swap-chain.h
View File

@ -28,7 +28,7 @@
#ifndef __COGL_SWAP_CHAIN_H__ #ifndef __COGL_SWAP_CHAIN_H__
#define __COGL_SWAP_CHAIN_H__ #define __COGL_SWAP_CHAIN_H__
G_BEGIN_DECLS COGL_BEGIN_DECLS
typedef struct _CoglSwapChain CoglSwapChain; typedef struct _CoglSwapChain CoglSwapChain;
@ -46,6 +46,6 @@ cogl_swap_chain_set_length (CoglSwapChain *swap_chain,
CoglBool CoglBool
cogl_is_swap_chain (void *object); cogl_is_swap_chain (void *object);
G_END_DECLS COGL_END_DECLS
#endif /* __COGL_SWAP_CHAIN_H__ */ #endif /* __COGL_SWAP_CHAIN_H__ */

6
cogl/cogl-texture-2d-gl.h
View File

@ -34,9 +34,7 @@
#include "cogl-context.h" #include "cogl-context.h"
#include "cogl-texture-2d.h" #include "cogl-texture-2d.h"
#include <glib.h> COGL_BEGIN_DECLS
G_BEGIN_DECLS
/** /**
* cogl_texture_2d_new_from_foreign: * cogl_texture_2d_new_from_foreign:
@ -70,6 +68,6 @@ cogl_texture_2d_new_from_foreign (CoglContext *ctx,
CoglPixelFormat format, CoglPixelFormat format,
CoglError **error); CoglError **error);
G_END_DECLS COGL_END_DECLS
#endif /* _COGL_TEXTURE_2D_GL_H_ */ #endif /* _COGL_TEXTURE_2D_GL_H_ */

2
cogl/cogl-texture-2d-sliced.h
View File

@ -30,8 +30,6 @@
#include "cogl-context.h" #include "cogl-context.h"
#include "cogl-types.h" #include "cogl-types.h"
#include <glib.h>
/** /**
* SECTION:cogl-texture-2d-sliced * SECTION:cogl-texture-2d-sliced
* @short_description: Functions for creating and manipulating 2D meta * @short_description: Functions for creating and manipulating 2D meta

6
cogl/cogl-texture-2d.h
View File

@ -34,9 +34,7 @@
#include "cogl-context.h" #include "cogl-context.h"
#include "cogl-bitmap.h" #include "cogl-bitmap.h"
#include <glib.h> COGL_BEGIN_DECLS
G_BEGIN_DECLS
/** /**
* SECTION:cogl-texture-2d * SECTION:cogl-texture-2d
@ -187,6 +185,6 @@ cogl_texture_2d_new_from_bitmap (CoglBitmap *bitmap,
CoglPixelFormat internal_format, CoglPixelFormat internal_format,
CoglError **error); CoglError **error);
G_END_DECLS COGL_END_DECLS
#endif /* __COGL_TEXTURE_2D_H */ #endif /* __COGL_TEXTURE_2D_H */

6
cogl/cogl-texture-3d.h
View File

@ -31,9 +31,7 @@
#ifndef __COGL_TEXTURE_3D_H #ifndef __COGL_TEXTURE_3D_H
#define __COGL_TEXTURE_3D_H #define __COGL_TEXTURE_3D_H
#include <glib.h> COGL_BEGIN_DECLS
G_BEGIN_DECLS
/** /**
* SECTION:cogl-texture-3d * SECTION:cogl-texture-3d
@ -180,6 +178,6 @@ cogl_texture_3d_new_from_bitmap (CoglBitmap *bitmap,
CoglBool CoglBool
cogl_is_texture_3d (void *object); cogl_is_texture_3d (void *object);
G_END_DECLS COGL_END_DECLS
#endif /* __COGL_TEXTURE_3D_H */ #endif /* __COGL_TEXTURE_3D_H */

4
cogl/cogl-texture-rectangle.h
View File

@ -29,7 +29,7 @@
#include "cogl-context.h" #include "cogl-context.h"
G_BEGIN_DECLS COGL_BEGIN_DECLS
/** /**
* SECTION:cogl-texture-rectangle * SECTION:cogl-texture-rectangle
@ -199,6 +199,6 @@ cogl_texture_rectangle_new_from_foreign (CoglContext *ctx,
CoglPixelFormat format, CoglPixelFormat format,
CoglError **error); CoglError **error);
G_END_DECLS COGL_END_DECLS
#endif /* __COGL_TEXURE_RECTANGLE_H */ #endif /* __COGL_TEXURE_RECTANGLE_H */

4
cogl/cogl-texture.h
View File

@ -40,7 +40,7 @@ typedef struct _CoglTexture CoglTexture;
#endif #endif
#include <cogl/cogl-bitmap.h> #include <cogl/cogl-bitmap.h>
G_BEGIN_DECLS COGL_BEGIN_DECLS
/** /**
* SECTION:cogl-texture * SECTION:cogl-texture
@ -517,6 +517,6 @@ cogl_texture_unref (void *texture) G_GNUC_DEPRECATED;
#endif /* COGL_DISABLE_DEPRECATED */ #endif /* COGL_DISABLE_DEPRECATED */
G_END_DECLS COGL_END_DECLS
#endif /* __COGL_TEXTURE_H__ */ #endif /* __COGL_TEXTURE_H__ */

36
cogl/cogl-types.h
View File

@ -29,11 +29,24 @@
#define __COGL_TYPES_H__ #define __COGL_TYPES_H__
#include <stdint.h> #include <stdint.h>
#include <glib-object.h> #include <stddef.h>
#include <cogl/cogl-defines.h> #include <cogl/cogl-defines.h>
G_BEGIN_DECLS #ifdef COGL_HAS_GTYPE_SUPPORT
#include <glib-object.h>
#endif /* COGL_HAS_GTYPE_SUPPORT */
/* Guard C code in headers, while including them from C++ */
#ifdef __cplusplus
#define COGL_BEGIN_DECLS extern "C" {
#define COGL_END_DECLS }
#else
#define COGL_BEGIN_DECLS
#define COGL_END_DECLS
#endif
COGL_BEGIN_DECLS
/** /**
* CoglBool: * CoglBool:
@ -73,6 +86,19 @@ typedef int CoglBool;
#define FALSE 0 #define FALSE 0
#endif #endif
#if __GNUC__ >= 4
#define COGL_GNUC_NULL_TERMINATED __attribute__((__sentinel__))
#else
#define COGL_GNUC_NULL_TERMINATED
#endif
#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1)
#define COGL_GNUC_DEPRECATED \
__attribute__((__deprecated__))
#else
#define COGL_GNUC_DEPRECATED
#endif /* __GNUC__ */
/* Some structures are meant to be opaque but they have public /* Some structures are meant to be opaque but they have public
definitions because we want the size to be public so they can be definitions because we want the size to be public so they can be
allocated on the stack. This macro is used to ensure that users allocated on the stack. This macro is used to ensure that users
@ -109,10 +135,14 @@ typedef void * CoglHandle;
*/ */
#define COGL_INVALID_HANDLE NULL #define COGL_INVALID_HANDLE NULL
#ifdef COGL_HAS_GTYPE_SUPPORT
#define COGL_TYPE_HANDLE (cogl_handle_get_type ()) #define COGL_TYPE_HANDLE (cogl_handle_get_type ())
GType GType
cogl_handle_get_type (void) G_GNUC_CONST; cogl_handle_get_type (void) G_GNUC_CONST;
#endif /* COGL_HAS_GTYPE_SUPPORT */
/** /**
* cogl_handle_ref: * cogl_handle_ref:
* @handle: a #CoglHandle * @handle: a #CoglHandle
@ -856,6 +886,6 @@ typedef enum { /*< prefix=COGL_READ_PIXELS >*/
COGL_READ_PIXELS_COLOR_BUFFER = 1L << 0 COGL_READ_PIXELS_COLOR_BUFFER = 1L << 0
} CoglReadPixelsFlags; } CoglReadPixelsFlags;
G_END_DECLS COGL_END_DECLS
#endif /* __COGL_TYPES_H__ */ #endif /* __COGL_TYPES_H__ */

6
cogl/cogl-vector.h
View File

@ -31,9 +31,7 @@
#ifndef __COGL_VECTOR_H #ifndef __COGL_VECTOR_H
#define __COGL_VECTOR_H #define __COGL_VECTOR_H
#include <glib.h> COGL_BEGIN_DECLS
G_BEGIN_DECLS
/** /**
* SECTION:cogl-vector * SECTION:cogl-vector
@ -347,7 +345,7 @@ cogl_vector3_dot_product (const float *a, const float *b);
float float
cogl_vector3_distance (const float *a, const float *b); cogl_vector3_distance (const float *a, const float *b);
G_END_DECLS COGL_END_DECLS
#endif /* __COGL_VECTOR_H */ #endif /* __COGL_VECTOR_H */

4
cogl/cogl-vertex-buffer.h
View File

@ -35,7 +35,7 @@
#include <cogl/cogl-defines.h> #include <cogl/cogl-defines.h>
#include <cogl/cogl-types.h> #include <cogl/cogl-types.h>
G_BEGIN_DECLS COGL_BEGIN_DECLS
/** /**
* SECTION:cogl-vertex-buffer * SECTION:cogl-vertex-buffer
@ -404,6 +404,6 @@ cogl_is_vertex_buffer (CoglHandle handle);
CoglBool CoglBool
cogl_is_vertex_buffer_indices (CoglHandle handle); cogl_is_vertex_buffer_indices (CoglHandle handle);
G_END_DECLS COGL_END_DECLS
#endif /* __COGL_VERTEX_BUFFER_H__ */ #endif /* __COGL_VERTEX_BUFFER_H__ */

2
cogl/cogl-wayland-client.h
View File

@ -24,8 +24,6 @@
#ifndef __COGL_WAYLAND_CLIENT_H #ifndef __COGL_WAYLAND_CLIENT_H
#define __COGL_WAYLAND_CLIENT_H #define __COGL_WAYLAND_CLIENT_H
#include <glib.h>
#define __COGL_H_INSIDE__ #define __COGL_H_INSIDE__
#include <cogl/cogl-wayland-renderer.h> #include <cogl/cogl-wayland-renderer.h>

4
cogl/cogl-wayland-renderer.h
View File

@ -33,7 +33,7 @@
#include <wayland-client.h> #include <wayland-client.h>
G_BEGIN_DECLS COGL_BEGIN_DECLS
/** /**
* cogl_wayland_renderer_set_foreign_display: * cogl_wayland_renderer_set_foreign_display:
@ -159,6 +159,6 @@ cogl_wayland_renderer_set_foreign_shell (CoglRenderer *renderer,
struct wl_shell * struct wl_shell *
cogl_wayland_renderer_get_shell (CoglRenderer *renderer); cogl_wayland_renderer_get_shell (CoglRenderer *renderer);
G_END_DECLS COGL_END_DECLS
#endif /* __COGL_WAYLAND_RENDERER_H__ */ #endif /* __COGL_WAYLAND_RENDERER_H__ */

6
cogl/cogl-wayland-server.h
View File

@ -24,15 +24,13 @@
#ifndef __COGL_WAYLAND_SERVER_H #ifndef __COGL_WAYLAND_SERVER_H
#define __COGL_WAYLAND_SERVER_H #define __COGL_WAYLAND_SERVER_H
#include <glib.h>
#include <wayland-server.h> #include <wayland-server.h>
#define __COGL_H_INSIDE__ #define __COGL_H_INSIDE__
#include <cogl/cogl-context.h> #include <cogl/cogl-context.h>
#include <cogl/cogl-texture-2d.h> #include <cogl/cogl-texture-2d.h>
G_BEGIN_DECLS COGL_BEGIN_DECLS
/** /**
* cogl_wayland_display_set_compositor_display: * cogl_wayland_display_set_compositor_display:
@ -79,6 +77,6 @@ cogl_wayland_texture_2d_new_from_buffer (CoglContext *ctx,
struct wl_buffer *buffer, struct wl_buffer *buffer,
CoglError **error); CoglError **error);
G_END_DECLS COGL_END_DECLS
#endif /* __COGL_WAYLAND_SERVER_H */ #endif /* __COGL_WAYLAND_SERVER_H */

4
cogl/cogl-win32-renderer.h
View File

@ -31,7 +31,7 @@
#include <cogl/cogl-types.h> #include <cogl/cogl-types.h>
#include <cogl/cogl-renderer.h> #include <cogl/cogl-renderer.h>
G_BEGIN_DECLS COGL_BEGIN_DECLS
/** /**
* cogl_win32_renderer_handle_event: * cogl_win32_renderer_handle_event:
@ -87,6 +87,6 @@ cogl_win32_renderer_remove_filter (CoglRenderer *renderer,
CoglWin32FilterFunc func, CoglWin32FilterFunc func,
void *data); void *data);
G_END_DECLS COGL_END_DECLS
#endif /* __COGL_WIN32_RENDERER_H__ */ #endif /* __COGL_WIN32_RENDERER_H__ */

5
cogl/cogl-xlib-renderer.h
View File

@ -29,12 +29,11 @@
#define __COGL_XLIB_RENDERER_H__ #define __COGL_XLIB_RENDERER_H__
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <glib.h>
#define __COGL_H_INSIDE__ #define __COGL_H_INSIDE__
#include <cogl/cogl-renderer.h> #include <cogl/cogl-renderer.h>
G_BEGIN_DECLS COGL_BEGIN_DECLS
/* /*
* cogl_xlib_renderer_handle_event: * cogl_xlib_renderer_handle_event:
@ -140,6 +139,6 @@ cogl_xlib_renderer_set_event_retrieval_enabled (CoglRenderer *renderer,
Display * Display *
cogl_xlib_renderer_get_display (CoglRenderer *renderer); cogl_xlib_renderer_get_display (CoglRenderer *renderer);
G_END_DECLS COGL_END_DECLS
#endif /* __COGL_XLIB_RENDERER_H__ */ #endif /* __COGL_XLIB_RENDERER_H__ */

6
cogl/cogl-xlib.h
View File

@ -24,16 +24,16 @@
#ifndef __COGL_XLIB_H__ #ifndef __COGL_XLIB_H__
#define __COGL_XLIB_H__ #define __COGL_XLIB_H__
#include <glib.h>
#include <X11/Xlib.h> #include <X11/Xlib.h>
#define __COGL_XLIB_H_INSIDE__ #define __COGL_XLIB_H_INSIDE__
#define __COGL_H_INSIDE__
#include <cogl/cogl-types.h>
#include <cogl/cogl-clutter-xlib.h> #include <cogl/cogl-clutter-xlib.h>
#include <cogl/cogl-xlib-renderer.h> #include <cogl/cogl-xlib-renderer.h>
G_BEGIN_DECLS COGL_BEGIN_DECLS
/* /*
* cogl_xlib_get_display: * cogl_xlib_get_display:

2
cogl/cogl.h
View File

@ -25,8 +25,6 @@
#ifndef __COGL_H__ #ifndef __COGL_H__
#define __COGL_H__ #define __COGL_H__
#include <glib.h>
#define __COGL_H_INSIDE__ #define __COGL_H_INSIDE__
#ifdef COGL_ENABLE_EXPERIMENTAL_2_0_API #ifdef COGL_ENABLE_EXPERIMENTAL_2_0_API

10
cogl/cogl1-context.h
View File

@ -31,13 +31,11 @@
#ifndef __COGL_1_CONTEXT_H__ #ifndef __COGL_1_CONTEXT_H__
#define __COGL_1_CONTEXT_H__ #define __COGL_1_CONTEXT_H__
#include <glib.h>
#include <cogl/cogl-types.h> #include <cogl/cogl-types.h>
#include <cogl/cogl-texture.h> #include <cogl/cogl-texture.h>
#include <cogl/cogl-framebuffer.h> #include <cogl/cogl-framebuffer.h>
G_BEGIN_DECLS COGL_BEGIN_DECLS
/** /**
* cogl_get_option_group: * cogl_get_option_group:
@ -1005,7 +1003,7 @@ cogl_set_draw_buffer (CoglBufferTarget target,
* Deprecated: 1.2: The draw buffer API was replaced with a framebuffer API * Deprecated: 1.2: The draw buffer API was replaced with a framebuffer API
*/ */
void void
cogl_push_draw_buffer (void) G_GNUC_DEPRECATED; cogl_push_draw_buffer (void) COGL_GNUC_DEPRECATED;
/** /**
* cogl_pop_draw_buffer: * cogl_pop_draw_buffer:
@ -1015,7 +1013,7 @@ cogl_push_draw_buffer (void) G_GNUC_DEPRECATED;
* Deprecated: 1.2: The draw buffer API was replaced with a framebuffer API * Deprecated: 1.2: The draw buffer API was replaced with a framebuffer API
*/ */
void void
cogl_pop_draw_buffer (void) G_GNUC_DEPRECATED; cogl_pop_draw_buffer (void) COGL_GNUC_DEPRECATED;
#endif /* COGL_DISABLE_DEPRECATED */ #endif /* COGL_DISABLE_DEPRECATED */
@ -1166,6 +1164,6 @@ cogl_begin_gl (void);
void void
cogl_end_gl (void); cogl_end_gl (void);
G_END_DECLS COGL_END_DECLS
#endif /* __COGL_1_CONTEXT_H__ */ #endif /* __COGL_1_CONTEXT_H__ */

4
cogl/cogl2-compatibility.h
View File

@ -31,7 +31,7 @@
#include <cogl/cogl-types.h> #include <cogl/cogl-types.h>
#include <cogl/cogl2-path.h> #include <cogl/cogl2-path.h>
G_BEGIN_DECLS COGL_BEGIN_DECLS
#define cogl_clip_push_from_path cogl2_clip_push_from_path #define cogl_clip_push_from_path cogl2_clip_push_from_path
/** /**
@ -49,7 +49,7 @@ G_BEGIN_DECLS
void void
cogl_clip_push_from_path (CoglPath *path); cogl_clip_push_from_path (CoglPath *path);
G_END_DECLS COGL_END_DECLS
#endif /* __COGL2_COMPATIBILITY_H__ */ #endif /* __COGL2_COMPATIBILITY_H__ */

4
cogl/cogl2-path.h
View File

@ -30,7 +30,7 @@
#include <cogl/cogl-types.h> #include <cogl/cogl-types.h>
G_BEGIN_DECLS COGL_BEGIN_DECLS
/** /**
* SECTION:cogl-paths * SECTION:cogl-paths
@ -500,7 +500,7 @@ cogl_path_fill (CoglPath *path);
void void
cogl_path_stroke (CoglPath *path); cogl_path_stroke (CoglPath *path);
G_END_DECLS COGL_END_DECLS
#endif /* __COGL2_PATH_H__ */ #endif /* __COGL2_PATH_H__ */

6
cogl/winsys/cogl-texture-pixmap-x11.h
View File

@ -26,11 +26,9 @@
#define __COGL_H_INSIDE__ #define __COGL_H_INSIDE__
#include <glib.h>
#include <cogl/cogl-context.h> #include <cogl/cogl-context.h>
G_BEGIN_DECLS COGL_BEGIN_DECLS
#ifdef COGL_ENABLE_EXPERIMENTAL_API #ifdef COGL_ENABLE_EXPERIMENTAL_API
@ -187,6 +185,6 @@ cogl_is_texture_pixmap_x11 (void *object);
#endif /* COGL_ENABLE_EXPERIMENTAL_API */ #endif /* COGL_ENABLE_EXPERIMENTAL_API */
G_END_DECLS COGL_END_DECLS
#endif /* __COGL_TEXTURE_PIXMAP_X11_H */ #endif /* __COGL_TEXTURE_PIXMAP_X11_H */

3
configure.ac
View File

@ -401,8 +401,11 @@ AS_IF([test "x$enable_glib" = "xyes"],
[ [
AS_GLIBCONFIG([deps/glib]) AS_GLIBCONFIG([deps/glib])
COGL_EXTRA_CFLAGS="$COGL_EXTRA_CFLAGS -I\$(top_srcdir)/deps" COGL_EXTRA_CFLAGS="$COGL_EXTRA_CFLAGS -I\$(top_srcdir)/deps"
COGL_EXTRA_CFLAGS="$COGL_EXTRA_CFLAGS -I\$(top_builddir)/deps"
COGL_EXTRA_CFLAGS="$COGL_EXTRA_CFLAGS -I\$(top_srcdir)/deps/glib" COGL_EXTRA_CFLAGS="$COGL_EXTRA_CFLAGS -I\$(top_srcdir)/deps/glib"
COGL_EXTRA_CFLAGS="$COGL_EXTRA_CFLAGS -I\$(top_builddir)/deps/glib"
COGL_EXTRA_CFLAGS="$COGL_EXTRA_CFLAGS -I\$(top_srcdir)/deps/gmodule" COGL_EXTRA_CFLAGS="$COGL_EXTRA_CFLAGS -I\$(top_srcdir)/deps/gmodule"
COGL_EXTRA_CFLAGS="$COGL_EXTRA_CFLAGS -I\$(top_builddir)/deps/gmodule"
EXPERIMENTAL_CONFIG=yes EXPERIMENTAL_CONFIG=yes
EXPERIMENTAL_OPTIONS="$EXPERIMENTAL_OPTIONS --disable-glib," EXPERIMENTAL_OPTIONS="$EXPERIMENTAL_OPTIONS --disable-glib,"
enable_nls=no enable_nls=no

2
tests/conform/test-utils.h
View File

@ -1,6 +1,8 @@
#ifndef _TEST_UTILS_H_ #ifndef _TEST_UTILS_H_
#define _TEST_UTILS_H_ #define _TEST_UTILS_H_
#include <glib.h>
/* We don't really care about functions that are defined without a /* We don't really care about functions that are defined without a
header for the unit tests so we can just disable it here */ header for the unit tests so we can just disable it here */
#ifdef __GNUC__ #ifdef __GNUC__