sungmg/mutter-performance-source
1
0
Fork 0
Code Activity

cogl: use G_BEGIN_DECLS instead of COGL_BEGIN_DECLS

Browse source 
This macro was introduced so as to be able to be built without GLib.
However, this feature was long ago removed, and in Mutter we depend on
it anyway, so let's get rid of it in favor of more consistency.
This commit is contained in:
Niels De Graef 2018-11-23 08:42:05 +01:00
parent 0a178a01b3
commit 3a4a858ce3
71 changed files with 142 additions and 151 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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

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

@ -34,7 +34,7 @@
#include "cogl/cogl-texture.h" #include "cogl/cogl-texture.h"
COGL_BEGIN_DECLS G_BEGIN_DECLS
typedef struct _CoglPangoGlyphCache CoglPangoGlyphCache; typedef struct _CoglPangoGlyphCache CoglPangoGlyphCache;
typedef struct _CoglPangoGlyphCacheValue CoglPangoGlyphCacheValue; typedef struct _CoglPangoGlyphCacheValue CoglPangoGlyphCacheValue;
@ -95,6 +95,6 @@ void
_cogl_pango_glyph_cache_set_dirty_glyphs (CoglPangoGlyphCache *cache, _cogl_pango_glyph_cache_set_dirty_glyphs (CoglPangoGlyphCache *cache,
CoglPangoGlyphCacheDirtyFunc func); CoglPangoGlyphCacheDirtyFunc func);
COGL_END_DECLS G_END_DECLS
#endif /* __COGL_PANGO_GLYPH_CACHE_H__ */ #endif /* __COGL_PANGO_GLYPH_CACHE_H__ */

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

@ -38,7 +38,7 @@
#include "cogl/cogl-context-private.h" #include "cogl/cogl-context-private.h"
COGL_BEGIN_DECLS G_BEGIN_DECLS
typedef struct _CoglPangoPipelineCache typedef struct _CoglPangoPipelineCache
{ {
@ -67,6 +67,6 @@ _cogl_pango_pipeline_cache_get (CoglPangoPipelineCache *cache,
void void
_cogl_pango_pipeline_cache_free (CoglPangoPipelineCache *cache); _cogl_pango_pipeline_cache_free (CoglPangoPipelineCache *cache);
COGL_END_DECLS G_END_DECLS
#endif /* __COGL_PANGO_PIPELINE_CACHE_H__ */ #endif /* __COGL_PANGO_PIPELINE_CACHE_H__ */

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

@ -38,7 +38,7 @@
#include "cogl-pango.h" #include "cogl-pango.h"
COGL_BEGIN_DECLS G_BEGIN_DECLS
PangoRenderer * PangoRenderer *
_cogl_pango_renderer_new (CoglContext *context); _cogl_pango_renderer_new (CoglContext *context);
@ -60,6 +60,6 @@ _cogl_pango_font_map_get_cogl_context (CoglPangoFontMap *fm);
PangoRenderer * PangoRenderer *
_cogl_pango_font_map_get_renderer (CoglPangoFontMap *fm); _cogl_pango_font_map_get_renderer (CoglPangoFontMap *fm);
COGL_END_DECLS G_END_DECLS
#endif /* __COGL_PANGO_PRIVATE_H__ */ #endif /* __COGL_PANGO_PRIVATE_H__ */

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

@ -54,7 +54,7 @@
#include "cogl/cogl-macros.h" #include "cogl/cogl-macros.h"
#endif #endif
COGL_BEGIN_DECLS G_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
@ -294,6 +294,6 @@ cogl_pango_render_layout_line (PangoLayoutLine *line,
int y, int y,
const CoglColor *color); const CoglColor *color);
COGL_END_DECLS G_END_DECLS
#endif /* __COGL_PANGO_H__ */ #endif /* __COGL_PANGO_H__ */

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

@ -43,7 +43,7 @@
#endif #endif
#include <glib-object.h> #include <glib-object.h>
COGL_BEGIN_DECLS G_BEGIN_DECLS
/** /**
* cogl_path_get_gtype: * cogl_path_get_gtype:
@ -535,7 +535,7 @@ COGL_DEPRECATED_FOR (cogl_framebuffer_push_path_clip)
void void
cogl_clip_push_from_path (CoglPath *path); cogl_clip_push_from_path (CoglPath *path);
COGL_END_DECLS G_END_DECLS
#endif /* __COGL_PATH_FUNCTIONS_H__ */ #endif /* __COGL_PATH_FUNCTIONS_H__ */

4
cogl/cogl-path/cogl-path-types.h
View file

@ -37,7 +37,7 @@
#include <cogl/cogl-types.h> #include <cogl/cogl-types.h>
COGL_BEGIN_DECLS G_BEGIN_DECLS
typedef struct _CoglPath CoglPath; typedef struct _CoglPath CoglPath;
@ -80,6 +80,6 @@ typedef enum {
COGL_PATH_FILL_RULE_EVEN_ODD COGL_PATH_FILL_RULE_EVEN_ODD
} CoglPathFillRule; } CoglPathFillRule;
COGL_END_DECLS G_END_DECLS
#endif /* __COGL_PATH_TYPES_H__ */ #endif /* __COGL_PATH_TYPES_H__ */

4
cogl/cogl/cogl-atlas-texture.h
View file

@ -39,7 +39,7 @@
#include <glib-object.h> #include <glib-object.h>
COGL_BEGIN_DECLS G_BEGIN_DECLS
/** /**
* SECTION:cogl-atlas-texture * SECTION:cogl-atlas-texture
@ -249,6 +249,6 @@ cogl_atlas_texture_new_from_bitmap (CoglBitmap *bmp);
CoglBool CoglBool
cogl_is_atlas_texture (void *object); cogl_is_atlas_texture (void *object);
COGL_END_DECLS G_END_DECLS
#endif /* _COGL_ATLAS_TEXTURE_H_ */ #endif /* _COGL_ATLAS_TEXTURE_H_ */

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

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

4
cogl/cogl/cogl-attribute.h
View file

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

4
cogl/cogl/cogl-bitmap.h
View file

@ -46,7 +46,7 @@ typedef struct _CoglBitmap CoglBitmap;
#include <glib-object.h> #include <glib-object.h>
COGL_BEGIN_DECLS G_BEGIN_DECLS
/** /**
* cogl_bitmap_get_gtype: * cogl_bitmap_get_gtype:
@ -297,6 +297,6 @@ typedef enum {
uint32_t cogl_bitmap_error_quark (void); uint32_t cogl_bitmap_error_quark (void);
COGL_END_DECLS G_END_DECLS
#endif /* __COGL_BITMAP_H__ */ #endif /* __COGL_BITMAP_H__ */

4
cogl/cogl/cogl-bitmask.h
View file

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

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

@ -42,7 +42,7 @@
#include "cogl-context.h" #include "cogl-context.h"
#include "cogl-gl-header.h" #include "cogl-gl-header.h"
COGL_BEGIN_DECLS G_BEGIN_DECLS
typedef struct _CoglBufferVtable CoglBufferVtable; typedef struct _CoglBufferVtable CoglBufferVtable;
@ -175,6 +175,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);
COGL_END_DECLS G_END_DECLS
#endif /* __COGL_BUFFER_PRIVATE_H__ */ #endif /* __COGL_BUFFER_PRIVATE_H__ */

4
cogl/cogl/cogl-buffer.h
View file

@ -42,7 +42,7 @@
#include <cogl/cogl-types.h> #include <cogl/cogl-types.h>
#include <cogl/cogl-error.h> #include <cogl/cogl-error.h>
COGL_BEGIN_DECLS G_BEGIN_DECLS
/** /**
* SECTION:cogl-buffer * SECTION:cogl-buffer
@ -320,6 +320,6 @@ cogl_buffer_set_data (CoglBuffer *buffer,
const void *data, const void *data,
size_t size); size_t size);
COGL_END_DECLS G_END_DECLS
#endif /* __COGL_BUFFER_H__ */ #endif /* __COGL_BUFFER_H__ */

4
cogl/cogl/cogl-color.h
View file

@ -50,7 +50,7 @@
#include <glib-object.h> #include <glib-object.h>
COGL_BEGIN_DECLS G_BEGIN_DECLS
/** /**
* cogl_color_get_gtype: * cogl_color_get_gtype:
@ -595,6 +595,6 @@ cogl_color_init_from_hsl (CoglColor *color,
float saturation, float saturation,
float luminance); float luminance);
COGL_END_DECLS G_END_DECLS
#endif /* __COGL_COLOR_H__ */ #endif /* __COGL_COLOR_H__ */

4
cogl/cogl/cogl-context.h
View file

@ -48,7 +48,7 @@ typedef struct _CoglContext CoglContext;
#include <glib-object.h> #include <glib-object.h>
COGL_BEGIN_DECLS G_BEGIN_DECLS
/** /**
* SECTION:cogl-context * SECTION:cogl-context
@ -404,7 +404,7 @@ typedef enum _CoglGraphicsResetStatus
CoglGraphicsResetStatus CoglGraphicsResetStatus
cogl_get_graphics_reset_status (CoglContext *context); cogl_get_graphics_reset_status (CoglContext *context);
COGL_END_DECLS G_END_DECLS
#endif /* __COGL_CONTEXT_H__ */ #endif /* __COGL_CONTEXT_H__ */

4
cogl/cogl/cogl-debug.h
View file

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

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

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

4
cogl/cogl/cogl-display.h
View file

@ -42,7 +42,7 @@
#include <glib-object.h> #include <glib-object.h>
COGL_BEGIN_DECLS G_BEGIN_DECLS
/** /**
* SECTION:cogl-display * SECTION:cogl-display
@ -204,7 +204,7 @@ cogl_display_setup (CoglDisplay *display,
CoglBool CoglBool
cogl_is_display (void *object); cogl_is_display (void *object);
COGL_END_DECLS G_END_DECLS
#endif /* __COGL_DISPLAY_H__ */ #endif /* __COGL_DISPLAY_H__ */

4
cogl/cogl/cogl-egl.h
View file

@ -58,7 +58,7 @@
#include <cogl/cogl-egl-defines.h> #include <cogl/cogl-egl-defines.h>
#include <cogl/cogl-types.h> #include <cogl/cogl-types.h>
COGL_BEGIN_DECLS G_BEGIN_DECLS
/** /**
* cogl_egl_context_get_egl_display: * cogl_egl_context_get_egl_display:
@ -99,7 +99,7 @@ EGLContext
cogl_egl_context_get_egl_context (CoglContext *context); cogl_egl_context_get_egl_context (CoglContext *context);
COGL_END_DECLS G_END_DECLS
/* The gobject introspection scanner seems to parse public headers in /* The gobject introspection scanner seems to parse public headers in
* isolation which means we need to be extra careful about how we * isolation which means we need to be extra careful about how we

4
cogl/cogl/cogl-error.h
View file

@ -35,7 +35,7 @@
#include "cogl-types.h" #include "cogl-types.h"
COGL_BEGIN_DECLS G_BEGIN_DECLS
/** /**
* SECTION:cogl-error * SECTION:cogl-error
@ -164,6 +164,6 @@ cogl_error_matches (CoglError *error,
*/ */
#define COGL_GLIB_ERROR(COGL_ERROR) ((CoglError *)COGL_ERROR) #define COGL_GLIB_ERROR(COGL_ERROR) ((CoglError *)COGL_ERROR)
COGL_END_DECLS G_END_DECLS
#endif /* __COGL_ERROR_H__ */ #endif /* __COGL_ERROR_H__ */

4
cogl/cogl/cogl-euler.h
View file

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

4
cogl/cogl/cogl-flags.h
View file

@ -36,7 +36,7 @@
#include "cogl-util.h" #include "cogl-util.h"
COGL_BEGIN_DECLS G_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
@ -124,7 +124,7 @@ COGL_BEGIN_DECLS
#define COGL_FLAGS_FOREACH_END \ #define COGL_FLAGS_FOREACH_END \
} } } G_STMT_END } } } G_STMT_END
COGL_END_DECLS G_END_DECLS
#endif /* __COGL_FLAGS_H */ #endif /* __COGL_FLAGS_H */

4
cogl/cogl/cogl-framebuffer.h
View file

@ -56,7 +56,7 @@ typedef struct _CoglFramebuffer CoglFramebuffer;
#include <cogl/cogl-texture.h> #include <cogl/cogl-texture.h>
#include <glib-object.h> #include <glib-object.h>
COGL_BEGIN_DECLS G_BEGIN_DECLS
/** /**
* SECTION:cogl-framebuffer * SECTION:cogl-framebuffer
@ -1845,6 +1845,6 @@ typedef enum { /*< prefix=COGL_FRAMEBUFFER_ERROR >*/
CoglBool CoglBool
cogl_is_framebuffer (void *object); cogl_is_framebuffer (void *object);
COGL_END_DECLS G_END_DECLS
#endif /* __COGL_FRAMEBUFFER_H */ #endif /* __COGL_FRAMEBUFFER_H */

4
cogl/cogl/cogl-gles2.h
View file

@ -71,7 +71,7 @@
#include <cogl/cogl-gles2-types.h> #include <cogl/cogl-gles2-types.h>
#endif #endif
COGL_BEGIN_DECLS G_BEGIN_DECLS
/** /**
* SECTION:cogl-gles2 * SECTION:cogl-gles2
@ -397,7 +397,7 @@ cogl_gles2_texture_get_handle (CoglTexture *texture,
CoglBool CoglBool
cogl_is_gles2_context (void *object); cogl_is_gles2_context (void *object);
COGL_END_DECLS G_END_DECLS
/* The gobject introspection scanner seems to parse public headers in /* The gobject introspection scanner seems to parse public headers in
* isolation which means we need to be extra careful about how we * isolation which means we need to be extra careful about how we

4
cogl/cogl/cogl-glx.h
View file

@ -58,7 +58,7 @@
#include <GL/glx.h> #include <GL/glx.h>
#include <cogl/cogl-types.h> #include <cogl/cogl-types.h>
COGL_BEGIN_DECLS G_BEGIN_DECLS
/** /**
* cogl_glx_context_get_glx_context: * cogl_glx_context_get_glx_context:
@ -76,7 +76,7 @@ COGL_BEGIN_DECLS
GLXContext GLXContext
cogl_glx_context_get_glx_context (CoglContext *context); cogl_glx_context_get_glx_context (CoglContext *context);
COGL_END_DECLS G_END_DECLS
/* The gobject introspection scanner seems to parse public headers in /* The gobject introspection scanner seems to parse public headers in
* isolation which means we need to be extra careful about how we * isolation which means we need to be extra careful about how we

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

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

4
cogl/cogl/cogl-indices.h
View file

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

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

@ -36,7 +36,7 @@
#include <glib.h> #include <glib.h>
COGL_BEGIN_DECLS G_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))) \
@ -52,7 +52,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);
COGL_END_DECLS G_END_DECLS
#endif /* __COGL_MATRIX_PRIVATE_H */ #endif /* __COGL_MATRIX_PRIVATE_H */

4
cogl/cogl/cogl-matrix.h
View file

@ -44,7 +44,7 @@
#include <cogl/cogl-quaternion.h> #include <cogl/cogl-quaternion.h>
#include <glib-object.h> #include <glib-object.h>
COGL_BEGIN_DECLS G_BEGIN_DECLS
/** /**
* SECTION:cogl-matrix * SECTION:cogl-matrix
@ -794,6 +794,6 @@ GType cogl_matrix_get_gtype (void);
GType GType
cogl_gtype_matrix_get_type (void); cogl_gtype_matrix_get_type (void);
COGL_END_DECLS G_END_DECLS
#endif /* __COGL_MATRIX_H */ #endif /* __COGL_MATRIX_H */

4
cogl/cogl/cogl-meta-texture.h
View file

@ -37,7 +37,7 @@
#include <cogl/cogl-pipeline-layer-state.h> #include <cogl/cogl-pipeline-layer-state.h>
COGL_BEGIN_DECLS G_BEGIN_DECLS
/** /**
* SECTION:cogl-meta-texture * SECTION:cogl-meta-texture
@ -190,6 +190,6 @@ cogl_meta_texture_foreach_in_region (CoglMetaTexture *meta_texture,
CoglMetaTextureCallback callback, CoglMetaTextureCallback callback,
void *user_data); void *user_data);
COGL_END_DECLS G_END_DECLS
#endif /* __COGL_META_TEXTURE_H__ */ #endif /* __COGL_META_TEXTURE_H__ */

4
cogl/cogl/cogl-object.h
View file

@ -35,7 +35,7 @@
#include <glib-object.h> #include <glib-object.h>
COGL_BEGIN_DECLS G_BEGIN_DECLS
typedef struct _CoglObject CoglObject; typedef struct _CoglObject CoglObject;
@ -244,7 +244,7 @@ cogl_debug_object_foreach_type (CoglDebugObjectForeachTypeCallback func,
void void
cogl_debug_object_print_instances (void); cogl_debug_object_print_instances (void);
COGL_END_DECLS G_END_DECLS
#endif /* __COGL_OBJECT_H */ #endif /* __COGL_OBJECT_H */

4
cogl/cogl/cogl-offscreen.h
View file

@ -40,7 +40,7 @@
#include <glib-object.h> #include <glib-object.h>
COGL_BEGIN_DECLS G_BEGIN_DECLS
/** /**
* SECTION:cogl-offscreen * SECTION:cogl-offscreen
@ -169,6 +169,6 @@ cogl_offscreen_unref (void *offscreen);
CoglTexture * CoglTexture *
cogl_offscreen_get_texture (CoglOffscreen *offscreen); cogl_offscreen_get_texture (CoglOffscreen *offscreen);
COGL_END_DECLS G_END_DECLS
#endif /* __COGL_OFFSCREEN_H__ */ #endif /* __COGL_OFFSCREEN_H__ */

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

@ -41,7 +41,7 @@
#include <glib-object.h> #include <glib-object.h>
COGL_BEGIN_DECLS G_BEGIN_DECLS
typedef struct _CoglOnscreenTemplate CoglOnscreenTemplate; typedef struct _CoglOnscreenTemplate CoglOnscreenTemplate;
@ -134,6 +134,6 @@ cogl_onscreen_template_set_stereo_enabled (
CoglBool CoglBool
cogl_is_onscreen_template (void *object); cogl_is_onscreen_template (void *object);
COGL_END_DECLS G_END_DECLS
#endif /* __COGL_ONSCREEN_TEMPLATE_H__ */ #endif /* __COGL_ONSCREEN_TEMPLATE_H__ */

4
cogl/cogl/cogl-onscreen.h
View file

@ -45,7 +45,7 @@
#include <glib-object.h> #include <glib-object.h>
COGL_BEGIN_DECLS G_BEGIN_DECLS
typedef struct _CoglOnscreen CoglOnscreen; typedef struct _CoglOnscreen CoglOnscreen;
#define COGL_ONSCREEN(X) ((CoglOnscreen *)(X)) #define COGL_ONSCREEN(X) ((CoglOnscreen *)(X))
@ -896,6 +896,6 @@ cogl_is_onscreen (void *object);
int64_t int64_t
cogl_onscreen_get_frame_counter (CoglOnscreen *onscreen); cogl_onscreen_get_frame_counter (CoglOnscreen *onscreen);
COGL_END_DECLS G_END_DECLS
#endif /* __COGL_ONSCREEN_H */ #endif /* __COGL_ONSCREEN_H */

4
cogl/cogl/cogl-output.h
View file

@ -41,7 +41,7 @@
#include <glib-object.h> #include <glib-object.h>
COGL_BEGIN_DECLS G_BEGIN_DECLS
/** /**
* SECTION:cogl-output * SECTION:cogl-output
@ -249,7 +249,7 @@ cogl_output_get_subpixel_order (CoglOutput *output);
float float
cogl_output_get_refresh_rate (CoglOutput *output); cogl_output_get_refresh_rate (CoglOutput *output);
COGL_END_DECLS G_END_DECLS
#endif /* __COGL_OUTPUT_H */ #endif /* __COGL_OUTPUT_H */

4
cogl/cogl/cogl-pipeline-layer-state.h
View file

@ -40,7 +40,7 @@
#include <cogl/cogl-matrix.h> #include <cogl/cogl-matrix.h>
#include <cogl/cogl-texture.h> #include <cogl/cogl-texture.h>
COGL_BEGIN_DECLS G_BEGIN_DECLS
/** /**
* CoglPipelineFilter: * CoglPipelineFilter:
@ -611,6 +611,6 @@ cogl_pipeline_add_layer_snippet (CoglPipeline *pipeline,
int layer, int layer,
CoglSnippet *snippet); CoglSnippet *snippet);
COGL_END_DECLS G_END_DECLS
#endif /* __COGL_PIPELINE_LAYER_STATE_H__ */ #endif /* __COGL_PIPELINE_LAYER_STATE_H__ */

4
cogl/cogl/cogl-pipeline-state.h
View file

@ -39,7 +39,7 @@
#include <cogl/cogl-color.h> #include <cogl/cogl-color.h>
#include <cogl/cogl-depth-state.h> #include <cogl/cogl-depth-state.h>
COGL_BEGIN_DECLS G_BEGIN_DECLS
/** /**
* cogl_pipeline_set_color: * cogl_pipeline_set_color:
@ -971,6 +971,6 @@ void
cogl_pipeline_add_snippet (CoglPipeline *pipeline, cogl_pipeline_add_snippet (CoglPipeline *pipeline,
CoglSnippet *snippet); CoglSnippet *snippet);
COGL_END_DECLS G_END_DECLS
#endif /* __COGL_PIPELINE_STATE_H__ */ #endif /* __COGL_PIPELINE_STATE_H__ */

4
cogl/cogl/cogl-pipeline.h
View file

@ -46,7 +46,7 @@ typedef struct _CoglPipeline CoglPipeline;
#include <glib-object.h> #include <glib-object.h>
COGL_BEGIN_DECLS G_BEGIN_DECLS
/** /**
* SECTION:cogl-pipeline * SECTION:cogl-pipeline
@ -180,6 +180,6 @@ int
cogl_pipeline_get_uniform_location (CoglPipeline *pipeline, cogl_pipeline_get_uniform_location (CoglPipeline *pipeline,
const char *uniform_name); const char *uniform_name);
COGL_END_DECLS G_END_DECLS
#endif /* __COGL_PIPELINE_H__ */ #endif /* __COGL_PIPELINE_H__ */

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

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

4
cogl/cogl/cogl-pixel-buffer.h
View file

@ -48,7 +48,7 @@ typedef struct _CoglPixelBuffer CoglPixelBuffer;
#include <glib-object.h> #include <glib-object.h>
COGL_BEGIN_DECLS G_BEGIN_DECLS
#define COGL_PIXEL_BUFFER(buffer) ((CoglPixelBuffer *)(buffer)) #define COGL_PIXEL_BUFFER(buffer) ((CoglPixelBuffer *)(buffer))
@ -133,6 +133,6 @@ cogl_pixel_buffer_set_region (CoglPixelBuffer *buffer,
unsigned int dst_y); unsigned int dst_y);
#endif #endif
COGL_END_DECLS G_END_DECLS
#endif /* __COGL_PIXEL_BUFFER_H__ */ #endif /* __COGL_PIXEL_BUFFER_H__ */

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

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

4
cogl/cogl/cogl-poll.h
View file

@ -40,7 +40,7 @@
#include <cogl/cogl-defines.h> #include <cogl/cogl-defines.h>
#include <cogl/cogl-context.h> #include <cogl/cogl-context.h>
COGL_BEGIN_DECLS G_BEGIN_DECLS
/** /**
* SECTION:cogl-poll * SECTION:cogl-poll
@ -190,6 +190,6 @@ cogl_poll_renderer_dispatch (CoglRenderer *renderer,
const CoglPollFD *poll_fds, const CoglPollFD *poll_fds,
int n_poll_fds); int n_poll_fds);
COGL_END_DECLS G_END_DECLS
#endif /* __COGL_POLL_H__ */ #endif /* __COGL_POLL_H__ */

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

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

4
cogl/cogl/cogl-primitive.h
View file

@ -49,7 +49,7 @@ typedef struct _CoglPrimitive CoglPrimitive;
#include <glib-object.h> #include <glib-object.h>
COGL_BEGIN_DECLS G_BEGIN_DECLS
/** /**
* SECTION:cogl-primitive * SECTION:cogl-primitive
@ -938,7 +938,7 @@ cogl_primitive_draw (CoglPrimitive *primitive,
CoglPipeline *pipeline); CoglPipeline *pipeline);
COGL_END_DECLS G_END_DECLS
#endif /* __COGL_PRIMITIVE_H__ */ #endif /* __COGL_PRIMITIVE_H__ */

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

@ -33,7 +33,7 @@
#include <glib.h> #include <glib.h>
COGL_BEGIN_DECLS G_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
@ -62,6 +62,6 @@ _cogl_framebuffer_draw_multitextured_rectangles (
int n_rects, int n_rects,
CoglBool disable_legacy_state); CoglBool disable_legacy_state);
COGL_END_DECLS G_END_DECLS
#endif /* __COGL_PRIMITIVES_PRIVATE_H */ #endif /* __COGL_PRIMITIVES_PRIVATE_H */

4
cogl/cogl/cogl-primitives.h
View file

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

4
cogl/cogl/cogl-private.h
View file

@ -36,7 +36,7 @@
#include "cogl-context.h" #include "cogl-context.h"
#include "cogl-flags.h" #include "cogl-flags.h"
COGL_BEGIN_DECLS G_BEGIN_DECLS
typedef enum typedef enum
{ {
@ -167,6 +167,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)
COGL_END_DECLS G_END_DECLS
#endif /* __COGL_PRIVATE_H__ */ #endif /* __COGL_PRIVATE_H__ */

4
cogl/cogl/cogl-quaternion.h
View file

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

4
cogl/cogl/cogl-renderer.h
View file

@ -40,7 +40,7 @@
#include <glib-object.h> #include <glib-object.h>
COGL_BEGIN_DECLS G_BEGIN_DECLS
/** /**
* SECTION:cogl-renderer * SECTION:cogl-renderer
@ -418,7 +418,7 @@ cogl_renderer_foreach_output (CoglRenderer *renderer,
CoglOutputCallback callback, CoglOutputCallback callback,
void *user_data); void *user_data);
COGL_END_DECLS G_END_DECLS
#endif /* __COGL_RENDERER_H__ */ #endif /* __COGL_RENDERER_H__ */

4
cogl/cogl/cogl-snippet.h
View file

@ -38,7 +38,7 @@
#ifndef __COGL_SNIPPET_H__ #ifndef __COGL_SNIPPET_H__
#define __COGL_SNIPPET_H__ #define __COGL_SNIPPET_H__
COGL_BEGIN_DECLS G_BEGIN_DECLS
/** /**
* SECTION:cogl-snippet * SECTION:cogl-snippet
@ -859,6 +859,6 @@ cogl_snippet_set_post (CoglSnippet *snippet,
const char * const char *
cogl_snippet_get_post (CoglSnippet *snippet); cogl_snippet_get_post (CoglSnippet *snippet);
COGL_END_DECLS G_END_DECLS
#endif /* __COGL_SNIPPET_H__ */ #endif /* __COGL_SNIPPET_H__ */

4
cogl/cogl/cogl-sub-texture.h
View file

@ -36,7 +36,7 @@
#ifndef __COGL_SUB_TEXTURE_H #ifndef __COGL_SUB_TEXTURE_H
#define __COGL_SUB_TEXTURE_H #define __COGL_SUB_TEXTURE_H
COGL_BEGIN_DECLS G_BEGIN_DECLS
/** /**
* SECTION:cogl-sub-texture * SECTION:cogl-sub-texture
@ -129,6 +129,6 @@ cogl_sub_texture_get_parent (CoglSubTexture *sub_texture);
CoglBool CoglBool
cogl_is_sub_texture (void *object); cogl_is_sub_texture (void *object);
COGL_END_DECLS G_END_DECLS
#endif /* __COGL_SUB_TEXTURE_H */ #endif /* __COGL_SUB_TEXTURE_H */

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

@ -37,7 +37,7 @@
#include <glib-object.h> #include <glib-object.h>
COGL_BEGIN_DECLS G_BEGIN_DECLS
typedef struct _CoglSwapChain CoglSwapChain; typedef struct _CoglSwapChain CoglSwapChain;
@ -62,6 +62,6 @@ cogl_swap_chain_set_length (CoglSwapChain *swap_chain,
CoglBool CoglBool
cogl_is_swap_chain (void *object); cogl_is_swap_chain (void *object);
COGL_END_DECLS G_END_DECLS
#endif /* __COGL_SWAP_CHAIN_H__ */ #endif /* __COGL_SWAP_CHAIN_H__ */

4
cogl/cogl/cogl-texture-2d-gl.h
View file

@ -40,7 +40,7 @@
#include "cogl-context.h" #include "cogl-context.h"
#include "cogl-texture-2d.h" #include "cogl-texture-2d.h"
COGL_BEGIN_DECLS G_BEGIN_DECLS
/** /**
* cogl_texture_2d_gl_new_from_foreign: * cogl_texture_2d_gl_new_from_foreign:
@ -73,6 +73,6 @@ cogl_texture_2d_gl_new_from_foreign (CoglContext *ctx,
int height, int height,
CoglPixelFormat format); CoglPixelFormat format);
COGL_END_DECLS G_END_DECLS
#endif /* _COGL_TEXTURE_2D_GL_H_ */ #endif /* _COGL_TEXTURE_2D_GL_H_ */

4
cogl/cogl/cogl-texture-2d.h
View file

@ -44,7 +44,7 @@
#include "cogl-egl-defines.h" #include "cogl-egl-defines.h"
#endif #endif
COGL_BEGIN_DECLS G_BEGIN_DECLS
/** /**
* SECTION:cogl-texture-2d * SECTION:cogl-texture-2d
@ -265,6 +265,6 @@ cogl_texture_2d_egl_image_external_alloc_finish (CoglTexture2D *tex_2d,
GDestroyNotify destroy); GDestroyNotify destroy);
#endif #endif
COGL_END_DECLS G_END_DECLS
#endif /* __COGL_TEXTURE_2D_H */ #endif /* __COGL_TEXTURE_2D_H */

4
cogl/cogl/cogl-texture-3d.h
View file

@ -36,7 +36,7 @@
#ifndef __COGL_TEXTURE_3D_H #ifndef __COGL_TEXTURE_3D_H
#define __COGL_TEXTURE_3D_H #define __COGL_TEXTURE_3D_H
COGL_BEGIN_DECLS G_BEGIN_DECLS
/** /**
* SECTION:cogl-texture-3d * SECTION:cogl-texture-3d
@ -197,6 +197,6 @@ cogl_texture_3d_new_from_bitmap (CoglBitmap *bitmap,
CoglBool CoglBool
cogl_is_texture_3d (void *object); cogl_is_texture_3d (void *object);
COGL_END_DECLS G_END_DECLS
#endif /* __COGL_TEXTURE_3D_H */ #endif /* __COGL_TEXTURE_3D_H */

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

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

4
cogl/cogl/cogl-texture.h
View file

@ -57,7 +57,7 @@ typedef struct _CoglTexture CoglTexture;
#include <glib-object.h> #include <glib-object.h>
COGL_BEGIN_DECLS G_BEGIN_DECLS
/** /**
* SECTION:cogl-texture * SECTION:cogl-texture
@ -511,6 +511,6 @@ CoglBool
cogl_texture_allocate (CoglTexture *texture, cogl_texture_allocate (CoglTexture *texture,
CoglError **error); CoglError **error);
COGL_END_DECLS G_END_DECLS
#endif /* __COGL_TEXTURE_H__ */ #endif /* __COGL_TEXTURE_H__ */

13
cogl/cogl/cogl-types.h
View file

@ -43,16 +43,7 @@
#include <glib.h> #include <glib.h>
#include <glib-object.h> #include <glib-object.h>
/* Guard C code in headers, while including them from C++ */ G_BEGIN_DECLS
#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
/** /**
* SECTION:cogl-types * SECTION:cogl-types
@ -891,6 +882,6 @@ typedef enum {
COGL_STEREO_RIGHT COGL_STEREO_RIGHT
} CoglStereoMode; } CoglStereoMode;
COGL_END_DECLS G_END_DECLS
#endif /* __COGL_TYPES_H__ */ #endif /* __COGL_TYPES_H__ */

4
cogl/cogl/cogl-vector.h
View file

@ -36,7 +36,7 @@
#ifndef __COGL_VECTOR_H #ifndef __COGL_VECTOR_H
#define __COGL_VECTOR_H #define __COGL_VECTOR_H
COGL_BEGIN_DECLS G_BEGIN_DECLS
/** /**
* SECTION:cogl-vector * SECTION:cogl-vector
@ -350,7 +350,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);
COGL_END_DECLS G_END_DECLS
#endif /* __COGL_VECTOR_H */ #endif /* __COGL_VECTOR_H */

4
cogl/cogl/cogl-wayland-server.h
View file

@ -52,7 +52,7 @@
#include <cogl/cogl-context.h> #include <cogl/cogl-context.h>
#include <cogl/cogl-texture-2d.h> #include <cogl/cogl-texture-2d.h>
COGL_BEGIN_DECLS G_BEGIN_DECLS
/** /**
* cogl_wayland_display_set_compositor_display: * cogl_wayland_display_set_compositor_display:
@ -145,7 +145,7 @@ cogl_wayland_texture_set_region_from_shm_buffer (CoglTexture *texture,
int level, int level,
CoglError **error); CoglError **error);
COGL_END_DECLS G_END_DECLS
/* The gobject introspection scanner seems to parse public headers in /* The gobject introspection scanner seems to parse public headers in
* isolation which means we need to be extra careful about how we * isolation which means we need to be extra careful about how we

4
cogl/cogl/cogl-xlib-renderer.h
View file

@ -55,7 +55,7 @@
#include <cogl/cogl-renderer.h> #include <cogl/cogl-renderer.h>
COGL_BEGIN_DECLS G_BEGIN_DECLS
/** /**
* cogl_xlib_renderer_handle_event: (skip) * cogl_xlib_renderer_handle_event: (skip)
@ -250,7 +250,7 @@ cogl_xlib_renderer_get_visual_info (CoglRenderer *renderer);
void void
cogl_xlib_renderer_request_reset_on_video_memory_purge (CoglRenderer *renderer, cogl_xlib_renderer_request_reset_on_video_memory_purge (CoglRenderer *renderer,
CoglBool enable); CoglBool enable);
COGL_END_DECLS G_END_DECLS
/* The gobject introspection scanner seems to parse public headers in /* The gobject introspection scanner seems to parse public headers in
* isolation which means we need to be extra careful about how we * isolation which means we need to be extra careful about how we

4
cogl/cogl/cogl-xlib.h
View file

@ -59,7 +59,7 @@
#include <cogl/cogl-xlib-renderer.h> #include <cogl/cogl-xlib-renderer.h>
#include <cogl/cogl-macros.h> #include <cogl/cogl-macros.h>
COGL_BEGIN_DECLS G_BEGIN_DECLS
/* /*
* cogl_xlib_get_display: * cogl_xlib_get_display:
@ -112,7 +112,7 @@ COGL_DEPRECATED_FOR (cogl_xlib_renderer_handle_event)
CoglFilterReturn CoglFilterReturn
cogl_xlib_handle_event (XEvent *xevent); cogl_xlib_handle_event (XEvent *xevent);
COGL_END_DECLS G_END_DECLS
/* The gobject introspection scanner seems to parse public headers in /* The gobject introspection scanner seems to parse public headers in

4
cogl/cogl/cogl1-context.h
View file

@ -42,7 +42,7 @@
#include <cogl/cogl-framebuffer.h> #include <cogl/cogl-framebuffer.h>
#include <cogl/cogl-macros.h> #include <cogl/cogl-macros.h>
COGL_BEGIN_DECLS G_BEGIN_DECLS
/** /**
* cogl_get_option_group: * cogl_get_option_group:
@ -857,6 +857,6 @@ COGL_DEPRECATED_FOR (CoglGLES2Context_API)
void void
cogl_end_gl (void); cogl_end_gl (void);
COGL_END_DECLS G_END_DECLS
#endif /* __COGL_1_CONTEXT_H__ */ #endif /* __COGL_1_CONTEXT_H__ */

4
cogl/cogl/deprecated/cogl-auto-texture.h
View file

@ -31,7 +31,7 @@
#ifndef __COGL_AUTO_TEXTURE_H__ #ifndef __COGL_AUTO_TEXTURE_H__
#define __COGL_AUTO_TEXTURE_H__ #define __COGL_AUTO_TEXTURE_H__
COGL_BEGIN_DECLS G_BEGIN_DECLS
#include <cogl/cogl-texture.h> #include <cogl/cogl-texture.h>
@ -218,6 +218,6 @@ cogl_texture_new_from_sub_texture (CoglTexture *full_texture,
int sub_width, int sub_width,
int sub_height); int sub_height);
COGL_END_DECLS G_END_DECLS
#endif /* __COGL_AUTO_TEXTURE_H__ */ #endif /* __COGL_AUTO_TEXTURE_H__ */

4
cogl/cogl/deprecated/cogl-clutter-xlib.h
View file

@ -35,7 +35,7 @@
#include <X11/Xutil.h> #include <X11/Xutil.h>
COGL_BEGIN_DECLS G_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
@ -45,6 +45,6 @@ COGL_BEGIN_DECLS
XVisualInfo * XVisualInfo *
cogl_clutter_winsys_xlib_get_visual_info (void); cogl_clutter_winsys_xlib_get_visual_info (void);
COGL_END_DECLS G_END_DECLS
#endif /* __COGL_CLUTTER_XLIB_H__ */ #endif /* __COGL_CLUTTER_XLIB_H__ */

4
cogl/cogl/deprecated/cogl-clutter.h
View file

@ -33,7 +33,7 @@
#ifndef __COGL_CLUTTER_H__ #ifndef __COGL_CLUTTER_H__
#define __COGL_CLUTTER_H__ #define __COGL_CLUTTER_H__
COGL_BEGIN_DECLS G_BEGIN_DECLS
#define cogl_clutter_check_extension cogl_clutter_check_extension_CLUTTER #define cogl_clutter_check_extension cogl_clutter_check_extension_CLUTTER
COGL_DEPRECATED COGL_DEPRECATED
@ -49,6 +49,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);
COGL_END_DECLS G_END_DECLS
#endif /* __COGL_CLUTTER_H__ */ #endif /* __COGL_CLUTTER_H__ */

4
cogl/cogl/deprecated/cogl-framebuffer-deprecated.h
View file

@ -34,7 +34,7 @@
#include <cogl/cogl-framebuffer.h> #include <cogl/cogl-framebuffer.h>
#include <cogl/cogl-macros.h> #include <cogl/cogl-macros.h>
COGL_BEGIN_DECLS G_BEGIN_DECLS
/** /**
* cogl_set_framebuffer: (skip) * cogl_set_framebuffer: (skip)
@ -260,6 +260,6 @@ COGL_DEPRECATED
CoglPixelFormat CoglPixelFormat
cogl_framebuffer_get_color_format (CoglFramebuffer *framebuffer); cogl_framebuffer_get_color_format (CoglFramebuffer *framebuffer);
COGL_END_DECLS G_END_DECLS
#endif /* __COGL_FRAMEBUFFER_DEPRECATED_H__ */ #endif /* __COGL_FRAMEBUFFER_DEPRECATED_H__ */

4
cogl/cogl/deprecated/cogl-shader.h
View file

@ -39,7 +39,7 @@
#include <cogl/cogl-defines.h> #include <cogl/cogl-defines.h>
#include <cogl/cogl-macros.h> #include <cogl/cogl-macros.h>
COGL_BEGIN_DECLS G_BEGIN_DECLS
/** /**
* SECTION:cogl-shaders * SECTION:cogl-shaders
@ -698,6 +698,6 @@ cogl_program_uniform_matrix (int uniform_no,
CoglBool transpose, CoglBool transpose,
const float *value); const float *value);
COGL_END_DECLS G_END_DECLS
#endif /* __COGL_SHADER_H__ */ #endif /* __COGL_SHADER_H__ */

4
cogl/cogl/deprecated/cogl-vertex-buffer.h
View file

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

4
cogl/cogl/winsys/cogl-texture-pixmap-x11.h
View file

@ -52,7 +52,7 @@
#include <glib-object.h> #include <glib-object.h>
COGL_BEGIN_DECLS G_BEGIN_DECLS
/** /**
* SECTION:cogl-texture-pixmap-x11 * SECTION:cogl-texture-pixmap-x11
@ -268,7 +268,7 @@ cogl_texture_pixmap_x11_set_damage_object (CoglTexturePixmapX11 *texture,
CoglBool CoglBool
cogl_is_texture_pixmap_x11 (void *object); cogl_is_texture_pixmap_x11 (void *object);
COGL_END_DECLS G_END_DECLS
/* The gobject introspection scanner seems to parse public headers in /* The gobject introspection scanner seems to parse public headers in
* isolation which means we need to be extra careful about how we * isolation which means we need to be extra careful about how we