[mutter/wip/nielsdg/remove-coglbool: 90/90] cogl: Remove CoglBool, use gboolean instead
- From: Niels De Graef <nielsdg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter/wip/nielsdg/remove-coglbool: 90/90] cogl: Remove CoglBool, use gboolean instead
- Date: Fri, 15 Feb 2019 15:35:20 +0000 (UTC)
commit 65ddc86840dde2d0b24548558190ad338f61ba13
Author: Niels De Graef <nielsdegraef gmail com>
Date: Sat Nov 24 13:04:47 2018 +0100
cogl: Remove CoglBool, use gboolean instead
This basically reverts commit 54735dec, which tried to avoid the
GLib-defined types in favor the standard C ones. One exception to this
is the bool type, for which the commit introduces a new type CoglBool.
Let's just get rid of this type in favor of having consistency with the
GLib types. Note by the way that neither CoglBool nor gboolean (which
has a size of `int`) are completely compatible with bool (size `char`).
https://gitlab.gnome.org/GNOME/mutter/merge_requests/321<Paste>
clutter/clutter/x11/clutter-backend-x11.c | 4 +-
cogl/cogl-pango/cogl-pango-display-list.c | 6 +-
cogl/cogl-pango/cogl-pango-fontmap.c | 4 +-
cogl/cogl-pango/cogl-pango-glyph-cache.c | 16 ++--
cogl/cogl-pango/cogl-pango-glyph-cache.h | 6 +-
cogl/cogl-pango/cogl-pango-pipeline-cache.c | 2 +-
cogl/cogl-pango/cogl-pango-pipeline-cache.h | 4 +-
cogl/cogl-pango/cogl-pango-private.h | 4 +-
cogl/cogl-pango/cogl-pango-render.c | 10 +--
cogl/cogl-pango/cogl-pango.h | 4 +-
cogl/cogl-path/cogl-path-functions.h | 2 +-
cogl/cogl-path/cogl-path-private.h | 8 +-
cogl/cogl-path/cogl-path.c | 14 ++--
cogl/cogl/cogl-atlas-texture-private.h | 4 +-
cogl/cogl/cogl-atlas-texture.c | 28 +++----
cogl/cogl/cogl-atlas-texture.h | 2 +-
cogl/cogl/cogl-atlas.c | 4 +-
cogl/cogl/cogl-atlas.h | 4 +-
cogl/cogl/cogl-attribute-buffer.h | 2 +-
cogl/cogl/cogl-attribute-private.h | 6 +-
cogl/cogl/cogl-attribute.c | 24 +++---
cogl/cogl/cogl-attribute.h | 12 +--
cogl/cogl/cogl-bitmap-conversion.c | 18 ++--
cogl/cogl/cogl-bitmap-pixbuf.c | 4 +-
cogl/cogl/cogl-bitmap-private.h | 18 ++--
cogl/cogl/cogl-bitmap.c | 8 +-
cogl/cogl/cogl-bitmap.h | 4 +-
cogl/cogl/cogl-bitmask.c | 8 +-
cogl/cogl/cogl-bitmask.h | 14 ++--
cogl/cogl/cogl-blend-string.c | 16 ++--
cogl/cogl/cogl-blend-string.h | 12 +--
cogl/cogl/cogl-blit.c | 8 +-
cogl/cogl/cogl-blit.h | 2 +-
cogl/cogl/cogl-boxed-value.c | 6 +-
cogl/cogl/cogl-boxed-value.h | 4 +-
cogl/cogl/cogl-buffer-private.h | 4 +-
cogl/cogl/cogl-buffer.c | 14 ++--
cogl/cogl/cogl-buffer.h | 4 +-
cogl/cogl/cogl-clip-stack.h | 2 +-
cogl/cogl/cogl-color.c | 2 +-
cogl/cogl/cogl-color.h | 2 +-
cogl/cogl/cogl-config.c | 2 +-
cogl/cogl/cogl-context-private.h | 30 +++----
cogl/cogl/cogl-context.c | 2 +-
cogl/cogl/cogl-context.h | 6 +-
cogl/cogl/cogl-debug.c | 12 +--
cogl/cogl/cogl-debug.h | 4 +-
cogl/cogl/cogl-depth-state.c | 8 +-
cogl/cogl/cogl-depth-state.h | 12 +--
cogl/cogl/cogl-display-private.h | 2 +-
cogl/cogl/cogl-display.c | 2 +-
cogl/cogl/cogl-display.h | 4 +-
cogl/cogl/cogl-driver.h | 18 ++--
cogl/cogl/cogl-error.c | 2 +-
cogl/cogl/cogl-error.h | 2 +-
cogl/cogl/cogl-euler.c | 2 +-
cogl/cogl/cogl-euler.h | 2 +-
cogl/cogl/cogl-feature-private.c | 4 +-
cogl/cogl/cogl-feature-private.h | 2 +-
cogl/cogl/cogl-fence.c | 2 +-
cogl/cogl/cogl-frame-info.h | 2 +-
cogl/cogl/cogl-framebuffer-private.h | 22 ++---
cogl/cogl/cogl-framebuffer.c | 36 ++++----
cogl/cogl/cogl-framebuffer.h | 22 ++---
cogl/cogl/cogl-gles2-context-private.h | 12 +--
cogl/cogl/cogl-gles2-context.c | 6 +-
cogl/cogl/cogl-gles2.h | 6 +-
cogl/cogl/cogl-glib-source.c | 6 +-
cogl/cogl/cogl-glsl-shader.c | 4 +-
cogl/cogl/cogl-glx-display-private.h | 16 ++--
cogl/cogl/cogl-gpu-info.c | 42 +++++-----
cogl/cogl/cogl-index-buffer.h | 2 +-
cogl/cogl/cogl-indices.c | 2 +-
cogl/cogl/cogl-indices.h | 2 +-
cogl/cogl/cogl-journal-private.h | 8 +-
cogl/cogl/cogl-journal.c | 36 ++++----
cogl/cogl/cogl-matrix-stack-private.h | 12 +--
cogl/cogl/cogl-matrix-stack.c | 24 +++---
cogl/cogl/cogl-matrix-stack.h | 10 +--
cogl/cogl/cogl-matrix.c | 34 ++++----
cogl/cogl/cogl-matrix.h | 6 +-
cogl/cogl/cogl-meta-texture.c | 8 +-
cogl/cogl/cogl-node-private.h | 6 +-
cogl/cogl/cogl-node.c | 2 +-
cogl/cogl/cogl-object-private.h | 6 +-
cogl/cogl/cogl-offscreen.h | 2 +-
cogl/cogl/cogl-onscreen-private.h | 2 +-
cogl/cogl/cogl-onscreen-template.c | 2 +-
cogl/cogl/cogl-onscreen-template.h | 4 +-
cogl/cogl/cogl-onscreen.c | 4 +-
cogl/cogl/cogl-onscreen.h | 6 +-
cogl/cogl/cogl-output-private.h | 2 +-
cogl/cogl/cogl-output.h | 2 +-
cogl/cogl/cogl-pipeline-debug.c | 12 +--
cogl/cogl/cogl-pipeline-hash-table.c | 2 +-
cogl/cogl/cogl-pipeline-layer-private.h | 12 +--
cogl/cogl/cogl-pipeline-layer-state-private.h | 18 ++--
cogl/cogl/cogl-pipeline-layer-state.c | 32 ++++----
cogl/cogl/cogl-pipeline-layer-state.h | 8 +-
cogl/cogl/cogl-pipeline-layer.c | 8 +-
cogl/cogl/cogl-pipeline-private.h | 40 ++++-----
cogl/cogl/cogl-pipeline-snippet-private.h | 4 +-
cogl/cogl/cogl-pipeline-snippet.c | 2 +-
cogl/cogl/cogl-pipeline-state-private.h | 40 ++++-----
cogl/cogl/cogl-pipeline-state.c | 74 ++++++++---------
cogl/cogl/cogl-pipeline-state.h | 12 +--
cogl/cogl/cogl-pipeline.c | 96 +++++++++++-----------
cogl/cogl/cogl-pipeline.h | 4 +-
cogl/cogl/cogl-pixel-buffer.h | 4 +-
cogl/cogl/cogl-primitive-texture.c | 4 +-
cogl/cogl/cogl-primitive-texture.h | 4 +-
cogl/cogl/cogl-primitive.c | 2 +-
cogl/cogl/cogl-primitive.h | 4 +-
cogl/cogl/cogl-primitives-private.h | 2 +-
cogl/cogl/cogl-primitives.c | 44 +++++-----
cogl/cogl/cogl-primitives.h | 2 +-
cogl/cogl/cogl-private.h | 8 +-
cogl/cogl/cogl-profile.c | 4 +-
cogl/cogl/cogl-quaternion.c | 2 +-
cogl/cogl/cogl-quaternion.h | 2 +-
cogl/cogl/cogl-rectangle-map.c | 6 +-
cogl/cogl/cogl-rectangle-map.h | 2 +-
cogl/cogl/cogl-renderer-private.h | 10 +--
cogl/cogl/cogl-renderer.c | 26 +++---
cogl/cogl/cogl-renderer.h | 6 +-
cogl/cogl/cogl-sampler-cache.c | 6 +-
cogl/cogl/cogl-snippet-private.h | 2 +-
cogl/cogl/cogl-snippet.c | 2 +-
cogl/cogl/cogl-snippet.h | 2 +-
cogl/cogl/cogl-spans.c | 2 +-
cogl/cogl/cogl-spans.h | 6 +-
cogl/cogl/cogl-sub-texture.c | 14 ++--
cogl/cogl/cogl-sub-texture.h | 2 +-
cogl/cogl/cogl-swap-chain-private.h | 2 +-
cogl/cogl/cogl-swap-chain.c | 2 +-
cogl/cogl/cogl-swap-chain.h | 4 +-
cogl/cogl/cogl-texture-2d-private.h | 10 +--
cogl/cogl/cogl-texture-2d-sliced-private.h | 2 +-
cogl/cogl/cogl-texture-2d-sliced.c | 38 ++++-----
cogl/cogl/cogl-texture-2d-sliced.h | 2 +-
cogl/cogl/cogl-texture-2d.c | 22 ++---
cogl/cogl/cogl-texture-2d.h | 2 +-
cogl/cogl/cogl-texture-3d-private.h | 4 +-
cogl/cogl/cogl-texture-3d.c | 22 ++---
cogl/cogl/cogl-texture-3d.h | 2 +-
cogl/cogl/cogl-texture-driver.h | 20 ++---
cogl/cogl/cogl-texture-private.h | 34 ++++----
cogl/cogl/cogl-texture-rectangle-private.h | 2 +-
cogl/cogl/cogl-texture-rectangle.c | 32 ++++----
cogl/cogl/cogl-texture-rectangle.h | 2 +-
cogl/cogl/cogl-texture.c | 48 +++++------
cogl/cogl/cogl-texture.h | 20 ++---
cogl/cogl/cogl-types.h | 12 ---
cogl/cogl/cogl-util.c | 6 +-
cogl/cogl/cogl-util.h | 4 +-
cogl/cogl/cogl-vector.c | 6 +-
cogl/cogl/cogl-vector.h | 4 +-
cogl/cogl/cogl-wayland-server.h | 2 +-
cogl/cogl/cogl-xlib-renderer-private.h | 2 +-
cogl/cogl/cogl-xlib-renderer.c | 8 +-
cogl/cogl/cogl-xlib-renderer.h | 6 +-
cogl/cogl/cogl.c | 34 ++++----
cogl/cogl/cogl1-context.h | 14 ++--
cogl/cogl/deprecated/cogl-auto-texture.c | 4 +-
cogl/cogl/deprecated/cogl-clutter.c | 4 +-
cogl/cogl/deprecated/cogl-clutter.h | 4 +-
cogl/cogl/deprecated/cogl-material-compat.c | 14 ++--
cogl/cogl/deprecated/cogl-material-compat.h | 16 ++--
cogl/cogl/deprecated/cogl-program-private.h | 6 +-
cogl/cogl/deprecated/cogl-program.c | 12 +--
cogl/cogl/deprecated/cogl-shader.c | 2 +-
cogl/cogl/deprecated/cogl-shader.h | 10 +--
cogl/cogl/deprecated/cogl-vertex-buffer-private.h | 2 +-
cogl/cogl/deprecated/cogl-vertex-buffer.c | 16 ++--
cogl/cogl/deprecated/cogl-vertex-buffer.h | 6 +-
cogl/cogl/driver/gl/cogl-attribute-gl.c | 16 ++--
cogl/cogl/driver/gl/cogl-buffer-gl-private.h | 2 +-
cogl/cogl/driver/gl/cogl-buffer-gl.c | 8 +-
cogl/cogl/driver/gl/cogl-clip-stack-gl.c | 14 ++--
cogl/cogl/driver/gl/cogl-framebuffer-gl-private.h | 4 +-
cogl/cogl/driver/gl/cogl-framebuffer-gl.c | 14 ++--
cogl/cogl/driver/gl/cogl-pipeline-fragend-glsl.c | 10 +--
cogl/cogl/driver/gl/cogl-pipeline-opengl-private.h | 12 +--
cogl/cogl/driver/gl/cogl-pipeline-opengl.c | 32 ++++----
cogl/cogl/driver/gl/cogl-pipeline-progend-glsl.c | 24 +++---
cogl/cogl/driver/gl/cogl-pipeline-vertend-glsl.c | 8 +-
cogl/cogl/driver/gl/cogl-texture-2d-gl-private.h | 10 +--
cogl/cogl/driver/gl/cogl-texture-2d-gl.c | 22 ++---
cogl/cogl/driver/gl/cogl-util-gl-private.h | 4 +-
cogl/cogl/driver/gl/cogl-util-gl.c | 6 +-
cogl/cogl/driver/gl/gl/cogl-driver-gl.c | 8 +-
cogl/cogl/driver/gl/gl/cogl-texture-driver-gl.c | 26 +++---
cogl/cogl/driver/gl/gles/cogl-driver-gles.c | 6 +-
.../cogl/driver/gl/gles/cogl-texture-driver-gles.c | 24 +++---
cogl/cogl/driver/nop/cogl-driver-nop.c | 2 +-
.../cogl/driver/nop/cogl-framebuffer-nop-private.h | 4 +-
cogl/cogl/driver/nop/cogl-framebuffer-nop.c | 4 +-
cogl/cogl/driver/nop/cogl-texture-2d-nop-private.h | 6 +-
cogl/cogl/driver/nop/cogl-texture-2d-nop.c | 6 +-
cogl/cogl/winsys/cogl-texture-pixmap-x11-private.h | 4 +-
cogl/cogl/winsys/cogl-texture-pixmap-x11.c | 26 +++---
cogl/cogl/winsys/cogl-texture-pixmap-x11.h | 8 +-
cogl/cogl/winsys/cogl-winsys-egl-private.h | 18 ++--
cogl/cogl/winsys/cogl-winsys-egl-x11.c | 26 +++---
cogl/cogl/winsys/cogl-winsys-egl.c | 28 +++----
cogl/cogl/winsys/cogl-winsys-glx.c | 80 +++++++++---------
cogl/cogl/winsys/cogl-winsys-private.h | 26 +++---
cogl/cogl/winsys/cogl-winsys-stub.c | 14 ++--
cogl/cogl/winsys/cogl-winsys.c | 2 +-
cogl/test-fixtures/test-utils.c | 18 ++--
cogl/test-fixtures/test-utils.h | 6 +-
cogl/tests/conform/test-backface-culling.c | 6 +-
cogl/tests/conform/test-blend-strings.c | 4 +-
cogl/tests/conform/test-depth-test.c | 14 ++--
cogl/tests/conform/test-materials.c | 2 +-
cogl/tests/conform/test-multitexture.c | 4 +-
cogl/tests/conform/test-point-size-attribute.c | 2 +-
cogl/tests/conform/test-point-size.c | 2 +-
cogl/tests/conform/test-point-sprite.c | 6 +-
cogl/tests/conform/test-primitive.c | 2 +-
cogl/tests/conform/test-readpixels.c | 2 +-
cogl/tests/conform/test-texture-mipmaps.c | 2 +-
cogl/tests/conform/test-texture-pixmap-x11.c | 6 +-
cogl/tests/conform/test-texture-rectangle.c | 4 +-
cogl/tests/conform/test-vertex-buffer-contiguous.c | 2 +-
cogl/tests/conform/test-vertex-buffer-interleved.c | 2 +-
cogl/tests/conform/test-vertex-buffer-mutability.c | 2 +-
cogl/tests/conform/test-viewport.c | 2 +-
228 files changed, 1185 insertions(+), 1197 deletions(-)
---
diff --git a/clutter/clutter/x11/clutter-backend-x11.c b/clutter/clutter/x11/clutter-backend-x11.c
index af806d6cf..f3b648178 100644
--- a/clutter/clutter/x11/clutter-backend-x11.c
+++ b/clutter/clutter/x11/clutter-backend-x11.c
@@ -678,8 +678,8 @@ static gboolean
check_onscreen_template (CoglRenderer *renderer,
CoglSwapChain *swap_chain,
CoglOnscreenTemplate *onscreen_template,
- CoglBool enable_argb,
- CoglBool enable_stereo,
+ gboolean enable_argb,
+ gboolean enable_stereo,
GError **error)
{
GError *internal_error = NULL;
diff --git a/cogl/cogl-pango/cogl-pango-display-list.c b/cogl/cogl-pango/cogl-pango-display-list.c
index b2b254964..6a99a4c1b 100644
--- a/cogl/cogl-pango/cogl-pango-display-list.c
+++ b/cogl/cogl-pango/cogl-pango-display-list.c
@@ -47,7 +47,7 @@ typedef struct _CoglPangoDisplayListRectangle CoglPangoDisplayListRectangle;
struct _CoglPangoDisplayList
{
- CoglBool color_override;
+ gboolean color_override;
CoglColor color;
GSList *nodes;
GSList *last_node;
@@ -65,7 +65,7 @@ struct _CoglPangoDisplayListNode
{
CoglPangoDisplayListNodeType type;
- CoglBool color_override;
+ gboolean color_override;
CoglColor color;
CoglPipeline *pipeline;
@@ -273,7 +273,7 @@ emit_vertex_buffer_geometry (CoglFramebuffer *fb,
CoglAttributeBuffer *buffer;
CoglVertexP2T2 *verts, *v;
int n_verts;
- CoglBool allocated = FALSE;
+ gboolean allocated = FALSE;
CoglAttribute *attributes[2];
CoglPrimitive *prim;
int i;
diff --git a/cogl/cogl-pango/cogl-pango-fontmap.c b/cogl/cogl-pango/cogl-pango-fontmap.c
index f39987a7a..84c4898a9 100644
--- a/cogl/cogl-pango/cogl-pango-fontmap.c
+++ b/cogl/cogl-pango/cogl-pango-fontmap.c
@@ -153,7 +153,7 @@ cogl_pango_font_map_clear_glyph_cache (CoglPangoFontMap *fm)
void
cogl_pango_font_map_set_use_mipmapping (CoglPangoFontMap *fm,
- CoglBool value)
+ gboolean value)
{
PangoRenderer *renderer = _cogl_pango_font_map_get_renderer (fm);
@@ -161,7 +161,7 @@ cogl_pango_font_map_set_use_mipmapping (CoglPangoFontMap *fm,
value);
}
-CoglBool
+gboolean
cogl_pango_font_map_get_use_mipmapping (CoglPangoFontMap *fm)
{
PangoRenderer *renderer = _cogl_pango_font_map_get_renderer (fm);
diff --git a/cogl/cogl-pango/cogl-pango-glyph-cache.c b/cogl/cogl-pango/cogl-pango-glyph-cache.c
index a5f2e8c88..f73074d1d 100644
--- a/cogl/cogl-pango/cogl-pango-glyph-cache.c
+++ b/cogl/cogl-pango/cogl-pango-glyph-cache.c
@@ -54,16 +54,16 @@ struct _CoglPangoGlyphCache
/* TRUE if we've ever stored a texture in the global atlas. This is
used to make sure we only register one callback to listen for
global atlas reorganizations */
- CoglBool using_global_atlas;
+ gboolean using_global_atlas;
/* True if some of the glyphs are dirty. This is used as an
optimization in _cogl_pango_glyph_cache_set_dirty_glyphs to avoid
iterating the hash table if we know none of them are dirty */
- CoglBool has_dirty_glyphs;
+ gboolean has_dirty_glyphs;
/* Whether mipmapping is being used for this cache. This only
affects whether we decide to put the glyph in the global atlas */
- CoglBool use_mipmapping;
+ gboolean use_mipmapping;
};
struct _CoglPangoGlyphCacheKey
@@ -100,7 +100,7 @@ cogl_pango_glyph_cache_hash_func (const void *key)
return GPOINTER_TO_UINT (cache_key->font) ^ cache_key->glyph;
}
-static CoglBool
+static gboolean
cogl_pango_glyph_cache_equal_func (const void *a, const void *b)
{
const CoglPangoGlyphCacheKey *key_a
@@ -117,7 +117,7 @@ cogl_pango_glyph_cache_equal_func (const void *a, const void *b)
CoglPangoGlyphCache *
cogl_pango_glyph_cache_new (CoglContext *ctx,
- CoglBool use_mipmapping)
+ gboolean use_mipmapping)
{
CoglPangoGlyphCache *cache;
@@ -210,7 +210,7 @@ cogl_pango_glyph_cache_update_position_cb (void *user_data,
value->dirty = TRUE;
}
-static CoglBool
+static gboolean
cogl_pango_glyph_cache_add_to_global_atlas (CoglPangoGlyphCache *cache,
PangoFont *font,
PangoGlyph glyph,
@@ -259,7 +259,7 @@ cogl_pango_glyph_cache_add_to_global_atlas (CoglPangoGlyphCache *cache,
return TRUE;
}
-static CoglBool
+static gboolean
cogl_pango_glyph_cache_add_to_local_atlas (CoglPangoGlyphCache *cache,
PangoFont *font,
PangoGlyph glyph,
@@ -309,7 +309,7 @@ cogl_pango_glyph_cache_add_to_local_atlas (CoglPangoGlyphCache *cache,
CoglPangoGlyphCacheValue *
cogl_pango_glyph_cache_lookup (CoglPangoGlyphCache *cache,
- CoglBool create,
+ gboolean create,
PangoFont *font,
PangoGlyph glyph)
{
diff --git a/cogl/cogl-pango/cogl-pango-glyph-cache.h b/cogl/cogl-pango/cogl-pango-glyph-cache.h
index c93d1831e..ec0616acc 100644
--- a/cogl/cogl-pango/cogl-pango-glyph-cache.h
+++ b/cogl/cogl-pango/cogl-pango-glyph-cache.h
@@ -58,7 +58,7 @@ struct _CoglPangoGlyphCacheValue
/* This will be set to TRUE when the glyph atlas is reorganized
which means the glyph will need to be redrawn */
- CoglBool dirty;
+ gboolean dirty;
};
typedef void (* CoglPangoGlyphCacheDirtyFunc) (PangoFont *font,
@@ -67,14 +67,14 @@ typedef void (* CoglPangoGlyphCacheDirtyFunc) (PangoFont *font,
CoglPangoGlyphCache *
cogl_pango_glyph_cache_new (CoglContext *ctx,
- CoglBool use_mipmapping);
+ gboolean use_mipmapping);
void
cogl_pango_glyph_cache_free (CoglPangoGlyphCache *cache);
CoglPangoGlyphCacheValue *
cogl_pango_glyph_cache_lookup (CoglPangoGlyphCache *cache,
- CoglBool create,
+ gboolean create,
PangoFont *font,
PangoGlyph glyph);
diff --git a/cogl/cogl-pango/cogl-pango-pipeline-cache.c b/cogl/cogl-pango/cogl-pango-pipeline-cache.c
index 78fba0993..fdc340908 100644
--- a/cogl/cogl-pango/cogl-pango-pipeline-cache.c
+++ b/cogl/cogl-pango/cogl-pango-pipeline-cache.c
@@ -74,7 +74,7 @@ _cogl_pango_pipeline_cache_value_destroy (void *data)
CoglPangoPipelineCache *
_cogl_pango_pipeline_cache_new (CoglContext *ctx,
- CoglBool use_mipmapping)
+ gboolean use_mipmapping)
{
CoglPangoPipelineCache *cache = g_new (CoglPangoPipelineCache, 1);
diff --git a/cogl/cogl-pango/cogl-pango-pipeline-cache.h b/cogl/cogl-pango/cogl-pango-pipeline-cache.h
index ff7955e62..2cd887812 100644
--- a/cogl/cogl-pango/cogl-pango-pipeline-cache.h
+++ b/cogl/cogl-pango/cogl-pango-pipeline-cache.h
@@ -49,13 +49,13 @@ typedef struct _CoglPangoPipelineCache
CoglPipeline *base_texture_alpha_pipeline;
CoglPipeline *base_texture_rgba_pipeline;
- CoglBool use_mipmapping;
+ gboolean use_mipmapping;
} CoglPangoPipelineCache;
CoglPangoPipelineCache *
_cogl_pango_pipeline_cache_new (CoglContext *ctx,
- CoglBool use_mipmapping);
+ gboolean use_mipmapping);
/* Returns a pipeline that can be used to render glyphs in the given
texture. The pipeline has a new reference so it is up to the caller
diff --git a/cogl/cogl-pango/cogl-pango-private.h b/cogl/cogl-pango/cogl-pango-private.h
index 716725bd5..c29100a66 100644
--- a/cogl/cogl-pango/cogl-pango-private.h
+++ b/cogl/cogl-pango/cogl-pango-private.h
@@ -48,8 +48,8 @@ _cogl_pango_renderer_clear_glyph_cache (CoglPangoRenderer *renderer);
void
_cogl_pango_renderer_set_use_mipmapping (CoglPangoRenderer *renderer,
- CoglBool value);
-CoglBool
+ gboolean value);
+gboolean
_cogl_pango_renderer_get_use_mipmapping (CoglPangoRenderer *renderer);
diff --git a/cogl/cogl-pango/cogl-pango-render.c b/cogl/cogl-pango/cogl-pango-render.c
index 55db8337c..9bc6e934d 100644
--- a/cogl/cogl-pango/cogl-pango-render.c
+++ b/cogl/cogl-pango/cogl-pango-render.c
@@ -76,7 +76,7 @@ struct _CoglPangoRenderer
CoglPangoRendererCaches no_mipmap_caches;
CoglPangoRendererCaches mipmap_caches;
- CoglBool use_mipmapping;
+ gboolean use_mipmapping;
/* The current display list that is being built */
CoglPangoDisplayList *display_list;
@@ -102,7 +102,7 @@ struct _CoglPangoLayoutQdata
/* Whether mipmapping was previously used to render this layout. We
need to regenerate the display list if the mipmapping value is
changed because it will be using a different set of textures */
- CoglBool mipmapping_used;
+ gboolean mipmapping_used;
};
static void
@@ -534,12 +534,12 @@ _cogl_pango_renderer_clear_glyph_cache (CoglPangoRenderer *renderer)
void
_cogl_pango_renderer_set_use_mipmapping (CoglPangoRenderer *renderer,
- CoglBool value)
+ gboolean value)
{
renderer->use_mipmapping = value;
}
-CoglBool
+gboolean
_cogl_pango_renderer_get_use_mipmapping (CoglPangoRenderer *renderer)
{
return renderer->use_mipmapping;
@@ -547,7 +547,7 @@ _cogl_pango_renderer_get_use_mipmapping (CoglPangoRenderer *renderer)
static CoglPangoGlyphCacheValue *
cogl_pango_renderer_get_cached_glyph (PangoRenderer *renderer,
- CoglBool create,
+ gboolean create,
PangoFont *font,
PangoGlyph glyph)
{
diff --git a/cogl/cogl-pango/cogl-pango.h b/cogl/cogl-pango/cogl-pango.h
index 62a62ce89..4559eca15 100644
--- a/cogl/cogl-pango/cogl-pango.h
+++ b/cogl/cogl-pango/cogl-pango.h
@@ -144,7 +144,7 @@ cogl_pango_ensure_glyph_cache_for_layout (PangoLayout *layout);
*/
void
cogl_pango_font_map_set_use_mipmapping (CoglPangoFontMap *font_map,
- CoglBool value);
+ gboolean value);
/**
* cogl_pango_font_map_get_use_mipmapping:
@@ -157,7 +157,7 @@ cogl_pango_font_map_set_use_mipmapping (CoglPangoFontMap *font_map,
*
* Since: 1.0
*/
-CoglBool
+gboolean
cogl_pango_font_map_get_use_mipmapping (CoglPangoFontMap *font_map);
/**
diff --git a/cogl/cogl-path/cogl-path-functions.h b/cogl/cogl-path/cogl-path-functions.h
index 07cfe0f5a..d4ef328d2 100644
--- a/cogl/cogl-path/cogl-path-functions.h
+++ b/cogl/cogl-path/cogl-path-functions.h
@@ -96,7 +96,7 @@ cogl_path_copy (CoglPath *path);
*
* Since: 2.0
*/
-CoglBool
+gboolean
cogl_is_path (void *object);
#define cogl_path_move_to cogl2_path_move_to
diff --git a/cogl/cogl-path/cogl-path-private.h b/cogl/cogl-path/cogl-path-private.h
index 078e58ffc..25a628b70 100644
--- a/cogl/cogl-path/cogl-path-private.h
+++ b/cogl/cogl-path/cogl-path-private.h
@@ -105,13 +105,13 @@ struct _CoglPathData
case and divert to the journal or a rectangle clip. If it is TRUE
then the entire path can be described by calling
_cogl_path_get_bounds */
- CoglBool is_rectangle;
+ gboolean is_rectangle;
};
void
_cogl_add_path_to_stencil_buffer (CoglPath *path,
- CoglBool merge,
- CoglBool need_clear);
+ gboolean merge,
+ gboolean need_clear);
void
_cogl_path_get_bounds (CoglPath *path,
@@ -120,7 +120,7 @@ _cogl_path_get_bounds (CoglPath *path,
float *max_x,
float *max_y);
-CoglBool
+gboolean
_cogl_path_is_rectangle (CoglPath *path);
#endif /* __COGL_PATH_PRIVATE_H */
diff --git a/cogl/cogl-path/cogl-path.c b/cogl/cogl-path/cogl-path.c
index 28aeed64a..4d86c6fb5 100644
--- a/cogl/cogl-path/cogl-path.c
+++ b/cogl/cogl-path/cogl-path.c
@@ -169,7 +169,7 @@ cogl2_path_get_fill_rule (CoglPath *path)
static void
_cogl_path_add_node (CoglPath *path,
- CoglBool new_sub_path,
+ gboolean new_sub_path,
float x,
float y)
{
@@ -299,7 +299,7 @@ _cogl_path_fill_nodes_with_clipped_rectangle (CoglPath *path,
/* We need at least three stencil bits to combine clips */
if (_cogl_framebuffer_get_stencil_bits (framebuffer) >= 3)
{
- static CoglBool seen_warning = FALSE;
+ static gboolean seen_warning = FALSE;
if (!seen_warning)
{
@@ -320,10 +320,10 @@ _cogl_path_fill_nodes_with_clipped_rectangle (CoglPath *path,
cogl_framebuffer_pop_clip (framebuffer);
}
-static CoglBool
+static gboolean
validate_layer_cb (CoglPipelineLayer *layer, void *user_data)
{
- CoglBool *needs_fallback = user_data;
+ gboolean *needs_fallback = user_data;
CoglTexture *texture = _cogl_pipeline_layer_get_texture (layer);
/* If any of the layers of the current pipeline contain sliced
@@ -365,7 +365,7 @@ _cogl_path_fill_nodes (CoglPath *path,
}
else
{
- CoglBool needs_fallback = FALSE;
+ gboolean needs_fallback = FALSE;
CoglPrimitive *primitive;
_cogl_pipeline_foreach_layer_internal (pipeline,
@@ -538,7 +538,7 @@ cogl2_path_rectangle (CoglPath *path,
float x_2,
float y_2)
{
- CoglBool is_rectangle;
+ gboolean is_rectangle;
/* If the path was previously empty and the rectangle isn't mirrored
then we'll record that this is a simple rectangle path so that we
@@ -556,7 +556,7 @@ cogl2_path_rectangle (CoglPath *path,
path->data->is_rectangle = is_rectangle;
}
-CoglBool
+gboolean
_cogl_path_is_rectangle (CoglPath *path)
{
return path->data->is_rectangle;
diff --git a/cogl/cogl/cogl-atlas-texture-private.h b/cogl/cogl/cogl-atlas-texture-private.h
index ba83bf9eb..e5d143021 100644
--- a/cogl/cogl/cogl-atlas-texture-private.h
+++ b/cogl/cogl/cogl-atlas-texture-private.h
@@ -63,7 +63,7 @@ struct _CoglAtlasTexture
CoglAtlasTexture *
_cogl_atlas_texture_new_from_bitmap (CoglBitmap *bmp,
- CoglBool can_convert_in_place);
+ gboolean can_convert_in_place);
void
_cogl_atlas_texture_add_reorganize_callback (CoglContext *ctx,
@@ -75,7 +75,7 @@ _cogl_atlas_texture_remove_reorganize_callback (CoglContext *ctx,
GHookFunc callback,
void *user_data);
-CoglBool
+gboolean
_cogl_is_atlas_texture (void *object);
#endif /* _COGL_ATLAS_TEXTURE_PRIVATE_H_ */
diff --git a/cogl/cogl/cogl-atlas-texture.c b/cogl/cogl/cogl-atlas-texture.c
index a77fcd91f..fce936a4d 100644
--- a/cogl/cogl/cogl-atlas-texture.c
+++ b/cogl/cogl/cogl-atlas-texture.c
@@ -299,7 +299,7 @@ _cogl_atlas_texture_get_max_waste (CoglTexture *tex)
return cogl_texture_get_max_waste (atlas_tex->sub_texture);
}
-static CoglBool
+static gboolean
_cogl_atlas_texture_is_sliced (CoglTexture *tex)
{
CoglAtlasTexture *atlas_tex = COGL_ATLAS_TEXTURE (tex);
@@ -308,7 +308,7 @@ _cogl_atlas_texture_is_sliced (CoglTexture *tex)
return cogl_texture_is_sliced (atlas_tex->sub_texture);
}
-static CoglBool
+static gboolean
_cogl_atlas_texture_can_hardware_repeat (CoglTexture *tex)
{
CoglAtlasTexture *atlas_tex = COGL_ATLAS_TEXTURE (tex);
@@ -339,7 +339,7 @@ _cogl_atlas_texture_transform_quad_coords_to_gl (CoglTexture *tex,
coords);
}
-static CoglBool
+static gboolean
_cogl_atlas_texture_get_gl_texture (CoglTexture *tex,
GLuint *out_gl_handle,
GLenum *out_gl_target)
@@ -444,7 +444,7 @@ _cogl_atlas_texture_ensure_non_quad_rendering (CoglTexture *tex)
_cogl_texture_ensure_non_quad_rendering (atlas_tex->sub_texture);
}
-static CoglBool
+static gboolean
_cogl_atlas_texture_set_region_with_border (CoglAtlasTexture *atlas_tex,
int src_x,
int src_y,
@@ -523,7 +523,7 @@ static CoglBitmap *
_cogl_atlas_texture_convert_bitmap_for_upload (CoglAtlasTexture *atlas_tex,
CoglBitmap *bmp,
CoglPixelFormat internal_format,
- CoglBool can_convert_in_place,
+ gboolean can_convert_in_place,
CoglError **error)
{
CoglBitmap *upload_bmp;
@@ -564,7 +564,7 @@ _cogl_atlas_texture_convert_bitmap_for_upload (CoglAtlasTexture *atlas_tex,
return override_bmp;
}
-static CoglBool
+static gboolean
_cogl_atlas_texture_set_region (CoglTexture *tex,
int src_x,
int src_y,
@@ -585,7 +585,7 @@ _cogl_atlas_texture_set_region (CoglTexture *tex,
pixels to the border */
if (atlas_tex->atlas)
{
- CoglBool ret;
+ gboolean ret;
CoglBitmap *upload_bmp =
_cogl_atlas_texture_convert_bitmap_for_upload (atlas_tex,
bmp,
@@ -639,7 +639,7 @@ _cogl_atlas_texture_get_gl_format (CoglTexture *tex)
return _cogl_texture_gl_get_format (atlas_tex->sub_texture);
}
-static CoglBool
+static gboolean
_cogl_atlas_texture_can_use_format (CoglPixelFormat format)
{
/* We don't care about the ordering or the premult status and we can
@@ -706,7 +706,7 @@ cogl_atlas_texture_new_with_size (CoglContext *ctx,
loader);
}
-static CoglBool
+static gboolean
allocate_space (CoglAtlasTexture *atlas_tex,
int width,
int height,
@@ -792,7 +792,7 @@ allocate_space (CoglAtlasTexture *atlas_tex,
return TRUE;
}
-static CoglBool
+static gboolean
allocate_with_size (CoglAtlasTexture *atlas_tex,
CoglTextureLoader *loader,
CoglError **error)
@@ -817,7 +817,7 @@ allocate_with_size (CoglAtlasTexture *atlas_tex,
return FALSE;
}
-static CoglBool
+static gboolean
allocate_from_bitmap (CoglAtlasTexture *atlas_tex,
CoglTextureLoader *loader,
CoglError **error)
@@ -827,7 +827,7 @@ allocate_from_bitmap (CoglAtlasTexture *atlas_tex,
CoglPixelFormat bmp_format = cogl_bitmap_get_format (bmp);
int width = cogl_bitmap_get_width (bmp);
int height = cogl_bitmap_get_height (bmp);
- CoglBool can_convert_in_place = loader->src.bitmap.can_convert_in_place;
+ gboolean can_convert_in_place = loader->src.bitmap.can_convert_in_place;
CoglPixelFormat internal_format;
CoglBitmap *upload_bmp;
@@ -878,7 +878,7 @@ allocate_from_bitmap (CoglAtlasTexture *atlas_tex,
return TRUE;
}
-static CoglBool
+static gboolean
_cogl_atlas_texture_allocate (CoglTexture *tex,
CoglError **error)
{
@@ -902,7 +902,7 @@ _cogl_atlas_texture_allocate (CoglTexture *tex,
CoglAtlasTexture *
_cogl_atlas_texture_new_from_bitmap (CoglBitmap *bmp,
- CoglBool can_convert_in_place)
+ gboolean can_convert_in_place)
{
CoglTextureLoader *loader;
diff --git a/cogl/cogl/cogl-atlas-texture.h b/cogl/cogl/cogl-atlas-texture.h
index 89593a49d..34a4f86dd 100644
--- a/cogl/cogl/cogl-atlas-texture.h
+++ b/cogl/cogl/cogl-atlas-texture.h
@@ -246,7 +246,7 @@ cogl_atlas_texture_new_from_bitmap (CoglBitmap *bmp);
* Since: 1.16
* Stability: Unstable
*/
-CoglBool
+gboolean
cogl_is_atlas_texture (void *object);
G_END_DECLS
diff --git a/cogl/cogl/cogl-atlas.c b/cogl/cogl/cogl-atlas.c
index 285269f64..c7ad711e7 100644
--- a/cogl/cogl/cogl-atlas.c
+++ b/cogl/cogl/cogl-atlas.c
@@ -362,7 +362,7 @@ _cogl_atlas_notify_post_reorganize (CoglAtlas *atlas)
g_hook_list_invoke (&atlas->post_reorganize_callbacks, FALSE);
}
-CoglBool
+gboolean
_cogl_atlas_reserve_space (CoglAtlas *atlas,
unsigned int width,
unsigned int height,
@@ -372,7 +372,7 @@ _cogl_atlas_reserve_space (CoglAtlas *atlas,
CoglRectangleMap *new_map;
CoglTexture2D *new_tex;
unsigned int map_width = 0, map_height = 0;
- CoglBool ret;
+ gboolean ret;
CoglRectangleMapEntry new_position;
/* Check if we can fit the rectangle into the existing map */
diff --git a/cogl/cogl/cogl-atlas.h b/cogl/cogl/cogl-atlas.h
index e9b3fb069..096fff92c 100644
--- a/cogl/cogl/cogl-atlas.h
+++ b/cogl/cogl/cogl-atlas.h
@@ -69,7 +69,7 @@ _cogl_atlas_new (CoglPixelFormat texture_format,
CoglAtlasFlags flags,
CoglAtlasUpdatePositionCallback update_position_cb);
-CoglBool
+gboolean
_cogl_atlas_reserve_space (CoglAtlas *atlas,
unsigned int width,
unsigned int height,
@@ -99,7 +99,7 @@ _cogl_atlas_remove_reorganize_callback (CoglAtlas *atlas,
GHookFunc post_callback,
void *user_data);
-CoglBool
+gboolean
_cogl_is_atlas (void *object);
#endif /* __COGL_ATLAS_H */
diff --git a/cogl/cogl/cogl-attribute-buffer.h b/cogl/cogl/cogl-attribute-buffer.h
index 0f74e527e..0ec3876cc 100644
--- a/cogl/cogl/cogl-attribute-buffer.h
+++ b/cogl/cogl/cogl-attribute-buffer.h
@@ -139,7 +139,7 @@ cogl_attribute_buffer_new (CoglContext *context,
* Since: 1.4
* Stability: Unstable
*/
-CoglBool
+gboolean
cogl_is_attribute_buffer (void *object);
G_END_DECLS
diff --git a/cogl/cogl/cogl-attribute-private.h b/cogl/cogl/cogl-attribute-private.h
index 8a9b77b2c..7ddc0e305 100644
--- a/cogl/cogl/cogl-attribute-private.h
+++ b/cogl/cogl/cogl-attribute-private.h
@@ -55,7 +55,7 @@ typedef struct _CoglAttributeNameState
const char *name;
CoglAttributeNameID name_id;
int name_index;
- CoglBool normalized_default;
+ gboolean normalized_default;
int layer_number;
} CoglAttributeNameState;
@@ -64,9 +64,9 @@ struct _CoglAttribute
CoglObject _parent;
const CoglAttributeNameState *name_state;
- CoglBool normalized;
+ gboolean normalized;
- CoglBool is_buffered;
+ gboolean is_buffered;
union {
struct {
diff --git a/cogl/cogl/cogl-attribute.c b/cogl/cogl/cogl-attribute.c
index c0c3df7db..578c1291f 100644
--- a/cogl/cogl/cogl-attribute.c
+++ b/cogl/cogl/cogl-attribute.c
@@ -65,11 +65,11 @@ static void _cogl_attribute_free (CoglAttribute *attribute);
COGL_OBJECT_DEFINE (Attribute, attribute);
COGL_GTYPE_DEFINE_CLASS (Attribute, attribute);
-static CoglBool
+static gboolean
validate_cogl_attribute_name (const char *name,
const char **real_attribute_name,
CoglAttributeNameID *name_id,
- CoglBool *normalized,
+ gboolean *normalized,
int *layer_number)
{
name = name + 5; /* skip "cogl_" */
@@ -166,7 +166,7 @@ error:
return NULL;
}
-static CoglBool
+static gboolean
validate_n_components (const CoglAttributeNameState *name_state,
int n_components)
{
@@ -271,7 +271,7 @@ _cogl_attribute_new_const (CoglContext *context,
const char *name,
int n_components,
int n_columns,
- CoglBool transpose,
+ gboolean transpose,
const float *value)
{
CoglAttribute *attribute = g_slice_new (CoglAttribute);
@@ -428,7 +428,7 @@ CoglAttribute *
cogl_attribute_new_const_2x2fv (CoglContext *context,
const char *name,
const float *matrix2x2,
- CoglBool transpose)
+ gboolean transpose)
{
return _cogl_attribute_new_const (context,
name,
@@ -442,7 +442,7 @@ CoglAttribute *
cogl_attribute_new_const_3x3fv (CoglContext *context,
const char *name,
const float *matrix3x3,
- CoglBool transpose)
+ gboolean transpose)
{
return _cogl_attribute_new_const (context,
name,
@@ -456,7 +456,7 @@ CoglAttribute *
cogl_attribute_new_const_4x4fv (CoglContext *context,
const char *name,
const float *matrix4x4,
- CoglBool transpose)
+ gboolean transpose)
{
return _cogl_attribute_new_const (context,
name,
@@ -466,7 +466,7 @@ cogl_attribute_new_const_4x4fv (CoglContext *context,
matrix4x4);
}
-CoglBool
+gboolean
cogl_attribute_get_normalized (CoglAttribute *attribute)
{
_COGL_RETURN_VAL_IF_FAIL (cogl_is_attribute (attribute), FALSE);
@@ -477,7 +477,7 @@ cogl_attribute_get_normalized (CoglAttribute *attribute)
static void
warn_about_midscene_changes (void)
{
- static CoglBool seen = FALSE;
+ static gboolean seen = FALSE;
if (!seen)
{
g_warning ("Mid-scene modification of attributes has "
@@ -488,7 +488,7 @@ warn_about_midscene_changes (void)
void
cogl_attribute_set_normalized (CoglAttribute *attribute,
- CoglBool normalized)
+ gboolean normalized)
{
_COGL_RETURN_IF_FAIL (cogl_is_attribute (attribute));
@@ -558,7 +558,7 @@ _cogl_attribute_free (CoglAttribute *attribute)
g_slice_free (CoglAttribute, attribute);
}
-static CoglBool
+static gboolean
validate_layer_cb (CoglPipeline *pipeline,
int layer_index,
void *user_data)
@@ -566,7 +566,7 @@ validate_layer_cb (CoglPipeline *pipeline,
CoglTexture *texture =
cogl_pipeline_get_layer_texture (pipeline, layer_index);
CoglFlushLayerState *state = user_data;
- CoglBool status = TRUE;
+ gboolean status = TRUE;
/* invalid textures will be handled correctly in
* _cogl_pipeline_flush_layers_gl_state */
diff --git a/cogl/cogl/cogl-attribute.h b/cogl/cogl/cogl-attribute.h
index 04f24d12f..bad33cbd9 100644
--- a/cogl/cogl/cogl-attribute.h
+++ b/cogl/cogl/cogl-attribute.h
@@ -402,7 +402,7 @@ CoglAttribute *
cogl_attribute_new_const_2x2fv (CoglContext *context,
const char *name,
const float *matrix2x2,
- CoglBool transpose);
+ gboolean transpose);
/**
* cogl_attribute_new_const_3x3fv:
@@ -437,7 +437,7 @@ CoglAttribute *
cogl_attribute_new_const_3x3fv (CoglContext *context,
const char *name,
const float *matrix3x3,
- CoglBool transpose);
+ gboolean transpose);
/**
* cogl_attribute_new_const_4x4fv:
@@ -472,7 +472,7 @@ CoglAttribute *
cogl_attribute_new_const_4x4fv (CoglContext *context,
const char *name,
const float *matrix4x4,
- CoglBool transpose);
+ gboolean transpose);
/**
* cogl_attribute_set_normalized:
@@ -494,7 +494,7 @@ cogl_attribute_new_const_4x4fv (CoglContext *context,
*/
void
cogl_attribute_set_normalized (CoglAttribute *attribute,
- CoglBool normalized);
+ gboolean normalized);
/**
* cogl_attribute_get_normalized:
@@ -506,7 +506,7 @@ cogl_attribute_set_normalized (CoglAttribute *attribute,
* Stability: unstable
* Since: 1.10
*/
-CoglBool
+gboolean
cogl_attribute_get_normalized (CoglAttribute *attribute);
/**
@@ -545,7 +545,7 @@ cogl_attribute_set_buffer (CoglAttribute *attribute,
* Return value: %TRUE if the @object references a #CoglAttribute,
* %FALSE otherwise
*/
-CoglBool
+gboolean
cogl_is_attribute (void *object);
G_END_DECLS
diff --git a/cogl/cogl/cogl-bitmap-conversion.c b/cogl/cogl/cogl-bitmap-conversion.c
index f1b91cee3..73cf3153e 100644
--- a/cogl/cogl/cogl-bitmap-conversion.c
+++ b/cogl/cogl/cogl-bitmap-conversion.c
@@ -289,7 +289,7 @@ _cogl_bitmap_premult_unpacked_span_16 (uint16_t *data,
}
}
-static CoglBool
+static gboolean
_cogl_bitmap_can_fast_premult (CoglPixelFormat format)
{
switch (format & ~COGL_PREMULT_BIT)
@@ -305,7 +305,7 @@ _cogl_bitmap_can_fast_premult (CoglPixelFormat format)
}
}
-static CoglBool
+static gboolean
_cogl_bitmap_needs_short_temp_buffer (CoglPixelFormat format)
{
/* If the format is using more than 8 bits per component then we'll
@@ -358,7 +358,7 @@ _cogl_bitmap_needs_short_temp_buffer (CoglPixelFormat format)
return FALSE;
}
-CoglBool
+gboolean
_cogl_bitmap_convert_into_bitmap (CoglBitmap *src_bmp,
CoglBitmap *dst_bmp,
CoglError **error)
@@ -374,8 +374,8 @@ _cogl_bitmap_convert_into_bitmap (CoglBitmap *src_bmp,
int width, height;
CoglPixelFormat src_format;
CoglPixelFormat dst_format;
- CoglBool use_16;
- CoglBool need_premult;
+ gboolean use_16;
+ gboolean need_premult;
src_format = cogl_bitmap_get_format (src_bmp);
src_rowstride = cogl_bitmap_get_rowstride (src_bmp);
@@ -514,7 +514,7 @@ _cogl_bitmap_convert (CoglBitmap *src_bmp,
return dst_bmp;
}
-static CoglBool
+static gboolean
driver_can_convert (CoglContext *ctx,
CoglPixelFormat src_format,
CoglPixelFormat internal_format)
@@ -546,7 +546,7 @@ driver_can_convert (CoglContext *ctx,
CoglBitmap *
_cogl_bitmap_convert_for_upload (CoglBitmap *src_bmp,
CoglPixelFormat internal_format,
- CoglBool can_convert_in_place,
+ gboolean can_convert_in_place,
CoglError **error)
{
CoglContext *ctx = _cogl_bitmap_get_context (src_bmp);
@@ -614,7 +614,7 @@ _cogl_bitmap_convert_for_upload (CoglBitmap *src_bmp,
return dst_bmp;
}
-CoglBool
+gboolean
_cogl_bitmap_unpremult (CoglBitmap *bmp,
CoglError **error)
{
@@ -682,7 +682,7 @@ _cogl_bitmap_unpremult (CoglBitmap *bmp,
return TRUE;
}
-CoglBool
+gboolean
_cogl_bitmap_premult (CoglBitmap *bmp,
CoglError **error)
{
diff --git a/cogl/cogl/cogl-bitmap-pixbuf.c b/cogl/cogl/cogl-bitmap-pixbuf.c
index 0e4bc2036..e135d1ce6 100644
--- a/cogl/cogl/cogl-bitmap-pixbuf.c
+++ b/cogl/cogl/cogl-bitmap-pixbuf.c
@@ -40,7 +40,7 @@
#include <gdk-pixbuf/gdk-pixbuf.h>
-CoglBool
+gboolean
_cogl_bitmap_get_size_from_file (const char *filename,
int *width,
int *height)
@@ -60,7 +60,7 @@ _cogl_bitmap_from_file (CoglContext *ctx,
{
static CoglUserDataKey pixbuf_key;
GdkPixbuf *pixbuf;
- CoglBool has_alpha;
+ gboolean has_alpha;
GdkColorspace color_space;
CoglPixelFormat pixel_format;
int width;
diff --git a/cogl/cogl/cogl-bitmap-private.h b/cogl/cogl/cogl-bitmap-private.h
index 676729d55..eb06ad0c7 100644
--- a/cogl/cogl/cogl-bitmap-private.h
+++ b/cogl/cogl/cogl-bitmap-private.h
@@ -51,8 +51,8 @@ struct _CoglBitmap
uint8_t *data;
- CoglBool mapped;
- CoglBool bound;
+ gboolean mapped;
+ gboolean bound;
/* If this is non-null then 'data' is ignored and instead it is
fetched from this shared bitmap. */
@@ -109,10 +109,10 @@ _cogl_bitmap_convert (CoglBitmap *bmp,
CoglBitmap *
_cogl_bitmap_convert_for_upload (CoglBitmap *src_bmp,
CoglPixelFormat internal_format,
- CoglBool can_convert_in_place,
+ gboolean can_convert_in_place,
CoglError **error);
-CoglBool
+gboolean
_cogl_bitmap_convert_into_bitmap (CoglBitmap *src_bmp,
CoglBitmap *dst_bmp,
CoglError **error);
@@ -122,20 +122,20 @@ _cogl_bitmap_from_file (CoglContext *ctx,
const char *filename,
CoglError **error);
-CoglBool
+gboolean
_cogl_bitmap_unpremult (CoglBitmap *dst_bmp,
CoglError **error);
-CoglBool
+gboolean
_cogl_bitmap_premult (CoglBitmap *dst_bmp,
CoglError **error);
-CoglBool
+gboolean
_cogl_bitmap_convert_premult_status (CoglBitmap *bmp,
CoglPixelFormat dst_format,
CoglError **error);
-CoglBool
+gboolean
_cogl_bitmap_copy_subregion (CoglBitmap *src,
CoglBitmap *dst,
int src_x,
@@ -151,7 +151,7 @@ CoglBitmap *
_cogl_bitmap_copy (CoglBitmap *src_bmp,
CoglError **error);
-CoglBool
+gboolean
_cogl_bitmap_get_size_from_file (const char *filename,
int *width,
int *height);
diff --git a/cogl/cogl/cogl-bitmap.c b/cogl/cogl/cogl-bitmap.c
index 732fad015..5d992768a 100644
--- a/cogl/cogl/cogl-bitmap.c
+++ b/cogl/cogl/cogl-bitmap.c
@@ -63,7 +63,7 @@ _cogl_bitmap_free (CoglBitmap *bmp)
g_slice_free (CoglBitmap, bmp);
}
-CoglBool
+gboolean
_cogl_bitmap_convert_premult_status (CoglBitmap *bmp,
CoglPixelFormat dst_format,
CoglError **error)
@@ -115,7 +115,7 @@ _cogl_bitmap_copy (CoglBitmap *src_bmp,
return dst_bmp;
}
-CoglBool
+gboolean
_cogl_bitmap_copy_subregion (CoglBitmap *src,
CoglBitmap *dst,
int src_x,
@@ -130,7 +130,7 @@ _cogl_bitmap_copy_subregion (CoglBitmap *src,
uint8_t *dstdata;
int bpp;
int line;
- CoglBool succeeded = FALSE;
+ gboolean succeeded = FALSE;
/* Intended only for fast copies when format is equal! */
_COGL_RETURN_VAL_IF_FAIL ((src->format & ~COGL_PREMULT_BIT) ==
@@ -165,7 +165,7 @@ _cogl_bitmap_copy_subregion (CoglBitmap *src,
return succeeded;
}
-CoglBool
+gboolean
cogl_bitmap_get_size_from_file (const char *filename,
int *width,
int *height)
diff --git a/cogl/cogl/cogl-bitmap.h b/cogl/cogl/cogl-bitmap.h
index eda38ee8b..ad03e35d3 100644
--- a/cogl/cogl/cogl-bitmap.h
+++ b/cogl/cogl/cogl-bitmap.h
@@ -246,7 +246,7 @@ cogl_bitmap_get_buffer (CoglBitmap *bitmap);
*
* Since: 1.0
*/
-CoglBool
+gboolean
cogl_bitmap_get_size_from_file (const char *filename,
int *width,
int *height);
@@ -262,7 +262,7 @@ cogl_bitmap_get_size_from_file (const char *filename,
*
* Since: 1.0
*/
-CoglBool
+gboolean
cogl_is_bitmap (void *object);
/**
diff --git a/cogl/cogl/cogl-bitmask.c b/cogl/cogl/cogl-bitmask.c
index 7ec84b596..222cc86ea 100644
--- a/cogl/cogl/cogl-bitmask.c
+++ b/cogl/cogl/cogl-bitmask.c
@@ -56,7 +56,7 @@ _COGL_STATIC_ASSERT (sizeof (unsigned long) <= sizeof (void *),
#define BIT_MASK(bit_num) \
(1UL << BIT_INDEX (bit_num))
-CoglBool
+gboolean
_cogl_bitmask_get_from_array (const CoglBitmask *bitmask,
unsigned int bit_num)
{
@@ -90,7 +90,7 @@ _cogl_bitmask_convert_to_array (CoglBitmask *bitmask)
void
_cogl_bitmask_set_in_array (CoglBitmask *bitmask,
unsigned int bit_num,
- CoglBool value)
+ gboolean value)
{
GArray *array;
unsigned int array_index;
@@ -154,7 +154,7 @@ _cogl_bitmask_set_bits (CoglBitmask *dst,
void
_cogl_bitmask_set_range_in_array (CoglBitmask *bitmask,
unsigned int n_bits,
- CoglBool value)
+ gboolean value)
{
GArray *array;
unsigned int array_index, bit_index;
@@ -326,7 +326,7 @@ typedef struct
int *bits;
} CheckData;
-static CoglBool
+static gboolean
check_bit (int bit_num, void *user_data)
{
CheckData *data = user_data;
diff --git a/cogl/cogl/cogl-bitmask.h b/cogl/cogl/cogl-bitmask.h
index 7ec128439..7d73db0db 100644
--- a/cogl/cogl/cogl-bitmask.h
+++ b/cogl/cogl/cogl-bitmask.h
@@ -90,19 +90,19 @@ typedef struct _CoglBitmaskImaginaryType *CoglBitmask;
#define _cogl_bitmask_init(bitmask) \
G_STMT_START { *(bitmask) = _cogl_bitmask_from_bits (0); } G_STMT_END
-CoglBool
+gboolean
_cogl_bitmask_get_from_array (const CoglBitmask *bitmask,
unsigned int bit_num);
void
_cogl_bitmask_set_in_array (CoglBitmask *bitmask,
unsigned int bit_num,
- CoglBool value);
+ gboolean value);
void
_cogl_bitmask_set_range_in_array (CoglBitmask *bitmask,
unsigned int n_bits,
- CoglBool value);
+ gboolean value);
void
_cogl_bitmask_clear_all_in_array (CoglBitmask *bitmask);
@@ -143,7 +143,7 @@ _cogl_bitmask_xor_bits (CoglBitmask *dst,
const CoglBitmask *src);
/* The foreach function can return FALSE to stop iteration */
-typedef CoglBool (* CoglBitmaskForeachFunc) (int bit_num, void *user_data);
+typedef gboolean (* CoglBitmaskForeachFunc) (int bit_num, void *user_data);
/*
* cogl_bitmask_foreach:
@@ -165,7 +165,7 @@ _cogl_bitmask_foreach (const CoglBitmask *bitmask,
*
* Return value: whether bit number @bit_num is set in @bitmask
*/
-static inline CoglBool
+static inline gboolean
_cogl_bitmask_get (const CoglBitmask *bitmask, unsigned int bit_num)
{
if (_cogl_bitmask_has_array (bitmask))
@@ -185,7 +185,7 @@ _cogl_bitmask_get (const CoglBitmask *bitmask, unsigned int bit_num)
* Sets or resets a bit number @bit_num in @bitmask according to @value.
*/
static inline void
-_cogl_bitmask_set (CoglBitmask *bitmask, unsigned int bit_num, CoglBool value)
+_cogl_bitmask_set (CoglBitmask *bitmask, unsigned int bit_num, gboolean value)
{
if (_cogl_bitmask_has_array (bitmask) ||
bit_num >= COGL_BITMASK_MAX_DIRECT_BITS)
@@ -209,7 +209,7 @@ _cogl_bitmask_set (CoglBitmask *bitmask, unsigned int bit_num, CoglBool value)
static inline void
_cogl_bitmask_set_range (CoglBitmask *bitmask,
unsigned int n_bits,
- CoglBool value)
+ gboolean value)
{
if (_cogl_bitmask_has_array (bitmask) ||
n_bits > COGL_BITMASK_MAX_DIRECT_BITS)
diff --git a/cogl/cogl/cogl-blend-string.c b/cogl/cogl/cogl-blend-string.c
index 696787249..28277ccf5 100644
--- a/cogl/cogl/cogl-blend-string.c
+++ b/cogl/cogl/cogl-blend-string.c
@@ -163,7 +163,7 @@ _cogl_blend_string_split_rgba_statement (CoglBlendStringStatement *statement,
}
}
-static CoglBool
+static gboolean
validate_tex_combine_statements (CoglBlendStringStatement *statements,
int n_statements,
CoglError **error)
@@ -209,7 +209,7 @@ error:
return FALSE;
}
-static CoglBool
+static gboolean
validate_blend_statements (CoglBlendStringStatement *statements,
int n_statements,
CoglError **error)
@@ -273,7 +273,7 @@ error:
return FALSE;
}
-static CoglBool
+static gboolean
validate_statements_for_context (CoglBlendStringStatement *statements,
int n_statements,
CoglBlendStringContext context,
@@ -445,19 +445,19 @@ get_color_src_info (const char *mark,
return NULL;
}
-static CoglBool
+static gboolean
is_symbol_char (const char c)
{
return (g_ascii_isalpha (c) || c == '_') ? TRUE : FALSE;
}
-static CoglBool
+static gboolean
is_alphanum_char (const char c)
{
return (g_ascii_isalnum (c) || c == '_') ? TRUE : FALSE;
}
-static CoglBool
+static gboolean
parse_argument (const char *string, /* original user string */
const char **ret_p, /* start of argument IN:OUT */
const CoglBlendStringStatement *statement,
@@ -470,8 +470,8 @@ parse_argument (const char *string, /* original user string */
const char *mark = NULL;
const char *error_string = NULL;
ParserArgState state = PARSER_ARG_STATE_START;
- CoglBool parsing_factor = FALSE;
- CoglBool implicit_factor_brace = FALSE;
+ gboolean parsing_factor = FALSE;
+ gboolean implicit_factor_brace = FALSE;
arg->source.is_zero = FALSE;
arg->source.info = NULL;
diff --git a/cogl/cogl/cogl-blend-string.h b/cogl/cogl/cogl-blend-string.h
index 355338c61..ea198de1d 100644
--- a/cogl/cogl/cogl-blend-string.h
+++ b/cogl/cogl/cogl-blend-string.h
@@ -77,18 +77,18 @@ typedef struct _CoglBlendStringColorSourceInfo
typedef struct _CoglBlendStringColorSource
{
- CoglBool is_zero;
+ gboolean is_zero;
const CoglBlendStringColorSourceInfo *info;
int texture; /* for the TEXTURE_N color source */
- CoglBool one_minus;
+ gboolean one_minus;
CoglBlendStringChannelMask mask;
} CoglBlendStringColorSource;
typedef struct _CoglBlendStringFactor
{
- CoglBool is_one;
- CoglBool is_src_alpha_saturate;
- CoglBool is_color;
+ gboolean is_one;
+ gboolean is_src_alpha_saturate;
+ gboolean is_color;
CoglBlendStringColorSource source;
} CoglBlendStringFactor;
@@ -129,7 +129,7 @@ typedef struct _CoglBlendStringStatement
} CoglBlendStringStatement;
-CoglBool
+gboolean
_cogl_blend_string_compile (const char *string,
CoglBlendStringContext context,
CoglBlendStringStatement *statements,
diff --git a/cogl/cogl/cogl-blit.c b/cogl/cogl/cogl-blit.c
index 7a307aa78..74f404f3d 100644
--- a/cogl/cogl/cogl-blit.c
+++ b/cogl/cogl/cogl-blit.c
@@ -44,7 +44,7 @@
static const CoglBlitMode *_cogl_blit_default_mode = NULL;
-static CoglBool
+static gboolean
_cogl_blit_texture_render_begin (CoglBlitData *data)
{
CoglContext *ctx = data->src_tex->context;
@@ -144,7 +144,7 @@ _cogl_blit_texture_render_end (CoglBlitData *data)
cogl_object_unref (data->dest_fb);
}
-static CoglBool
+static gboolean
_cogl_blit_framebuffer_begin (CoglBlitData *data)
{
CoglContext *ctx = data->src_tex->context;
@@ -219,7 +219,7 @@ _cogl_blit_framebuffer_end (CoglBlitData *data)
cogl_object_unref (data->dest_fb);
}
-static CoglBool
+static gboolean
_cogl_blit_copy_tex_sub_image_begin (CoglBlitData *data)
{
CoglOffscreen *offscreen;
@@ -269,7 +269,7 @@ _cogl_blit_copy_tex_sub_image_end (CoglBlitData *data)
cogl_object_unref (data->src_fb);
}
-static CoglBool
+static gboolean
_cogl_blit_get_tex_data_begin (CoglBlitData *data)
{
data->format = _cogl_texture_get_format (data->src_tex);
diff --git a/cogl/cogl/cogl-blit.h b/cogl/cogl/cogl-blit.h
index f4e25e7fe..d3e0da233 100644
--- a/cogl/cogl/cogl-blit.h
+++ b/cogl/cogl/cogl-blit.h
@@ -41,7 +41,7 @@
typedef struct _CoglBlitData CoglBlitData;
-typedef CoglBool (* CoglBlitBeginFunc) (CoglBlitData *data);
+typedef gboolean (* CoglBlitBeginFunc) (CoglBlitData *data);
typedef void (* CoglBlitEndFunc) (CoglBlitData *data);
typedef void (* CoglBlitFunc) (CoglBlitData *data,
diff --git a/cogl/cogl/cogl-boxed-value.c b/cogl/cogl/cogl-boxed-value.c
index 5976264ca..7d55231c0 100644
--- a/cogl/cogl/cogl-boxed-value.c
+++ b/cogl/cogl/cogl-boxed-value.c
@@ -36,7 +36,7 @@
#include "cogl-context-private.h"
#include "driver/gl/cogl-util-gl-private.h"
-CoglBool
+gboolean
_cogl_boxed_value_equal (const CoglBoxedValue *bva,
const CoglBoxedValue *bvb)
{
@@ -134,7 +134,7 @@ _cogl_boxed_value_set_x (CoglBoxedValue *bv,
CoglBoxedType type,
size_t value_size,
const void *value,
- CoglBool transpose)
+ gboolean transpose)
{
if (count == 1)
{
@@ -229,7 +229,7 @@ void
_cogl_boxed_value_set_matrix (CoglBoxedValue *bv,
int dimensions,
int count,
- CoglBool transpose,
+ gboolean transpose,
const float *value)
{
_cogl_boxed_value_set_x (bv,
diff --git a/cogl/cogl/cogl-boxed-value.h b/cogl/cogl/cogl-boxed-value.h
index c8eda44dd..e049a976e 100644
--- a/cogl/cogl/cogl-boxed-value.h
+++ b/cogl/cogl/cogl-boxed-value.h
@@ -64,7 +64,7 @@ typedef struct _CoglBoxedValue
_bv->count = 1; \
} G_STMT_END
-CoglBool
+gboolean
_cogl_boxed_value_equal (const CoglBoxedValue *bva,
const CoglBoxedValue *bvb);
@@ -92,7 +92,7 @@ void
_cogl_boxed_value_set_matrix (CoglBoxedValue *bv,
int dimensions,
int count,
- CoglBool transpose,
+ gboolean transpose,
const float *value);
/*
diff --git a/cogl/cogl/cogl-buffer-private.h b/cogl/cogl/cogl-buffer-private.h
index eef3cc86a..f8e7844d5 100644
--- a/cogl/cogl/cogl-buffer-private.h
+++ b/cogl/cogl/cogl-buffer-private.h
@@ -57,7 +57,7 @@ struct _CoglBufferVtable
void (* unmap) (CoglBuffer *buffer);
- CoglBool (* set_data) (CoglBuffer *buffer,
+ gboolean (* set_data) (CoglBuffer *buffer,
unsigned int offset,
const void *data,
unsigned int size,
@@ -146,7 +146,7 @@ _cogl_buffer_immutable_ref (CoglBuffer *buffer);
void
_cogl_buffer_immutable_unref (CoglBuffer *buffer);
-CoglBool
+gboolean
_cogl_buffer_set_data (CoglBuffer *buffer,
size_t offset,
const void *data,
diff --git a/cogl/cogl/cogl-buffer.c b/cogl/cogl/cogl-buffer.c
index db162f229..53c8fab52 100644
--- a/cogl/cogl/cogl-buffer.c
+++ b/cogl/cogl/cogl-buffer.c
@@ -62,7 +62,7 @@ _cogl_buffer_register_buffer_type (const CoglObjectClass *klass)
_cogl_buffer_types = g_slist_prepend (_cogl_buffer_types, (void *) klass);
}
-CoglBool
+gboolean
cogl_is_buffer (void *object)
{
const CoglObject *obj = object;
@@ -100,7 +100,7 @@ malloc_unmap (CoglBuffer *buffer)
buffer->flags &= ~COGL_BUFFER_FLAG_MAPPED;
}
-static CoglBool
+static gboolean
malloc_set_data (CoglBuffer *buffer,
unsigned int offset,
const void *data,
@@ -119,7 +119,7 @@ _cogl_buffer_initialize (CoglBuffer *buffer,
CoglBufferUsageHint usage_hint,
CoglBufferUpdateHint update_hint)
{
- CoglBool use_malloc = FALSE;
+ gboolean use_malloc = FALSE;
buffer->context = ctx;
buffer->flags = COGL_BUFFER_FLAG_NONE;
@@ -210,7 +210,7 @@ cogl_buffer_get_update_hint (CoglBuffer *buffer)
static void
warn_about_midscene_changes (void)
{
- static CoglBool seen = FALSE;
+ static gboolean seen = FALSE;
if (!seen)
{
g_warning ("Mid-scene modification of buffers has "
@@ -359,7 +359,7 @@ _cogl_buffer_unmap_for_fill_or_fallback (CoglBuffer *buffer)
cogl_buffer_unmap (buffer);
}
-CoglBool
+gboolean
_cogl_buffer_set_data (CoglBuffer *buffer,
size_t offset,
const void *data,
@@ -375,14 +375,14 @@ _cogl_buffer_set_data (CoglBuffer *buffer,
return buffer->vtable.set_data (buffer, offset, data, size, error);
}
-CoglBool
+gboolean
cogl_buffer_set_data (CoglBuffer *buffer,
size_t offset,
const void *data,
size_t size)
{
CoglError *ignore_error = NULL;
- CoglBool status =
+ gboolean status =
_cogl_buffer_set_data (buffer, offset, data, size, &ignore_error);
if (!status)
cogl_error_free (ignore_error);
diff --git a/cogl/cogl/cogl-buffer.h b/cogl/cogl/cogl-buffer.h
index ca6f8b8a2..d7e2b439e 100644
--- a/cogl/cogl/cogl-buffer.h
+++ b/cogl/cogl/cogl-buffer.h
@@ -107,7 +107,7 @@ _cogl_buffer_error_domain (void);
* Since: 1.2
* Stability: unstable
*/
-CoglBool
+gboolean
cogl_is_buffer (void *object);
/**
@@ -314,7 +314,7 @@ cogl_buffer_unmap (CoglBuffer *buffer);
* Since: 1.2
* Stability: unstable
*/
-CoglBool
+gboolean
cogl_buffer_set_data (CoglBuffer *buffer,
size_t offset,
const void *data,
diff --git a/cogl/cogl/cogl-clip-stack.h b/cogl/cogl/cogl-clip-stack.h
index 56bc3f805..eb2c43282 100644
--- a/cogl/cogl/cogl-clip-stack.h
+++ b/cogl/cogl/cogl-clip-stack.h
@@ -136,7 +136,7 @@ struct _CoglClipStackRect
modelview matrix is that same as when a rectangle is added to the
journal. In that case we can use the original clip coordinates
and modify the rectangle instead. */
- CoglBool can_be_scissor;
+ gboolean can_be_scissor;
};
struct _CoglClipStackWindowRect
diff --git a/cogl/cogl/cogl-color.c b/cogl/cogl/cogl-color.c
index a0c673dad..db3f1ac31 100644
--- a/cogl/cogl/cogl-color.c
+++ b/cogl/cogl/cogl-color.c
@@ -300,7 +300,7 @@ cogl_color_unpremultiply (CoglColor *color)
}
}
-CoglBool
+gboolean
cogl_color_equal (const void *v1, const void *v2)
{
const uint32_t *c1 = v1, *c2 = v2;
diff --git a/cogl/cogl/cogl-color.h b/cogl/cogl/cogl-color.h
index 67b89b731..c22738506 100644
--- a/cogl/cogl/cogl-color.h
+++ b/cogl/cogl/cogl-color.h
@@ -554,7 +554,7 @@ cogl_color_unpremultiply (CoglColor *color);
*
* Since: 1.0
*/
-CoglBool
+gboolean
cogl_color_equal (const void *v1, const void *v2);
/**
diff --git a/cogl/cogl/cogl-config.c b/cogl/cogl/cogl-config.c
index 85592e930..459cab4fe 100644
--- a/cogl/cogl/cogl-config.c
+++ b/cogl/cogl/cogl-config.c
@@ -99,7 +99,7 @@ _cogl_config_read (void)
GKeyFile *key_file = g_key_file_new ();
const char * const *system_dirs = g_get_system_config_dirs ();
char *filename;
- CoglBool status = FALSE;
+ gboolean status = FALSE;
int i;
for (i = 0; system_dirs[i]; i++)
diff --git a/cogl/cogl/cogl-context-private.h b/cogl/cogl/cogl-context-private.h
index bee5bf84e..9fd5b57d4 100644
--- a/cogl/cogl/cogl-context-private.h
+++ b/cogl/cogl/cogl-context-private.h
@@ -103,7 +103,7 @@ struct _CoglContext
unsigned long private_features
[COGL_FLAGS_N_LONGS_FOR_SIZE (COGL_N_PRIVATE_FEATURES)];
- CoglBool needs_viewport_scissor_workaround;
+ gboolean needs_viewport_scissor_workaround;
CoglFramebuffer *viewport_scissor_workaround_framebuffer;
CoglPipeline *default_pipeline;
@@ -127,7 +127,7 @@ struct _CoglContext
CoglBitmask enable_custom_attributes_tmp;
CoglBitmask changed_bits_tmp;
- CoglBool legacy_backface_culling_enabled;
+ gboolean legacy_backface_culling_enabled;
/* A few handy matrix constants */
CoglMatrix identity_matrix;
@@ -185,19 +185,19 @@ struct _CoglContext
/* Some simple caching, to minimize state changes... */
CoglPipeline *current_pipeline;
unsigned long current_pipeline_changes_since_flush;
- CoglBool current_pipeline_with_color_attrib;
- CoglBool current_pipeline_unknown_color_alpha;
+ gboolean current_pipeline_with_color_attrib;
+ gboolean current_pipeline_unknown_color_alpha;
unsigned long current_pipeline_age;
- CoglBool gl_blend_enable_cache;
+ gboolean gl_blend_enable_cache;
- CoglBool depth_test_enabled_cache;
+ gboolean depth_test_enabled_cache;
CoglDepthTestFunction depth_test_function_cache;
- CoglBool depth_writing_enabled_cache;
+ gboolean depth_writing_enabled_cache;
float depth_range_near_cache;
float depth_range_far_cache;
- CoglBool legacy_depth_test_enabled;
+ gboolean legacy_depth_test_enabled;
CoglBuffer *current_buffer[COGL_BUFFER_BIND_TARGET_COUNT];
@@ -225,7 +225,7 @@ struct _CoglContext
/* This becomes TRUE the first time the context is bound to an
* onscreen buffer. This is used by cogl-framebuffer-gl to determine
* when to initialise the glDrawBuffer state */
- CoglBool was_bound_to_onscreen;
+ gboolean was_bound_to_onscreen;
/* Primitives */
CoglPath *current_path;
@@ -241,7 +241,7 @@ struct _CoglContext
CoglIndices *rectangle_short_indices;
int rectangle_short_indices_len;
- CoglBool in_begin_gl_block;
+ gboolean in_begin_gl_block;
CoglPipeline *texture_download_pipeline;
CoglPipeline *blit_texture_pipeline;
@@ -268,7 +268,7 @@ struct _CoglContext
CoglPipelineProgramType current_vertex_program_type;
GLuint current_gl_program;
- CoglBool current_gl_dither_enabled;
+ gboolean current_gl_dither_enabled;
CoglColorMask current_gl_color_mask;
GLenum current_gl_draw_buffer;
@@ -280,7 +280,7 @@ struct _CoglContext
doesn't need to be a valid pointer. We can't just use NULL in
current_clip_stack to mark a dirty state because NULL is a valid
stack (meaning no clipping) */
- CoglBool current_clip_stack_valid;
+ gboolean current_clip_stack_valid;
/* The clip state that was flushed. This isn't intended to be used
as a stack to push and pop new entries. Instead the current stack
that the user wants is part of the framebuffer state. This is
@@ -292,13 +292,13 @@ struct _CoglContext
state. If TRUE then any further use of the stencil buffer (such
as for drawing paths) would need to be merged with the existing
stencil buffer */
- CoglBool current_clip_stack_uses_stencil;
+ gboolean current_clip_stack_uses_stencil;
/* This is used as a temporary buffer to fill a CoglBuffer when
cogl_buffer_map fails and we only want to map to fill it with new
data */
GByteArray *buffer_map_fallback_array;
- CoglBool buffer_map_fallback_in_use;
+ gboolean buffer_map_fallback_in_use;
size_t buffer_map_fallback_offset;
CoglWinsysRectangleState rectangle_state;
@@ -371,7 +371,7 @@ _cogl_context_get_winsys (CoglContext *context);
* to know when to re-query the GL extensions. The backend should also
* check whether the GL context is supported by Cogl. If not it should
* return FALSE and set @error */
-CoglBool
+gboolean
_cogl_context_update_features (CoglContext *context,
CoglError **error);
diff --git a/cogl/cogl/cogl-context.c b/cogl/cogl/cogl-context.c
index c574374ed..aac25f2d2 100644
--- a/cogl/cogl/cogl-context.c
+++ b/cogl/cogl/cogl-context.c
@@ -645,7 +645,7 @@ cogl_context_get_renderer (CoglContext *context)
return context->display->renderer;
}
-CoglBool
+gboolean
_cogl_context_update_features (CoglContext *context,
CoglError **error)
{
diff --git a/cogl/cogl/cogl-context.h b/cogl/cogl/cogl-context.h
index 862a81d43..d4104625e 100644
--- a/cogl/cogl/cogl-context.h
+++ b/cogl/cogl/cogl-context.h
@@ -166,7 +166,7 @@ cogl_context_get_renderer (CoglContext *context);
* Since: 1.10
* Stability: Unstable
*/
-CoglBool
+gboolean
cogl_is_context (void *object);
/* XXX: not guarded by the EXPERIMENTAL_API defines to avoid
@@ -285,7 +285,7 @@ typedef enum _CoglFeatureID
* Since: 1.10
* Stability: unstable
*/
-CoglBool
+gboolean
cogl_has_feature (CoglContext *context, CoglFeatureID feature);
/**
@@ -305,7 +305,7 @@ cogl_has_feature (CoglContext *context, CoglFeatureID feature);
* Since: 1.10
* Stability: unstable
*/
-CoglBool
+gboolean
cogl_has_features (CoglContext *context, ...);
/**
diff --git a/cogl/cogl/cogl-debug.c b/cogl/cogl/cogl-debug.c
index 42a8356a7..cc98b6853 100644
--- a/cogl/cogl/cogl-debug.c
+++ b/cogl/cogl/cogl-debug.c
@@ -93,7 +93,7 @@ GHashTable *_cogl_debug_instances;
static void
_cogl_parse_debug_string_for_keys (const char *value,
- CoglBool enable,
+ gboolean enable,
const GDebugKey *keys,
unsigned int nkeys)
{
@@ -151,8 +151,8 @@ _cogl_parse_debug_string_for_keys (const char *value,
void
_cogl_parse_debug_string (const char *value,
- CoglBool enable,
- CoglBool ignore_help)
+ gboolean enable,
+ gboolean ignore_help)
{
if (ignore_help && strcmp (value, "help") == 0)
return;
@@ -210,7 +210,7 @@ _cogl_parse_debug_string (const char *value,
}
#ifdef COGL_ENABLE_DEBUG
-static CoglBool
+static gboolean
cogl_arg_debug_cb (const char *key,
const char *value,
void *user_data)
@@ -221,7 +221,7 @@ cogl_arg_debug_cb (const char *key,
return TRUE;
}
-static CoglBool
+static gboolean
cogl_arg_no_debug_cb (const char *key,
const char *value,
void *user_data)
@@ -267,7 +267,7 @@ _cogl_debug_check_environment (void)
}
}
-static CoglBool
+static gboolean
pre_parse_hook (GOptionContext *context,
GOptionGroup *group,
void *data,
diff --git a/cogl/cogl/cogl-debug.h b/cogl/cogl/cogl-debug.h
index 017f46560..a3068b3c1 100644
--- a/cogl/cogl/cogl-debug.h
+++ b/cogl/cogl/cogl-debug.h
@@ -112,8 +112,8 @@ _cogl_debug_check_environment (void);
void
_cogl_parse_debug_string (const char *value,
- CoglBool enable,
- CoglBool ignore_help);
+ gboolean enable,
+ gboolean ignore_help);
G_END_DECLS
diff --git a/cogl/cogl/cogl-depth-state.c b/cogl/cogl/cogl-depth-state.c
index a4fcebe0e..4e3ab8e02 100644
--- a/cogl/cogl/cogl-depth-state.c
+++ b/cogl/cogl/cogl-depth-state.c
@@ -50,13 +50,13 @@ cogl_depth_state_init (CoglDepthState *state)
void
cogl_depth_state_set_test_enabled (CoglDepthState *state,
- CoglBool enabled)
+ gboolean enabled)
{
_COGL_RETURN_IF_FAIL (state->magic == COGL_DEPTH_STATE_MAGIC);
state->test_enabled = enabled;
}
-CoglBool
+gboolean
cogl_depth_state_get_test_enabled (CoglDepthState *state)
{
_COGL_RETURN_VAL_IF_FAIL (state->magic == COGL_DEPTH_STATE_MAGIC, FALSE);
@@ -65,13 +65,13 @@ cogl_depth_state_get_test_enabled (CoglDepthState *state)
void
cogl_depth_state_set_write_enabled (CoglDepthState *state,
- CoglBool enabled)
+ gboolean enabled)
{
_COGL_RETURN_IF_FAIL (state->magic == COGL_DEPTH_STATE_MAGIC);
state->write_enabled = enabled;
}
-CoglBool
+gboolean
cogl_depth_state_get_write_enabled (CoglDepthState *state)
{
_COGL_RETURN_VAL_IF_FAIL (state->magic == COGL_DEPTH_STATE_MAGIC, FALSE);
diff --git a/cogl/cogl/cogl-depth-state.h b/cogl/cogl/cogl-depth-state.h
index e08251ff1..20c8c8ab0 100644
--- a/cogl/cogl/cogl-depth-state.h
+++ b/cogl/cogl/cogl-depth-state.h
@@ -54,9 +54,9 @@ typedef struct {
/*< private >*/
uint32_t COGL_PRIVATE (magic);
- CoglBool COGL_PRIVATE (test_enabled);
+ gboolean COGL_PRIVATE (test_enabled);
CoglDepthTestFunction COGL_PRIVATE (test_function);
- CoglBool COGL_PRIVATE (write_enabled);
+ gboolean COGL_PRIVATE (write_enabled);
float COGL_PRIVATE (range_near);
float COGL_PRIVATE (range_far);
@@ -114,7 +114,7 @@ cogl_depth_state_init (CoglDepthState *state);
*/
void
cogl_depth_state_set_test_enabled (CoglDepthState *state,
- CoglBool enable);
+ gboolean enable);
/**
* cogl_depth_state_get_test_enabled:
@@ -127,7 +127,7 @@ cogl_depth_state_set_test_enabled (CoglDepthState *state,
* Since: 2.0
* Stability: Unstable
*/
-CoglBool
+gboolean
cogl_depth_state_get_test_enabled (CoglDepthState *state);
/**
@@ -152,7 +152,7 @@ cogl_depth_state_get_test_enabled (CoglDepthState *state);
*/
void
cogl_depth_state_set_write_enabled (CoglDepthState *state,
- CoglBool enable);
+ gboolean enable);
/**
* cogl_depth_state_get_write_enabled:
@@ -165,7 +165,7 @@ cogl_depth_state_set_write_enabled (CoglDepthState *state,
* Since: 2.0
* Stability: Unstable
*/
-CoglBool
+gboolean
cogl_depth_state_get_write_enabled (CoglDepthState *state);
/**
diff --git a/cogl/cogl/cogl-display-private.h b/cogl/cogl/cogl-display-private.h
index 9788435bb..74dfb8e59 100644
--- a/cogl/cogl/cogl-display-private.h
+++ b/cogl/cogl/cogl-display-private.h
@@ -40,7 +40,7 @@ struct _CoglDisplay
{
CoglObject _parent;
- CoglBool setup;
+ gboolean setup;
CoglRenderer *renderer;
CoglOnscreenTemplate *onscreen_template;
diff --git a/cogl/cogl/cogl-display.c b/cogl/cogl/cogl-display.c
index 7d2c21a9a..00921faeb 100644
--- a/cogl/cogl/cogl-display.c
+++ b/cogl/cogl/cogl-display.c
@@ -135,7 +135,7 @@ cogl_display_set_onscreen_template (CoglDisplay *display,
display->onscreen_template = cogl_onscreen_template_new (NULL);
}
-CoglBool
+gboolean
cogl_display_setup (CoglDisplay *display,
CoglError **error)
{
diff --git a/cogl/cogl/cogl-display.h b/cogl/cogl/cogl-display.h
index 8fa55ccb4..7e6310fe3 100644
--- a/cogl/cogl/cogl-display.h
+++ b/cogl/cogl/cogl-display.h
@@ -186,7 +186,7 @@ cogl_display_set_onscreen_template (CoglDisplay *display,
* Since: 1.10
* Stability: unstable
*/
-CoglBool
+gboolean
cogl_display_setup (CoglDisplay *display,
CoglError **error);
@@ -201,7 +201,7 @@ cogl_display_setup (CoglDisplay *display,
* Since: 1.10
* Stability: unstable
*/
-CoglBool
+gboolean
cogl_is_display (void *object);
G_END_DECLS
diff --git a/cogl/cogl/cogl-driver.h b/cogl/cogl/cogl-driver.h
index 2abc0df45..893088389 100644
--- a/cogl/cogl/cogl-driver.h
+++ b/cogl/cogl/cogl-driver.h
@@ -42,7 +42,7 @@ struct _CoglDriverVtable
{
/* TODO: factor this out since this is OpenGL specific and
* so can be ignored by non-OpenGL drivers. */
- CoglBool
+ gboolean
(* pixel_format_from_gl_internal) (CoglContext *context,
GLenum gl_int_format,
CoglPixelFormat *out_format);
@@ -63,11 +63,11 @@ struct _CoglDriverVtable
GLenum *out_glformat,
GLenum *out_gltype);
- CoglBool
+ gboolean
(* update_features) (CoglContext *context,
CoglError **error);
- CoglBool
+ gboolean
(* offscreen_allocate) (CoglOffscreen *offscreen,
CoglError **error);
@@ -119,7 +119,7 @@ struct _CoglDriverVtable
int n_attributes,
CoglDrawFlags flags);
- CoglBool
+ gboolean
(* framebuffer_read_pixels_into_bitmap) (CoglFramebuffer *framebuffer,
int x,
int y,
@@ -135,7 +135,7 @@ struct _CoglDriverVtable
/* Returns TRUE if the driver can support creating a 2D texture with
* the given geometry and specified internal format.
*/
- CoglBool
+ gboolean
(* texture_2d_can_create) (CoglContext *ctx,
int width,
int height,
@@ -151,7 +151,7 @@ struct _CoglDriverVtable
/* Allocates (uninitialized) storage for the given texture according
* to the configured size and format of the texture */
- CoglBool
+ gboolean
(* texture_2d_allocate) (CoglTexture *tex,
CoglError **error);
@@ -187,7 +187,7 @@ struct _CoglDriverVtable
* Since this may need to create the underlying storage first
* it may throw a NO_MEMORY error.
*/
- CoglBool
+ gboolean
(* texture_2d_copy_from_bitmap) (CoglTexture2D *tex_2d,
int src_x,
int src_y,
@@ -199,7 +199,7 @@ struct _CoglDriverVtable
int level,
CoglError **error);
- CoglBool
+ gboolean
(* texture_2d_is_get_data_supported) (CoglTexture2D *tex_2d);
/* Reads back the full contents of the given texture and write it to
@@ -254,7 +254,7 @@ struct _CoglDriverVtable
/* Uploads data to the buffer without needing to map it necessarily
*/
- CoglBool
+ gboolean
(* buffer_set_data) (CoglBuffer *buffer,
unsigned int offset,
const void *data,
diff --git a/cogl/cogl/cogl-error.c b/cogl/cogl/cogl-error.c
index 811f3b01d..7ba5c35b3 100644
--- a/cogl/cogl/cogl-error.c
+++ b/cogl/cogl/cogl-error.c
@@ -49,7 +49,7 @@ cogl_error_copy (CoglError *error)
return (CoglError *)g_error_copy ((GError *)error);
}
-CoglBool
+gboolean
cogl_error_matches (CoglError *error,
uint32_t domain,
int code)
diff --git a/cogl/cogl/cogl-error.h b/cogl/cogl/cogl-error.h
index db4f00fea..4dc2073b3 100644
--- a/cogl/cogl/cogl-error.h
+++ b/cogl/cogl/cogl-error.h
@@ -147,7 +147,7 @@ cogl_error_copy (CoglError *error);
* Return value: whether the @error corresponds to the given @domain
* and @code.
*/
-CoglBool
+gboolean
cogl_error_matches (CoglError *error,
uint32_t domain,
int code);
diff --git a/cogl/cogl/cogl-euler.c b/cogl/cogl/cogl-euler.c
index 2c9e3f371..6dad1d24d 100644
--- a/cogl/cogl/cogl-euler.c
+++ b/cogl/cogl/cogl-euler.c
@@ -158,7 +158,7 @@ cogl_euler_init_from_matrix (CoglEuler *euler,
euler->roll = R;
}
-CoglBool
+gboolean
cogl_euler_equal (const void *v1, const void *v2)
{
const CoglEuler *a = v1;
diff --git a/cogl/cogl/cogl-euler.h b/cogl/cogl/cogl-euler.h
index 2d258077b..9b5f53aeb 100644
--- a/cogl/cogl/cogl-euler.h
+++ b/cogl/cogl/cogl-euler.h
@@ -230,7 +230,7 @@ cogl_euler_init_from_quaternion (CoglEuler *euler,
* Returns: %TRUE if @v1 and @v2 are equal else %FALSE.
* Since: 2.0
*/
-CoglBool
+gboolean
cogl_euler_equal (const void *v1, const void *v2);
/**
diff --git a/cogl/cogl/cogl-feature-private.c b/cogl/cogl/cogl-feature-private.c
index b3664c726..d9271ae2b 100644
--- a/cogl/cogl/cogl-feature-private.c
+++ b/cogl/cogl/cogl-feature-private.c
@@ -38,7 +38,7 @@
#include "cogl-renderer-private.h"
#include "cogl-private.h"
-CoglBool
+gboolean
_cogl_feature_check (CoglRenderer *renderer,
const char *driver_prefix,
const CoglFeatureData *data,
@@ -52,7 +52,7 @@ _cogl_feature_check (CoglRenderer *renderer,
const char *suffix = NULL;
int func_num;
CoglExtGlesAvailability gles_availability = 0;
- CoglBool in_core;
+ gboolean in_core;
switch (driver)
{
diff --git a/cogl/cogl/cogl-feature-private.h b/cogl/cogl/cogl-feature-private.h
index 95283df33..a297cf820 100644
--- a/cogl/cogl/cogl-feature-private.h
+++ b/cogl/cogl/cogl-feature-private.h
@@ -89,7 +89,7 @@ struct _CoglFeatureData
const CoglFeatureFunction *functions;
};
-CoglBool
+gboolean
_cogl_feature_check (CoglRenderer *renderer,
const char *driver_prefix,
const CoglFeatureData *data,
diff --git a/cogl/cogl/cogl-fence.c b/cogl/cogl/cogl-fence.c
index 70ce2d95e..eb40978b1 100644
--- a/cogl/cogl/cogl-fence.c
+++ b/cogl/cogl/cogl-fence.c
@@ -50,7 +50,7 @@ _cogl_fence_check (CoglFenceClosure *fence)
if (fence->type == FENCE_TYPE_WINSYS)
{
const CoglWinsysVtable *winsys = _cogl_context_get_winsys (context);
- CoglBool ret;
+ gboolean ret;
ret = winsys->fence_is_complete (context, fence->fence_obj);
if (!ret)
diff --git a/cogl/cogl/cogl-frame-info.h b/cogl/cogl/cogl-frame-info.h
index 1d93476a1..17bfaca3b 100644
--- a/cogl/cogl/cogl-frame-info.h
+++ b/cogl/cogl/cogl-frame-info.h
@@ -66,7 +66,7 @@ GType cogl_frame_info_get_gtype (void);
* Since: 2.0
* Stability: unstable
*/
-CoglBool
+gboolean
cogl_is_frame_info (void *object);
/**
diff --git a/cogl/cogl/cogl-framebuffer-private.h b/cogl/cogl/cogl-framebuffer-private.h
index 46a1d146d..1fa03e0e1 100644
--- a/cogl/cogl/cogl-framebuffer-private.h
+++ b/cogl/cogl/cogl-framebuffer-private.h
@@ -57,10 +57,10 @@ typedef enum _CoglFramebufferType {
typedef struct
{
CoglSwapChain *swap_chain;
- CoglBool need_stencil;
+ gboolean need_stencil;
int samples_per_pixel;
- CoglBool depth_texture_enabled;
- CoglBool stereo_enabled;
+ gboolean depth_texture_enabled;
+ gboolean stereo_enabled;
} CoglFramebufferConfig;
/* Flags to pass to _cogl_offscreen_new_with_texture_full */
@@ -140,7 +140,7 @@ struct _CoglFramebuffer
/* Format of the pixels in the framebuffer (including the expected
premult state) */
CoglPixelFormat internal_format;
- CoglBool allocated;
+ gboolean allocated;
CoglMatrixStack *modelview_stack;
CoglMatrixStack *projection_stack;
@@ -153,8 +153,8 @@ struct _CoglFramebuffer
CoglClipStack *clip_stack;
- CoglBool dither_enabled;
- CoglBool depth_writing_enabled;
+ gboolean dither_enabled;
+ gboolean depth_writing_enabled;
CoglColorMask color_mask;
CoglStereoMode stereo_mode;
@@ -181,14 +181,14 @@ struct _CoglFramebuffer
int clear_clip_y0;
int clear_clip_x1;
int clear_clip_y1;
- CoglBool clear_clip_dirty;
+ gboolean clear_clip_dirty;
/* Whether something has been drawn to the buffer since the last
* swap buffers or swap region. */
- CoglBool mid_scene;
+ gboolean mid_scene;
/* driver specific */
- CoglBool dirty_bitmasks;
+ gboolean dirty_bitmasks;
CoglFramebufferBits bits;
int samples_per_pixel;
@@ -196,7 +196,7 @@ struct _CoglFramebuffer
/* Whether the depth buffer was enabled for this framebuffer,
* usually means it needs to be cleared before being reused next.
*/
- CoglBool depth_buffer_clear_needed;
+ gboolean depth_buffer_clear_needed;
};
typedef enum {
@@ -493,7 +493,7 @@ _cogl_framebuffer_get_projection_entry (CoglFramebuffer *framebuffer)
return projection_stack->last_entry;
}
-CoglBool
+gboolean
_cogl_framebuffer_read_pixels_into_bitmap (CoglFramebuffer *framebuffer,
int x,
int y,
diff --git a/cogl/cogl/cogl-framebuffer.c b/cogl/cogl/cogl-framebuffer.c
index 8660f910a..bd8a7fa42 100644
--- a/cogl/cogl/cogl-framebuffer.c
+++ b/cogl/cogl/cogl-framebuffer.c
@@ -83,7 +83,7 @@ cogl_framebuffer_error_quark (void)
return g_quark_from_static_string ("cogl-framebuffer-error-quark");
}
-CoglBool
+gboolean
cogl_is_framebuffer (void *object)
{
CoglObject *obj = object;
@@ -224,7 +224,7 @@ _cogl_framebuffer_clear_without_flush4f (CoglFramebuffer *framebuffer,
if (!buffers)
{
- static CoglBool shown = FALSE;
+ static gboolean shown = FALSE;
if (!shown)
{
@@ -266,7 +266,7 @@ cogl_framebuffer_clear4f (CoglFramebuffer *framebuffer,
int scissor_y0;
int scissor_x1;
int scissor_y1;
- CoglBool saved_viewport_scissor_workaround;
+ gboolean saved_viewport_scissor_workaround;
if (!framebuffer->depth_buffer_clear_needed &&
(buffers & COGL_BUFFER_BIT_DEPTH))
@@ -741,7 +741,7 @@ _cogl_offscreen_free (CoglOffscreen *offscreen)
g_free (offscreen);
}
-CoglBool
+gboolean
cogl_framebuffer_allocate (CoglFramebuffer *framebuffer,
CoglError **error)
{
@@ -1126,7 +1126,7 @@ cogl_framebuffer_set_stereo_mode (CoglFramebuffer *framebuffer,
COGL_FRAMEBUFFER_STATE_STEREO_MODE;
}
-CoglBool
+gboolean
cogl_framebuffer_get_depth_write_enabled (CoglFramebuffer *framebuffer)
{
return framebuffer->depth_writing_enabled;
@@ -1134,7 +1134,7 @@ cogl_framebuffer_get_depth_write_enabled (CoglFramebuffer *framebuffer)
void
cogl_framebuffer_set_depth_write_enabled (CoglFramebuffer *framebuffer,
- CoglBool depth_write_enabled)
+ gboolean depth_write_enabled)
{
if (framebuffer->depth_writing_enabled == depth_write_enabled)
return;
@@ -1149,7 +1149,7 @@ cogl_framebuffer_set_depth_write_enabled (CoglFramebuffer *framebuffer,
COGL_FRAMEBUFFER_STATE_DEPTH_WRITE;
}
-CoglBool
+gboolean
cogl_framebuffer_get_dither_enabled (CoglFramebuffer *framebuffer)
{
return framebuffer->dither_enabled;
@@ -1157,7 +1157,7 @@ cogl_framebuffer_get_dither_enabled (CoglFramebuffer *framebuffer)
void
cogl_framebuffer_set_dither_enabled (CoglFramebuffer *framebuffer,
- CoglBool dither_enabled)
+ gboolean dither_enabled)
{
if (framebuffer->dither_enabled == dither_enabled)
return;
@@ -1172,14 +1172,14 @@ cogl_framebuffer_set_dither_enabled (CoglFramebuffer *framebuffer,
void
cogl_framebuffer_set_depth_texture_enabled (CoglFramebuffer *framebuffer,
- CoglBool enabled)
+ gboolean enabled)
{
_COGL_RETURN_IF_FAIL (!framebuffer->allocated);
framebuffer->config.depth_texture_enabled = enabled;
}
-CoglBool
+gboolean
cogl_framebuffer_get_depth_texture_enabled (CoglFramebuffer *framebuffer)
{
return framebuffer->config.depth_texture_enabled;
@@ -1268,14 +1268,14 @@ cogl_framebuffer_get_context (CoglFramebuffer *framebuffer)
return framebuffer->context;
}
-static CoglBool
+static gboolean
_cogl_framebuffer_try_fast_read_pixel (CoglFramebuffer *framebuffer,
int x,
int y,
CoglReadPixelsFlags source,
CoglBitmap *bitmap)
{
- CoglBool found_intersection;
+ gboolean found_intersection;
CoglPixelFormat format;
if (G_UNLIKELY (COGL_DEBUG_ENABLED (COGL_DEBUG_DISABLE_FAST_READ_PIXEL)))
@@ -1347,7 +1347,7 @@ _cogl_framebuffer_try_fast_read_pixel (CoglFramebuffer *framebuffer,
return FALSE;
}
-CoglBool
+gboolean
_cogl_framebuffer_read_pixels_into_bitmap (CoglFramebuffer *framebuffer,
int x,
int y,
@@ -1397,7 +1397,7 @@ _cogl_framebuffer_read_pixels_into_bitmap (CoglFramebuffer *framebuffer,
error);
}
-CoglBool
+gboolean
cogl_framebuffer_read_pixels_into_bitmap (CoglFramebuffer *framebuffer,
int x,
int y,
@@ -1405,7 +1405,7 @@ cogl_framebuffer_read_pixels_into_bitmap (CoglFramebuffer *framebuffer,
CoglBitmap *bitmap)
{
CoglError *ignore_error = NULL;
- CoglBool status =
+ gboolean status =
_cogl_framebuffer_read_pixels_into_bitmap (framebuffer,
x, y, source, bitmap,
&ignore_error);
@@ -1414,7 +1414,7 @@ cogl_framebuffer_read_pixels_into_bitmap (CoglFramebuffer *framebuffer,
return status;
}
-CoglBool
+gboolean
cogl_framebuffer_read_pixels (CoglFramebuffer *framebuffer,
int x,
int y,
@@ -1425,7 +1425,7 @@ cogl_framebuffer_read_pixels (CoglFramebuffer *framebuffer,
{
int bpp = _cogl_pixel_format_get_bytes_per_pixel (format);
CoglBitmap *bitmap;
- CoglBool ret;
+ gboolean ret;
bitmap = cogl_bitmap_new_for_data (framebuffer->context,
width, height,
@@ -2097,7 +2097,7 @@ get_wire_line_indices (CoglContext *ctx,
return ret;
}
-static CoglBool
+static gboolean
remove_layer_cb (CoglPipeline *pipeline,
int layer_index,
void *user_data)
diff --git a/cogl/cogl/cogl-framebuffer.h b/cogl/cogl/cogl-framebuffer.h
index 6d36c4ab6..1f290c413 100644
--- a/cogl/cogl/cogl-framebuffer.h
+++ b/cogl/cogl/cogl-framebuffer.h
@@ -123,7 +123,7 @@ GType cogl_framebuffer_get_gtype (void);
* Since: 1.8
* Stability: unstable
*/
-CoglBool
+gboolean
cogl_framebuffer_allocate (CoglFramebuffer *framebuffer,
CoglError **error);
@@ -736,7 +736,7 @@ cogl_framebuffer_get_depth_bits (CoglFramebuffer *framebuffer);
* Since: 1.20
* Stability: unstable
*/
-CoglBool
+gboolean
cogl_framebuffer_get_is_stereo (CoglFramebuffer *framebuffer);
/**
@@ -754,7 +754,7 @@ cogl_framebuffer_get_is_stereo (CoglFramebuffer *framebuffer);
* Since: 1.8
* Stability: unstable
*/
-CoglBool
+gboolean
cogl_framebuffer_get_dither_enabled (CoglFramebuffer *framebuffer);
/**
@@ -781,7 +781,7 @@ cogl_framebuffer_get_dither_enabled (CoglFramebuffer *framebuffer);
*/
void
cogl_framebuffer_set_dither_enabled (CoglFramebuffer *framebuffer,
- CoglBool dither_enabled);
+ gboolean dither_enabled);
/**
* cogl_framebuffer_get_depth_write_enabled:
@@ -794,7 +794,7 @@ cogl_framebuffer_set_dither_enabled (CoglFramebuffer *framebuffer,
* Since: 1.18
* Stability: unstable
*/
-CoglBool
+gboolean
cogl_framebuffer_get_depth_write_enabled (CoglFramebuffer *framebuffer);
/**
@@ -814,7 +814,7 @@ cogl_framebuffer_get_depth_write_enabled (CoglFramebuffer *framebuffer);
*/
void
cogl_framebuffer_set_depth_write_enabled (CoglFramebuffer *framebuffer,
- CoglBool depth_write_enabled);
+ gboolean depth_write_enabled);
/**
* cogl_framebuffer_get_color_mask:
@@ -904,7 +904,7 @@ cogl_framebuffer_set_stereo_mode (CoglFramebuffer *framebuffer,
*/
void
cogl_framebuffer_set_depth_texture_enabled (CoglFramebuffer *framebuffer,
- CoglBool enabled);
+ gboolean enabled);
/**
* cogl_framebuffer_get_depth_texture_enabled:
@@ -919,7 +919,7 @@ cogl_framebuffer_set_depth_texture_enabled (CoglFramebuffer *framebuffer,
* Since: 1.14
* Stability: unstable
*/
-CoglBool
+gboolean
cogl_framebuffer_get_depth_texture_enabled (CoglFramebuffer *framebuffer);
/**
@@ -1749,7 +1749,7 @@ cogl_framebuffer_finish (CoglFramebuffer *framebuffer);
* Since: 1.10
* Stability: unstable
*/
-CoglBool
+gboolean
cogl_framebuffer_read_pixels_into_bitmap (CoglFramebuffer *framebuffer,
int x,
int y,
@@ -1795,7 +1795,7 @@ cogl_framebuffer_read_pixels_into_bitmap (CoglFramebuffer *framebuffer,
* Since: 1.10
* Stability: unstable
*/
-CoglBool
+gboolean
cogl_framebuffer_read_pixels (CoglFramebuffer *framebuffer,
int x,
int y,
@@ -1842,7 +1842,7 @@ typedef enum { /*< prefix=COGL_FRAMEBUFFER_ERROR >*/
* Since: 1.10
* Stability: unstable
*/
-CoglBool
+gboolean
cogl_is_framebuffer (void *object);
G_END_DECLS
diff --git a/cogl/cogl/cogl-gles2-context-private.h b/cogl/cogl/cogl-gles2-context-private.h
index 805b06468..f9e4e1f77 100644
--- a/cogl/cogl/cogl-gles2-context-private.h
+++ b/cogl/cogl/cogl-gles2-context-private.h
@@ -67,7 +67,7 @@ typedef struct
/* Set once this object has had glDeleteShader called on it. We need
* to keep track of this so we don't deref the data twice if the
* application calls glDeleteShader multiple times */
- CoglBool deleted;
+ gboolean deleted;
} CoglGLES2ShaderData;
typedef enum
@@ -96,7 +96,7 @@ typedef struct
/* Set once this object has had glDeleteProgram called on it. We need
* to keep track of this so we don't deref the data twice if the
* application calls glDeleteProgram multiple times */
- CoglBool deleted;
+ gboolean deleted;
GLuint flip_vector_location;
@@ -136,7 +136,7 @@ struct _CoglGLES2Context
/* This is set to FALSE until the first time the GLES2 context is
* bound to something. We need to keep track of this so we can set
* the viewport and scissor the first time it is bound. */
- CoglBool has_been_bound;
+ gboolean has_been_bound;
CoglFramebuffer *read_buffer;
CoglGLES2Offscreen *gles2_read_buffer;
@@ -172,11 +172,11 @@ struct _CoglGLES2Context
/* The following state is tracked separately from the GL context
* because we need to modify it depending on whether we are flipping
* the geometry. */
- CoglBool viewport_dirty;
+ gboolean viewport_dirty;
int viewport[4];
- CoglBool scissor_dirty;
+ gboolean scissor_dirty;
int scissor[4];
- CoglBool front_face_dirty;
+ gboolean front_face_dirty;
GLenum front_face;
/* We need to keep track of the pack alignment so we can flip the
diff --git a/cogl/cogl/cogl-gles2-context.c b/cogl/cogl/cogl-gles2-context.c
index 932ee6ca2..fc78c1dc3 100644
--- a/cogl/cogl/cogl-gles2-context.c
+++ b/cogl/cogl/cogl-gles2-context.c
@@ -139,7 +139,7 @@ detach_shader (CoglGLES2ProgramData *program_data,
}
}
-static CoglBool
+static gboolean
is_symbol_character (char ch)
{
return g_ascii_isalnum (ch) || ch == '_';
@@ -1775,7 +1775,7 @@ _cogl_gles2_offscreen_allocate (CoglOffscreen *offscreen,
return gles2_offscreen;
}
-CoglBool
+gboolean
cogl_push_gles2_context (CoglContext *ctx,
CoglGLES2Context *gles2_ctx,
CoglFramebuffer *read_buffer,
@@ -1955,7 +1955,7 @@ cogl_gles2_texture_2d_new_from_handle (CoglContext *ctx,
format);
}
-CoglBool
+gboolean
cogl_gles2_texture_get_handle (CoglTexture *texture,
unsigned int *handle,
unsigned int *target)
diff --git a/cogl/cogl/cogl-gles2.h b/cogl/cogl/cogl-gles2.h
index cd8bce76f..1fa7e6e7c 100644
--- a/cogl/cogl/cogl-gles2.h
+++ b/cogl/cogl/cogl-gles2.h
@@ -266,7 +266,7 @@ cogl_gles2_context_get_vtable (CoglGLES2Context *gles2_ctx);
* otherwise and @error will be updated.
* Stability: unstable
*/
-CoglBool
+gboolean
cogl_push_gles2_context (CoglContext *ctx,
CoglGLES2Context *gles2_ctx,
CoglFramebuffer *read_buffer,
@@ -378,7 +378,7 @@ cogl_gles2_texture_2d_new_from_handle (CoglContext *ctx,
* Since: 2.0
* Stability: unstable
*/
-CoglBool
+gboolean
cogl_gles2_texture_get_handle (CoglTexture *texture,
unsigned int *handle,
unsigned int *target);
@@ -394,7 +394,7 @@ cogl_gles2_texture_get_handle (CoglTexture *texture,
* Since: 2.0
* Stability: unstable
*/
-CoglBool
+gboolean
cogl_is_gles2_context (void *object);
G_END_DECLS
diff --git a/cogl/cogl/cogl-glib-source.c b/cogl/cogl/cogl-glib-source.c
index fa6d10a08..aa86c828d 100644
--- a/cogl/cogl/cogl-glib-source.c
+++ b/cogl/cogl/cogl-glib-source.c
@@ -45,7 +45,7 @@ typedef struct _CoglGLibSource
int64_t expiration_time;
} CoglGLibSource;
-static CoglBool
+static gboolean
cogl_glib_source_prepare (GSource *source, int *timeout)
{
CoglGLibSource *cogl_source = (CoglGLibSource *) source;
@@ -109,7 +109,7 @@ cogl_glib_source_prepare (GSource *source, int *timeout)
return *timeout == 0;
}
-static CoglBool
+static gboolean
cogl_glib_source_check (GSource *source)
{
CoglGLibSource *cogl_source = (CoglGLibSource *) source;
@@ -129,7 +129,7 @@ cogl_glib_source_check (GSource *source)
return FALSE;
}
-static CoglBool
+static gboolean
cogl_glib_source_dispatch (GSource *source,
GSourceFunc callback,
void *user_data)
diff --git a/cogl/cogl/cogl-glsl-shader.c b/cogl/cogl/cogl-glsl-shader.c
index d5d4e5c19..d30f3de50 100644
--- a/cogl/cogl/cogl-glsl-shader.c
+++ b/cogl/cogl/cogl-glsl-shader.c
@@ -43,7 +43,7 @@
#include <glib.h>
-static CoglBool
+static gboolean
add_layer_vertex_boilerplate_cb (CoglPipelineLayer *layer,
void *user_data)
{
@@ -61,7 +61,7 @@ add_layer_vertex_boilerplate_cb (CoglPipelineLayer *layer,
return TRUE;
}
-static CoglBool
+static gboolean
add_layer_fragment_boilerplate_cb (CoglPipelineLayer *layer,
void *user_data)
{
diff --git a/cogl/cogl/cogl-glx-display-private.h b/cogl/cogl/cogl-glx-display-private.h
index 1d1afc0cf..265868c40 100644
--- a/cogl/cogl/cogl-glx-display-private.h
+++ b/cogl/cogl/cogl-glx-display-private.h
@@ -37,10 +37,10 @@ typedef struct _CoglGLXCachedConfig
{
/* This will be -1 if there is no cached config in this slot */
int depth;
- CoglBool found;
+ gboolean found;
GLXFBConfig fb_config;
- CoglBool stereo;
- CoglBool can_mipmap;
+ gboolean stereo;
+ gboolean can_mipmap;
} CoglGLXCachedConfig;
#define COGL_GLX_N_CACHED_CONFIGS 6
@@ -49,11 +49,11 @@ typedef struct _CoglGLXDisplay
{
CoglGLXCachedConfig glx_cached_configs[COGL_GLX_N_CACHED_CONFIGS];
- CoglBool found_fbconfig;
- CoglBool fbconfig_has_rgba_visual;
- CoglBool is_direct;
- CoglBool have_vblank_counter;
- CoglBool can_vblank_wait;
+ gboolean found_fbconfig;
+ gboolean fbconfig_has_rgba_visual;
+ gboolean is_direct;
+ gboolean have_vblank_counter;
+ gboolean can_vblank_wait;
GLXFBConfig fbconfig;
/* Single context for all wins */
diff --git a/cogl/cogl/cogl-gpu-info.c b/cogl/cogl/cogl-gpu-info.c
index d303da197..f44319e96 100644
--- a/cogl/cogl/cogl-gpu-info.c
+++ b/cogl/cogl/cogl-gpu-info.c
@@ -51,7 +51,7 @@ typedef struct CoglGpuInfoArchitectureDescription
CoglGpuInfoArchitecture architecture;
const char *name;
CoglGpuInfoArchitectureFlag flags;
- CoglBool (* check_function) (const CoglGpuInfoStrings *strings);
+ gboolean (* check_function) (const CoglGpuInfoStrings *strings);
} CoglGpuInfoArchitectureDescription;
@@ -59,7 +59,7 @@ typedef struct
{
CoglGpuInfoVendor vendor;
const char *name;
- CoglBool (* check_function) (const CoglGpuInfoStrings *strings);
+ gboolean (* check_function) (const CoglGpuInfoStrings *strings);
const CoglGpuInfoArchitectureDescription *architectures;
} CoglGpuInfoVendorDescription;
@@ -68,11 +68,11 @@ typedef struct
{
CoglGpuInfoDriverPackage driver_package;
const char *name;
- CoglBool (* check_function) (const CoglGpuInfoStrings *strings,
+ gboolean (* check_function) (const CoglGpuInfoStrings *strings,
int *version_out);
} CoglGpuInfoDriverPackageDescription;
-static CoglBool
+static gboolean
_cogl_gpu_info_parse_version_string (const char *version_string,
int n_components,
const char **tail,
@@ -111,7 +111,7 @@ _cogl_gpu_info_parse_version_string (const char *version_string,
return TRUE;
}
-static CoglBool
+static gboolean
match_phrase (const char *string, const char *phrase)
{
const char *part = strstr (string, phrase);
@@ -134,13 +134,13 @@ match_phrase (const char *string, const char *phrase)
return TRUE;
}
-static CoglBool
+static gboolean
check_intel_vendor (const CoglGpuInfoStrings *strings)
{
return match_phrase (strings->renderer_string, "Intel(R)");
}
-static CoglBool
+static gboolean
check_imagination_technologies_vendor (const CoglGpuInfoStrings *strings)
{
if (strcmp (strings->vendor_string, "Imagination Technologies") != 0)
@@ -148,7 +148,7 @@ check_imagination_technologies_vendor (const CoglGpuInfoStrings *strings)
return TRUE;
}
-static CoglBool
+static gboolean
check_arm_vendor (const CoglGpuInfoStrings *strings)
{
if (strcmp (strings->vendor_string, "ARM") != 0)
@@ -156,7 +156,7 @@ check_arm_vendor (const CoglGpuInfoStrings *strings)
return TRUE;
}
-static CoglBool
+static gboolean
check_qualcomm_vendor (const CoglGpuInfoStrings *strings)
{
if (strcmp (strings->vendor_string, "Qualcomm") != 0)
@@ -164,7 +164,7 @@ check_qualcomm_vendor (const CoglGpuInfoStrings *strings)
return TRUE;
}
-static CoglBool
+static gboolean
check_nvidia_vendor (const CoglGpuInfoStrings *strings)
{
if (strcmp (strings->vendor_string, "NVIDIA") != 0 &&
@@ -174,7 +174,7 @@ check_nvidia_vendor (const CoglGpuInfoStrings *strings)
return TRUE;
}
-static CoglBool
+static gboolean
check_ati_vendor (const CoglGpuInfoStrings *strings)
{
if (strcmp (strings->vendor_string, "ATI") != 0)
@@ -183,7 +183,7 @@ check_ati_vendor (const CoglGpuInfoStrings *strings)
return TRUE;
}
-static CoglBool
+static gboolean
check_mesa_vendor (const CoglGpuInfoStrings *strings)
{
if (strcmp (strings->vendor_string, "Tungsten Graphics, Inc") == 0)
@@ -196,39 +196,39 @@ check_mesa_vendor (const CoglGpuInfoStrings *strings)
return FALSE;
}
-static CoglBool
+static gboolean
check_true (const CoglGpuInfoStrings *strings)
{
/* This is a last resort so it always matches */
return TRUE;
}
-static CoglBool
+static gboolean
check_sandybridge_architecture (const CoglGpuInfoStrings *strings)
{
return match_phrase (strings->renderer_string, "Sandybridge");
}
-static CoglBool
+static gboolean
check_llvmpipe_architecture (const CoglGpuInfoStrings *strings)
{
return match_phrase (strings->renderer_string, "llvmpipe");
}
-static CoglBool
+static gboolean
check_softpipe_architecture (const CoglGpuInfoStrings *strings)
{
return match_phrase (strings->renderer_string, "softpipe");
}
-static CoglBool
+static gboolean
check_swrast_architecture (const CoglGpuInfoStrings *strings)
{
return match_phrase (strings->renderer_string, "software rasterizer") ||
match_phrase (strings->renderer_string, "Software Rasterizer");
}
-static CoglBool
+static gboolean
check_sgx_architecture (const CoglGpuInfoStrings *strings)
{
if (strncmp (strings->renderer_string, "PowerVR SGX", 12) != 0)
@@ -237,7 +237,7 @@ check_sgx_architecture (const CoglGpuInfoStrings *strings)
return TRUE;
}
-static CoglBool
+static gboolean
check_mali_architecture (const CoglGpuInfoStrings *strings)
{
if (strncmp (strings->renderer_string, "Mali-", 5) != 0)
@@ -408,7 +408,7 @@ _cogl_gpu_info_vendors[] =
}
};
-static CoglBool
+static gboolean
check_mesa_driver_package (const CoglGpuInfoStrings *strings,
int *version_ret)
{
@@ -480,7 +480,7 @@ UNIT_TEST (check_mesa_driver_package_parser,
}
}
-static CoglBool
+static gboolean
check_unknown_driver_package (const CoglGpuInfoStrings *strings,
int *version_out)
{
diff --git a/cogl/cogl/cogl-index-buffer.h b/cogl/cogl/cogl-index-buffer.h
index ed1ddc53e..9ee975e32 100644
--- a/cogl/cogl/cogl-index-buffer.h
+++ b/cogl/cogl/cogl-index-buffer.h
@@ -94,7 +94,7 @@ cogl_index_buffer_new (CoglContext *context,
* Since: 1.4
* Stability: Unstable
*/
-CoglBool
+gboolean
cogl_is_index_buffer (void *object);
G_END_DECLS
diff --git a/cogl/cogl/cogl-indices.c b/cogl/cogl/cogl-indices.c
index fc336b0b6..49877f859 100644
--- a/cogl/cogl/cogl-indices.c
+++ b/cogl/cogl/cogl-indices.c
@@ -136,7 +136,7 @@ cogl_indices_get_offset (CoglIndices *indices)
static void
warn_about_midscene_changes (void)
{
- static CoglBool seen = FALSE;
+ static gboolean seen = FALSE;
if (!seen)
{
g_warning ("Mid-scene modification of indices has "
diff --git a/cogl/cogl/cogl-indices.h b/cogl/cogl/cogl-indices.h
index 365271d55..5a1f3beb5 100644
--- a/cogl/cogl/cogl-indices.h
+++ b/cogl/cogl/cogl-indices.h
@@ -152,7 +152,7 @@ cogl_get_rectangle_indices (CoglContext *context, int n_rectangles);
* Since: 1.10
* Stability: unstable
*/
-CoglBool
+gboolean
cogl_is_indices (void *object);
G_END_DECLS
diff --git a/cogl/cogl/cogl-journal-private.h b/cogl/cogl/cogl-journal-private.h
index 8211359fa..5d38877d4 100644
--- a/cogl/cogl/cogl-journal-private.h
+++ b/cogl/cogl/cogl-journal-private.h
@@ -101,21 +101,21 @@ _cogl_journal_flush (CoglJournal *journal);
void
_cogl_journal_discard (CoglJournal *journal);
-CoglBool
+gboolean
_cogl_journal_all_entries_within_bounds (CoglJournal *journal,
float clip_x0,
float clip_y0,
float clip_x1,
float clip_y1);
-CoglBool
+gboolean
_cogl_journal_try_read_pixel (CoglJournal *journal,
int x,
int y,
CoglBitmap *bitmap,
- CoglBool *found_intersection);
+ gboolean *found_intersection);
-CoglBool
+gboolean
_cogl_is_journal (void *object);
#endif /* __COGL_JOURNAL_PRIVATE_H */
diff --git a/cogl/cogl/cogl-journal.c b/cogl/cogl/cogl-journal.c
index 34d9bbbaf..46b1fae36 100644
--- a/cogl/cogl/cogl-journal.c
+++ b/cogl/cogl/cogl-journal.c
@@ -119,7 +119,7 @@ typedef struct _CoglJournalFlushState
typedef void (*CoglJournalBatchCallback) (CoglJournalEntry *start,
int n_entries,
void *data);
-typedef CoglBool (*CoglJournalBatchTest) (CoglJournalEntry *entry0,
+typedef gboolean (*CoglJournalBatchTest) (CoglJournalEntry *entry0,
CoglJournalEntry *entry1);
static void _cogl_journal_free (CoglJournal *journal);
@@ -403,7 +403,7 @@ _cogl_journal_flush_modelview_and_entries (CoglJournalEntry *batch_start,
COGL_TIMER_STOP (_cogl_uprof_context, time_flush_modelview_and_entries);
}
-static CoglBool
+static gboolean
compare_entry_modelviews (CoglJournalEntry *entry0,
CoglJournalEntry *entry1)
{
@@ -448,7 +448,7 @@ _cogl_journal_flush_pipeline_and_entries (CoglJournalEntry *batch_start,
COGL_TIMER_STOP (_cogl_uprof_context, time_flush_pipeline_entries);
}
-static CoglBool
+static gboolean
compare_entry_pipelines (CoglJournalEntry *entry0, CoglJournalEntry *entry1)
{
/* batch rectangles using compatible pipelines */
@@ -470,7 +470,7 @@ typedef struct _CreateAttributeState
CoglJournalFlushState *flush_state;
} CreateAttributeState;
-static CoglBool
+static gboolean
create_attribute_cb (CoglPipeline *pipeline,
int layer_number,
void *user_data)
@@ -568,7 +568,7 @@ _cogl_journal_flush_texcoord_vbo_offsets_and_entries (
COGL_TIMER_STOP (_cogl_uprof_context, time_flush_texcoord_pipeline_entries);
}
-static CoglBool
+static gboolean
compare_entry_layer_numbers (CoglJournalEntry *entry0, CoglJournalEntry *entry1)
{
if (_cogl_pipeline_layer_numbers_equal (entry0->pipeline, entry1->pipeline))
@@ -683,7 +683,7 @@ _cogl_journal_flush_vbo_offsets_and_entries (CoglJournalEntry *batch_start,
time_flush_vbo_texcoord_pipeline_entries);
}
-static CoglBool
+static gboolean
compare_entry_strides (CoglJournalEntry *entry0, CoglJournalEntry *entry1)
{
/* Currently the only thing that affects the stride for our vertex arrays
@@ -763,7 +763,7 @@ typedef struct
float x_2, y_2;
} ClipBounds;
-static CoglBool
+static gboolean
can_software_clip_entry (CoglJournalEntry *journal_entry,
CoglJournalEntry *prev_journal_entry,
CoglClipStack *clip_stack,
@@ -1038,7 +1038,7 @@ _cogl_journal_maybe_software_clip_entries (CoglJournalEntry *batch_start,
time_check_software_clip);
}
-static CoglBool
+static gboolean
compare_entry_clip_stacks (CoglJournalEntry *entry0, CoglJournalEntry *entry1)
{
return entry0->clip_stack == entry1->clip_stack;
@@ -1209,7 +1209,7 @@ _cogl_journal_discard (CoglJournal *journal)
/* Note: A return value of FALSE doesn't mean 'no' it means
* 'unknown' */
-CoglBool
+gboolean
_cogl_journal_all_entries_within_bounds (CoglJournal *journal,
float clip_x0,
float clip_y0,
@@ -1254,7 +1254,7 @@ _cogl_journal_all_entries_within_bounds (CoglJournal *journal,
*/
for (i = 1; i < journal->entries->len; i++)
{
- CoglBool found_reference = FALSE;
+ gboolean found_reference = FALSE;
entry = &g_array_index (journal->entries, CoglJournalEntry, i);
for (clip_entry = entry->clip_stack;
@@ -1416,7 +1416,7 @@ _cogl_journal_flush (CoglJournal *journal)
COGL_TIMER_STOP (_cogl_uprof_context, flush_timer);
}
-static CoglBool
+static gboolean
add_framebuffer_deps_cb (CoglPipelineLayer *layer, void *user_data)
{
CoglFramebuffer *framebuffer = user_data;
@@ -1664,16 +1664,16 @@ entry_to_screen_polygon (CoglFramebuffer *framebuffer,
#undef VIEWPORT_TRANSFORM_Y
}
-static CoglBool
+static gboolean
try_checking_point_hits_entry_after_clipping (CoglFramebuffer *framebuffer,
CoglJournalEntry *entry,
float *vertices,
float x,
float y,
- CoglBool *hit)
+ gboolean *hit)
{
- CoglBool can_software_clip = TRUE;
- CoglBool needs_software_clip = FALSE;
+ gboolean can_software_clip = TRUE;
+ gboolean needs_software_clip = FALSE;
CoglClipStack *clip_entry;
*hit = TRUE;
@@ -1737,12 +1737,12 @@ try_checking_point_hits_entry_after_clipping (CoglFramebuffer *framebuffer,
return TRUE;
}
-CoglBool
+gboolean
_cogl_journal_try_read_pixel (CoglJournal *journal,
int x,
int y,
CoglBitmap *bitmap,
- CoglBool *found_intersection)
+ gboolean *found_intersection)
{
CoglContext *ctx;
CoglPixelFormat format;
@@ -1795,7 +1795,7 @@ _cogl_journal_try_read_pixel (CoglJournal *journal,
if (entry->clip_stack)
{
- CoglBool hit;
+ gboolean hit;
if (!try_checking_point_hits_entry_after_clipping (framebuffer,
entry,
diff --git a/cogl/cogl/cogl-matrix-stack-private.h b/cogl/cogl/cogl-matrix-stack-private.h
index 0d5caf8b9..bc649593d 100644
--- a/cogl/cogl/cogl-matrix-stack-private.h
+++ b/cogl/cogl/cogl-matrix-stack-private.h
@@ -137,7 +137,7 @@ typedef struct _CoglMatrixEntrySave
CoglMatrixEntry _parent_data;
CoglMatrix *cache;
- CoglBool cache_valid;
+ gboolean cache_valid;
} CoglMatrixEntrySave;
@@ -166,8 +166,8 @@ struct _CoglMatrixStack
typedef struct _CoglMatrixEntryCache
{
CoglMatrixEntry *entry;
- CoglBool flushed_identity;
- CoglBool flipped;
+ gboolean flushed_identity;
+ gboolean flipped;
} CoglMatrixEntryCache;
void
@@ -184,15 +184,15 @@ _cogl_matrix_entry_flush_to_gl_builtins (CoglContext *ctx,
CoglMatrixEntry *entry,
CoglMatrixMode mode,
CoglFramebuffer *framebuffer,
- CoglBool disable_flip);
+ gboolean disable_flip);
void
_cogl_matrix_entry_cache_init (CoglMatrixEntryCache *cache);
-CoglBool
+gboolean
_cogl_matrix_entry_cache_maybe_update (CoglMatrixEntryCache *cache,
CoglMatrixEntry *entry,
- CoglBool flip);
+ gboolean flip);
void
_cogl_matrix_entry_cache_destroy (CoglMatrixEntryCache *cache);
diff --git a/cogl/cogl/cogl-matrix-stack.c b/cogl/cogl/cogl-matrix-stack.c
index 7920701d7..b058f1962 100644
--- a/cogl/cogl/cogl-matrix-stack.c
+++ b/cogl/cogl/cogl-matrix-stack.c
@@ -427,7 +427,7 @@ cogl_matrix_stack_pop (CoglMatrixStack *stack)
stack->last_entry = new_top;
}
-CoglBool
+gboolean
cogl_matrix_stack_get_inverse (CoglMatrixStack *stack,
CoglMatrix *inverse)
{
@@ -686,7 +686,7 @@ _cogl_matrix_entry_skip_saves (CoglMatrixEntry *entry)
return entry;
}
-CoglBool
+gboolean
cogl_matrix_entry_calculate_translation (CoglMatrixEntry *entry0,
CoglMatrixEntry *entry1,
float *x,
@@ -813,7 +813,7 @@ cogl_matrix_entry_calculate_translation (CoglMatrixEntry *entry0,
return TRUE;
}
-CoglBool
+gboolean
cogl_matrix_entry_is_identity (CoglMatrixEntry *entry)
{
return entry ? entry->op == COGL_MATRIX_OP_LOAD_IDENTITY : FALSE;
@@ -821,7 +821,7 @@ cogl_matrix_entry_is_identity (CoglMatrixEntry *entry)
static void
_cogl_matrix_flush_to_gl_builtin (CoglContext *ctx,
- CoglBool is_identity,
+ gboolean is_identity,
CoglMatrix *matrix,
CoglMatrixMode mode)
{
@@ -863,13 +863,13 @@ _cogl_matrix_entry_flush_to_gl_builtins (CoglContext *ctx,
CoglMatrixEntry *entry,
CoglMatrixMode mode,
CoglFramebuffer *framebuffer,
- CoglBool disable_flip)
+ gboolean disable_flip)
{
g_assert (_cogl_has_private_feature (ctx, COGL_PRIVATE_FEATURE_GL_FIXED));
#ifdef HAVE_COGL_GL
{
- CoglBool needs_flip;
+ gboolean needs_flip;
CoglMatrixEntryCache *cache;
if (mode == COGL_MATRIX_PROJECTION)
@@ -901,7 +901,7 @@ _cogl_matrix_entry_flush_to_gl_builtins (CoglContext *ctx,
if (!cache ||
_cogl_matrix_entry_cache_maybe_update (cache, entry, needs_flip))
{
- CoglBool is_identity;
+ gboolean is_identity;
CoglMatrix matrix;
if (entry->op == COGL_MATRIX_OP_LOAD_IDENTITY)
@@ -940,7 +940,7 @@ _cogl_matrix_entry_flush_to_gl_builtins (CoglContext *ctx,
#endif
}
-CoglBool
+gboolean
cogl_matrix_entry_equal (CoglMatrixEntry *entry0,
CoglMatrixEntry *entry1)
{
@@ -1162,13 +1162,13 @@ _cogl_matrix_entry_cache_init (CoglMatrixEntryCache *cache)
/* NB: This function can report false negatives since it never does a
* deep comparison of the stack matrices. */
-CoglBool
+gboolean
_cogl_matrix_entry_cache_maybe_update (CoglMatrixEntryCache *cache,
CoglMatrixEntry *entry,
- CoglBool flip)
+ gboolean flip)
{
- CoglBool is_identity;
- CoglBool updated = FALSE;
+ gboolean is_identity;
+ gboolean updated = FALSE;
if (cache->flipped != flip)
{
diff --git a/cogl/cogl/cogl-matrix-stack.h b/cogl/cogl/cogl-matrix-stack.h
index 8d936b218..4be9f59c2 100644
--- a/cogl/cogl/cogl-matrix-stack.h
+++ b/cogl/cogl/cogl-matrix-stack.h
@@ -429,7 +429,7 @@ cogl_matrix_stack_orthographic (CoglMatrixStack *stack,
* for degenerate transformations that can't be inverted (in this case the
* @inverse matrix will simply be initialized with the identity matrix)
*/
-CoglBool
+gboolean
cogl_matrix_stack_get_inverse (CoglMatrixStack *stack,
CoglMatrix *inverse);
@@ -538,7 +538,7 @@ cogl_matrix_stack_set (CoglMatrixStack *stack,
* Return value: %TRUE if @object is a #CoglMatrixStack, otherwise
* %FALSE.
*/
-CoglBool
+gboolean
cogl_is_matrix_stack (void *object);
/**
@@ -560,7 +560,7 @@ cogl_is_matrix_stack (void *object);
* @entry0 and the transform of @entry1 is a translation,
* otherwise %FALSE.
*/
-CoglBool
+gboolean
cogl_matrix_entry_calculate_translation (CoglMatrixEntry *entry0,
CoglMatrixEntry *entry1,
float *x,
@@ -581,7 +581,7 @@ cogl_matrix_entry_calculate_translation (CoglMatrixEntry *entry0,
* Return value: %TRUE if @entry is definitely an identity transform,
* otherwise %FALSE.
*/
-CoglBool
+gboolean
cogl_matrix_entry_is_identity (CoglMatrixEntry *entry);
/**
@@ -599,7 +599,7 @@ cogl_matrix_entry_is_identity (CoglMatrixEntry *entry);
* Return value: %TRUE if @entry0 represents the same transform as
* @entry1, otherwise %FALSE.
*/
-CoglBool
+gboolean
cogl_matrix_entry_equal (CoglMatrixEntry *entry0,
CoglMatrixEntry *entry1);
diff --git a/cogl/cogl/cogl-matrix.c b/cogl/cogl/cogl-matrix.c
index c03de61ad..6ae9c6755 100644
--- a/cogl/cogl/cogl-matrix.c
+++ b/cogl/cogl/cogl-matrix.c
@@ -442,7 +442,7 @@ cogl_debug_matrix_print (const CoglMatrix *matrix)
* with partial pivoting followed by back/substitution with the loops manually
* unrolled.
*/
-static CoglBool
+static gboolean
invert_matrix_general (CoglMatrix *matrix)
{
const float *m = (float *)matrix;
@@ -581,7 +581,7 @@ invert_matrix_general (CoglMatrix *matrix)
* element. Finally deals with the translation part by transforming the
* original translation vector using by the calculated submatrix inverse.
*/
-static CoglBool
+static gboolean
invert_matrix_3d_general (CoglMatrix *matrix)
{
const float *in = (float *)matrix;
@@ -663,7 +663,7 @@ invert_matrix_3d_general (CoglMatrix *matrix)
* the inverse matrix analyzing and inverting each of the scaling, rotation and
* translation parts.
*/
-static CoglBool
+static gboolean
invert_matrix_3d (CoglMatrix *matrix)
{
const float *in = (float *)matrix;
@@ -748,7 +748,7 @@ invert_matrix_3d (CoglMatrix *matrix)
*
* Simply copies identity into CoglMatrix::inv.
*/
-static CoglBool
+static gboolean
invert_matrix_identity (CoglMatrix *matrix)
{
memcpy (matrix->inv, identity, 16 * sizeof (float));
@@ -765,7 +765,7 @@ invert_matrix_identity (CoglMatrix *matrix)
*
* Calculates the
*/
-static CoglBool
+static gboolean
invert_matrix_3d_no_rotation (CoglMatrix *matrix)
{
const float *in = (float *)matrix;
@@ -800,7 +800,7 @@ invert_matrix_3d_no_rotation (CoglMatrix *matrix)
* Calculates the inverse matrix by applying the inverse scaling and
* translation to the identity matrix.
*/
-static CoglBool
+static gboolean
invert_matrix_2d_no_rotation (CoglMatrix *matrix)
{
const float *in = (float *)matrix;
@@ -824,7 +824,7 @@ invert_matrix_2d_no_rotation (CoglMatrix *matrix)
#if 0
/* broken */
-static CoglBool
+static gboolean
invert_matrix_perspective (CoglMatrix *matrix)
{
const float *in = matrix;
@@ -854,7 +854,7 @@ invert_matrix_perspective (CoglMatrix *matrix)
/*
* Matrix inversion function pointer type.
*/
-typedef CoglBool (*inv_mat_func)(CoglMatrix *matrix);
+typedef gboolean (*inv_mat_func)(CoglMatrix *matrix);
/*
* Table of the matrix inversion functions according to the matrix type.
@@ -1112,7 +1112,7 @@ _cogl_matrix_update_type_and_flags (CoglMatrix *matrix)
* given matrix type. In case of failure, updates the MAT_FLAG_SINGULAR flag,
* and copies the identity matrix into CoglMatrix::inv.
*/
-static CoglBool
+static gboolean
_cogl_matrix_update_inverse (CoglMatrix *matrix)
{
if (matrix->flags & MAT_DIRTY_FLAGS ||
@@ -1137,7 +1137,7 @@ _cogl_matrix_update_inverse (CoglMatrix *matrix)
return TRUE;
}
-CoglBool
+gboolean
cogl_matrix_get_inverse (const CoglMatrix *matrix, CoglMatrix *inverse)
{
if (_cogl_matrix_update_inverse ((CoglMatrix *)matrix))
@@ -1169,7 +1169,7 @@ _cogl_matrix_rotate (CoglMatrix *matrix,
{
float xx, yy, zz, xy, yz, zx, xs, ys, zs, one_c, s, c;
float m[16];
- CoglBool optimized;
+ gboolean optimized;
s = sinf (angle * DEG2RAD);
c = cosf (angle * DEG2RAD);
@@ -1667,7 +1667,7 @@ cogl_matrix_init_translation (CoglMatrix *matrix,
/*
* Test if the given matrix preserves vector lengths.
*/
-static CoglBool
+static gboolean
_cogl_matrix_is_length_preserving (const CoglMatrix *m)
{
return TEST_MAT_FLAGS (m, MAT_FLAGS_LENGTH_PRESERVING);
@@ -1677,7 +1677,7 @@ _cogl_matrix_is_length_preserving (const CoglMatrix *m)
* Test if the given matrix does any rotation.
* (or perhaps if the upper-left 3x3 is non-identity)
*/
-static CoglBool
+static gboolean
_cogl_matrix_has_rotation (const CoglMatrix *matrix)
{
if (matrix->flags & (MAT_FLAG_GENERAL |
@@ -1689,13 +1689,13 @@ _cogl_matrix_has_rotation (const CoglMatrix *matrix)
return FALSE;
}
-static CoglBool
+static gboolean
_cogl_matrix_is_general_scale (const CoglMatrix *matrix)
{
return (matrix->flags & MAT_FLAG_GENERAL_SCALE) ? TRUE : FALSE;
}
-static CoglBool
+static gboolean
_cogl_matrix_is_dirty (const CoglMatrix *matrix)
{
return (matrix->flags & MAT_DIRTY_ALL) ? TRUE : FALSE;
@@ -1936,7 +1936,7 @@ cogl_matrix_view_2d_in_perspective (CoglMatrix *matrix,
height_2d);
}
-CoglBool
+gboolean
cogl_matrix_equal (const void *v1, const void *v2)
{
const CoglMatrix *a = v1;
@@ -2215,7 +2215,7 @@ cogl_matrix_project_points (const CoglMatrix *matrix,
}
}
-CoglBool
+gboolean
cogl_matrix_is_identity (const CoglMatrix *matrix)
{
if (!(matrix->flags & MAT_DIRTY_TYPE) &&
diff --git a/cogl/cogl/cogl-matrix.h b/cogl/cogl/cogl-matrix.h
index 725958116..6d8ddb433 100644
--- a/cogl/cogl/cogl-matrix.h
+++ b/cogl/cogl/cogl-matrix.h
@@ -549,7 +549,7 @@ cogl_matrix_init_from_euler (CoglMatrix *matrix,
*
* Since: 1.4
*/
-CoglBool
+gboolean
cogl_matrix_equal (const void *v1, const void *v2);
/**
@@ -599,7 +599,7 @@ cogl_matrix_free (CoglMatrix *matrix);
*
* Since: 1.2
*/
-CoglBool
+gboolean
cogl_matrix_get_inverse (const CoglMatrix *matrix,
CoglMatrix *inverse);
@@ -747,7 +747,7 @@ cogl_matrix_project_points (const CoglMatrix *matrix,
* Returns: %TRUE if @matrix is an identity matrix else %FALSE
* Since: 1.8
*/
-CoglBool
+gboolean
cogl_matrix_is_identity (const CoglMatrix *matrix);
/**
diff --git a/cogl/cogl/cogl-meta-texture.c b/cogl/cogl/cogl-meta-texture.c
index 43f1ce472..3e195f3af 100644
--- a/cogl/cogl/cogl-meta-texture.c
+++ b/cogl/cogl/cogl-meta-texture.c
@@ -227,8 +227,8 @@ typedef struct _ClampData
{
float start;
float end;
- CoglBool s_flipped;
- CoglBool t_flipped;
+ gboolean s_flipped;
+ gboolean t_flipped;
CoglMetaTextureCallback callback;
void *user_data;
} ClampData;
@@ -277,7 +277,7 @@ clamp_t_cb (CoglTexture *sub_texture,
clamp_data->user_data);
}
-static CoglBool
+static gboolean
foreach_clamped_region (CoglMetaTexture *meta_texture,
float *tx_1,
float *ty_1,
@@ -517,7 +517,7 @@ cogl_meta_texture_foreach_in_region (CoglMetaTexture *meta_texture,
if (wrap_s == COGL_PIPELINE_WRAP_MODE_CLAMP_TO_EDGE ||
wrap_t == COGL_PIPELINE_WRAP_MODE_CLAMP_TO_EDGE)
{
- CoglBool finished = foreach_clamped_region (meta_texture,
+ gboolean finished = foreach_clamped_region (meta_texture,
&tx_1, &ty_1, &tx_2, &ty_2,
wrap_s, wrap_t,
callback,
diff --git a/cogl/cogl/cogl-node-private.h b/cogl/cogl/cogl-node-private.h
index 8fe24775d..37981c4ab 100644
--- a/cogl/cogl/cogl-node-private.h
+++ b/cogl/cogl/cogl-node-private.h
@@ -60,7 +60,7 @@ struct _CoglNode
/* TRUE if the node took a strong reference on its parent. Weak
* pipelines for instance don't take a reference on their parent. */
- CoglBool has_parent_reference;
+ gboolean has_parent_reference;
};
#define COGL_NODE(X) ((CoglNode *)(X))
@@ -74,12 +74,12 @@ void
_cogl_pipeline_node_set_parent_real (CoglNode *node,
CoglNode *parent,
CoglNodeUnparentVFunc unparent,
- CoglBool take_strong_reference);
+ gboolean take_strong_reference);
void
_cogl_pipeline_node_unparent_real (CoglNode *node);
-typedef CoglBool (*CoglNodeChildCallback) (CoglNode *child, void *user_data);
+typedef gboolean (*CoglNodeChildCallback) (CoglNode *child, void *user_data);
void
_cogl_pipeline_node_foreach_child (CoglNode *node,
diff --git a/cogl/cogl/cogl-node.c b/cogl/cogl/cogl-node.c
index b55bcb086..265951090 100644
--- a/cogl/cogl/cogl-node.c
+++ b/cogl/cogl/cogl-node.c
@@ -47,7 +47,7 @@ void
_cogl_pipeline_node_set_parent_real (CoglNode *node,
CoglNode *parent,
CoglNodeUnparentVFunc unparent,
- CoglBool take_strong_reference)
+ gboolean take_strong_reference)
{
/* NB: the old parent may indirectly be keeping the new parent alive
* so we have to ref the new parent before unrefing the old.
diff --git a/cogl/cogl/cogl-object-private.h b/cogl/cogl/cogl-object-private.h
index c63e3231d..8682c27dc 100644
--- a/cogl/cogl/cogl-object-private.h
+++ b/cogl/cogl/cogl-object-private.h
@@ -202,7 +202,7 @@ COGL_OBJECT_COMMON_DEFINE_WITH_CODE(TypeName, \
do { code; } while (0); \
_COGL_GTYPE_INIT_CLASS (type_name)) \
\
-CoglBool \
+gboolean \
cogl_is_##type_name (void *object) \
{ \
CoglObject *obj = object; \
@@ -217,7 +217,7 @@ cogl_is_##type_name (void *object) \
\
COGL_OBJECT_COMMON_DEFINE_WITH_CODE(TypeName, type_name, code) \
\
-CoglBool \
+gboolean \
cogl_is_##type_name (void *object) \
{ \
CoglObject *obj = object; \
@@ -232,7 +232,7 @@ cogl_is_##type_name (void *object) \
\
COGL_OBJECT_COMMON_DEFINE_WITH_CODE(TypeName, type_name, code) \
\
-CoglBool \
+gboolean \
_cogl_is_##type_name (void *object) \
{ \
CoglObject *obj = object; \
diff --git a/cogl/cogl/cogl-offscreen.h b/cogl/cogl/cogl-offscreen.h
index 6350c94e5..bc80b3166 100644
--- a/cogl/cogl/cogl-offscreen.h
+++ b/cogl/cogl/cogl-offscreen.h
@@ -132,7 +132,7 @@ cogl_offscreen_new_to_texture (CoglTexture *texture);
* Returns: %TRUE if @object is a #CoglOffscreen framebuffer,
* %FALSE otherwise
*/
-CoglBool
+gboolean
cogl_is_offscreen (void *object);
/**
diff --git a/cogl/cogl/cogl-onscreen-private.h b/cogl/cogl/cogl-onscreen-private.h
index 5a4aebc2e..52b2359c6 100644
--- a/cogl/cogl/cogl-onscreen-private.h
+++ b/cogl/cogl/cogl-onscreen-private.h
@@ -67,7 +67,7 @@ struct _CoglOnscreen
CoglList frame_closures;
- CoglBool resizable;
+ gboolean resizable;
CoglList resize_closures;
CoglList dirty_closures;
diff --git a/cogl/cogl/cogl-onscreen-template.c b/cogl/cogl/cogl-onscreen-template.c
index 6fcbe5d7c..244470739 100644
--- a/cogl/cogl/cogl-onscreen-template.c
+++ b/cogl/cogl/cogl-onscreen-template.c
@@ -88,7 +88,7 @@ cogl_onscreen_template_set_samples_per_pixel (
void
cogl_onscreen_template_set_stereo_enabled (
CoglOnscreenTemplate *onscreen_template,
- CoglBool enabled)
+ gboolean enabled)
{
onscreen_template->config.stereo_enabled = enabled;
}
diff --git a/cogl/cogl/cogl-onscreen-template.h b/cogl/cogl/cogl-onscreen-template.h
index 52dcdcfaa..0dd817429 100644
--- a/cogl/cogl/cogl-onscreen-template.h
+++ b/cogl/cogl/cogl-onscreen-template.h
@@ -102,7 +102,7 @@ cogl_onscreen_template_set_samples_per_pixel (
void
cogl_onscreen_template_set_stereo_enabled (
CoglOnscreenTemplate *onscreen_template,
- CoglBool enabled);
+ gboolean enabled);
/**
* cogl_is_onscreen_template:
* @object: A #CoglObject pointer
@@ -114,7 +114,7 @@ cogl_onscreen_template_set_stereo_enabled (
* Since: 1.10
* Stability: unstable
*/
-CoglBool
+gboolean
cogl_is_onscreen_template (void *object);
G_END_DECLS
diff --git a/cogl/cogl/cogl-onscreen.c b/cogl/cogl/cogl-onscreen.c
index f5db270c8..74ee61848 100644
--- a/cogl/cogl/cogl-onscreen.c
+++ b/cogl/cogl/cogl-onscreen.c
@@ -631,7 +631,7 @@ _cogl_framebuffer_winsys_update_size (CoglFramebuffer *framebuffer,
void
cogl_onscreen_set_resizable (CoglOnscreen *onscreen,
- CoglBool resizable)
+ gboolean resizable)
{
CoglFramebuffer *framebuffer;
const CoglWinsysVtable *winsys;
@@ -651,7 +651,7 @@ cogl_onscreen_set_resizable (CoglOnscreen *onscreen,
}
}
-CoglBool
+gboolean
cogl_onscreen_get_resizable (CoglOnscreen *onscreen)
{
return onscreen->resizable;
diff --git a/cogl/cogl/cogl-onscreen.h b/cogl/cogl/cogl-onscreen.h
index 675a32a4b..6504b56e5 100644
--- a/cogl/cogl/cogl-onscreen.h
+++ b/cogl/cogl/cogl-onscreen.h
@@ -601,7 +601,7 @@ cogl_onscreen_remove_swap_buffers_callback (CoglOnscreen *onscreen,
*/
void
cogl_onscreen_set_resizable (CoglOnscreen *onscreen,
- CoglBool resizable);
+ gboolean resizable);
/**
* cogl_onscreen_get_resizable:
@@ -626,7 +626,7 @@ cogl_onscreen_set_resizable (CoglOnscreen *onscreen,
* resizable or not.
* Since: 2.0
*/
-CoglBool
+gboolean
cogl_onscreen_get_resizable (CoglOnscreen *onscreen);
/**
@@ -860,7 +860,7 @@ cogl_onscreen_remove_dirty_callback (CoglOnscreen *onscreen,
* Since: 1.10
* Stability: unstable
*/
-CoglBool
+gboolean
cogl_is_onscreen (void *object);
/**
diff --git a/cogl/cogl/cogl-output-private.h b/cogl/cogl/cogl-output-private.h
index d264d482b..4f8b60ed5 100644
--- a/cogl/cogl/cogl-output-private.h
+++ b/cogl/cogl/cogl-output-private.h
@@ -51,7 +51,7 @@ struct _CoglOutput
};
CoglOutput *_cogl_output_new (const char *name);
-CoglBool _cogl_output_values_equal (CoglOutput *output,
+gboolean _cogl_output_values_equal (CoglOutput *output,
CoglOutput *other);
#endif /* __COGL_OUTPUT_PRIVATE_H */
diff --git a/cogl/cogl/cogl-output.h b/cogl/cogl/cogl-output.h
index e8979267c..c5d3e15ea 100644
--- a/cogl/cogl/cogl-output.h
+++ b/cogl/cogl/cogl-output.h
@@ -126,7 +126,7 @@ typedef enum {
* Since: 1.14
* Stability: unstable
*/
-CoglBool
+gboolean
cogl_is_output (void *object);
/**
diff --git a/cogl/cogl/cogl-pipeline-debug.c b/cogl/cogl/cogl-pipeline-debug.c
index dc148b75a..28df882bf 100644
--- a/cogl/cogl/cogl-pipeline-debug.c
+++ b/cogl/cogl/cogl-pipeline-debug.c
@@ -48,7 +48,7 @@ typedef struct
int indent;
} PrintDebugState;
-static CoglBool
+static gboolean
dump_layer_cb (CoglNode *node, void *user_data)
{
CoglPipelineLayer *layer = COGL_PIPELINE_LAYER (node);
@@ -56,7 +56,7 @@ dump_layer_cb (CoglNode *node, void *user_data)
int layer_id = *state->node_id_ptr;
PrintDebugState state_out;
GString *changes_label;
- CoglBool changes = FALSE;
+ gboolean changes = FALSE;
if (state->parent_id >= 0)
g_string_append_printf (state->graph, "%*slayer%p -> layer%p;\n",
@@ -121,7 +121,7 @@ dump_layer_cb (CoglNode *node, void *user_data)
return TRUE;
}
-static CoglBool
+static gboolean
dump_layer_ref_cb (CoglPipelineLayer *layer, void *data)
{
PrintDebugState *state = data;
@@ -136,7 +136,7 @@ dump_layer_ref_cb (CoglPipelineLayer *layer, void *data)
return TRUE;
}
-static CoglBool
+static gboolean
dump_pipeline_cb (CoglNode *node, void *user_data)
{
CoglPipeline *pipeline = COGL_PIPELINE (node);
@@ -144,8 +144,8 @@ dump_pipeline_cb (CoglNode *node, void *user_data)
int pipeline_id = *state->node_id_ptr;
PrintDebugState state_out;
GString *changes_label;
- CoglBool changes = FALSE;
- CoglBool layers = FALSE;
+ gboolean changes = FALSE;
+ gboolean layers = FALSE;
if (state->parent_id >= 0)
g_string_append_printf (state->graph, "%*spipeline%d -> pipeline%d;\n",
diff --git a/cogl/cogl/cogl-pipeline-hash-table.c b/cogl/cogl/cogl-pipeline-hash-table.c
index af0d00084..1e4bc1784 100644
--- a/cogl/cogl/cogl-pipeline-hash-table.c
+++ b/cogl/cogl/cogl-pipeline-hash-table.c
@@ -77,7 +77,7 @@ entry_hash (const void *data)
return entry->hash_value;
}
-static CoglBool
+static gboolean
entry_equal (const void *a,
const void *b)
{
diff --git a/cogl/cogl/cogl-pipeline-layer-private.h b/cogl/cogl/cogl-pipeline-layer-private.h
index 22bea830e..55d25ec64 100644
--- a/cogl/cogl/cogl-pipeline-layer-private.h
+++ b/cogl/cogl/cogl-pipeline-layer-private.h
@@ -188,7 +188,7 @@ typedef struct
CoglPipelineSnippetList vertex_snippets;
CoglPipelineSnippetList fragment_snippets;
- CoglBool point_sprite_coords;
+ gboolean point_sprite_coords;
} CoglPipelineLayerBigState;
struct _CoglPipelineLayer
@@ -260,7 +260,7 @@ struct _CoglPipelineLayer
};
-typedef CoglBool
+typedef gboolean
(*CoglPipelineLayerStateComparitor) (CoglPipelineLayer *authority0,
CoglPipelineLayer *authority1);
@@ -284,7 +284,7 @@ _cogl_pipeline_layer_resolve_authorities (CoglPipelineLayer *layer,
unsigned long differences,
CoglPipelineLayer **authorities);
-CoglBool
+gboolean
_cogl_pipeline_layer_equal (CoglPipelineLayer *layer0,
CoglPipelineLayer *layer1,
unsigned long differences_mask,
@@ -298,10 +298,10 @@ _cogl_pipeline_layer_pre_change_notify (CoglPipeline *required_owner,
void
_cogl_pipeline_layer_prune_redundant_ancestry (CoglPipelineLayer *layer);
-CoglBool
+gboolean
_cogl_pipeline_layer_has_alpha (CoglPipelineLayer *layer);
-CoglBool
+gboolean
_cogl_pipeline_layer_has_user_matrix (CoglPipeline *pipeline,
int layer_index);
@@ -380,7 +380,7 @@ _cogl_pipeline_layer_get_authority (CoglPipelineLayer *layer,
int
_cogl_pipeline_layer_get_unit_index (CoglPipelineLayer *layer);
-CoglBool
+gboolean
_cogl_pipeline_layer_needs_combine_separate
(CoglPipelineLayer *combine_authority);
diff --git a/cogl/cogl/cogl-pipeline-layer-state-private.h b/cogl/cogl/cogl-pipeline-layer-state-private.h
index 64e70cf3d..75589019a 100644
--- a/cogl/cogl/cogl-pipeline-layer-state-private.h
+++ b/cogl/cogl/cogl-pipeline-layer-state-private.h
@@ -50,41 +50,41 @@ CoglPipelineFilter
_cogl_pipeline_get_layer_mag_filter (CoglPipeline *pipeline,
int layer_index);
-CoglBool
+gboolean
_cogl_pipeline_layer_texture_type_equal (CoglPipelineLayer *authority0,
CoglPipelineLayer *authority1,
CoglPipelineEvalFlags flags);
-CoglBool
+gboolean
_cogl_pipeline_layer_texture_data_equal (CoglPipelineLayer *authority0,
CoglPipelineLayer *authority1,
CoglPipelineEvalFlags flags);
-CoglBool
+gboolean
_cogl_pipeline_layer_combine_state_equal (CoglPipelineLayer *authority0,
CoglPipelineLayer *authority1);
-CoglBool
+gboolean
_cogl_pipeline_layer_combine_constant_equal (CoglPipelineLayer *authority0,
CoglPipelineLayer *authority1);
-CoglBool
+gboolean
_cogl_pipeline_layer_sampler_equal (CoglPipelineLayer *authority0,
CoglPipelineLayer *authority1);
-CoglBool
+gboolean
_cogl_pipeline_layer_user_matrix_equal (CoglPipelineLayer *authority0,
CoglPipelineLayer *authority1);
-CoglBool
+gboolean
_cogl_pipeline_layer_point_sprite_coords_equal (CoglPipelineLayer *authority0,
CoglPipelineLayer *authority1);
-CoglBool
+gboolean
_cogl_pipeline_layer_vertex_snippets_equal (CoglPipelineLayer *authority0,
CoglPipelineLayer *authority1);
-CoglBool
+gboolean
_cogl_pipeline_layer_fragment_snippets_equal (CoglPipelineLayer *authority0,
CoglPipelineLayer *authority1);
diff --git a/cogl/cogl/cogl-pipeline-layer-state.c b/cogl/cogl/cogl-pipeline-layer-state.c
index 3e2ee01f6..ea29982e0 100644
--- a/cogl/cogl/cogl-pipeline-layer-state.c
+++ b/cogl/cogl/cogl-pipeline-layer-state.c
@@ -735,10 +735,10 @@ _cogl_pipeline_layer_get_wrap_modes (CoglPipelineLayer *layer,
*wrap_mode_p = authority->sampler_cache_entry->wrap_mode_p;
}
-CoglBool
+gboolean
cogl_pipeline_set_layer_point_sprite_coords_enabled (CoglPipeline *pipeline,
int layer_index,
- CoglBool enable,
+ gboolean enable,
CoglError **error)
{
CoglPipelineLayerState change =
@@ -765,7 +765,7 @@ cogl_pipeline_set_layer_point_sprite_coords_enabled (CoglPipeline *pipeline,
}
else
{
- static CoglBool warning_seen = FALSE;
+ static gboolean warning_seen = FALSE;
if (!warning_seen)
g_warning ("Point sprite texture coordinates are enabled "
"for a layer but the GL driver does not support it.");
@@ -834,7 +834,7 @@ cogl_pipeline_set_layer_point_sprite_coords_enabled (CoglPipeline *pipeline,
return TRUE;
}
-CoglBool
+gboolean
cogl_pipeline_get_layer_point_sprite_coords_enabled (CoglPipeline *pipeline,
int layer_index)
{
@@ -950,7 +950,7 @@ cogl_pipeline_add_layer_snippet (CoglPipeline *pipeline,
snippet);
}
-CoglBool
+gboolean
_cogl_pipeline_layer_texture_type_equal (CoglPipelineLayer *authority0,
CoglPipelineLayer *authority1,
CoglPipelineEvalFlags flags)
@@ -958,7 +958,7 @@ _cogl_pipeline_layer_texture_type_equal (CoglPipelineLayer *authority0,
return authority0->texture_type == authority1->texture_type;
}
-CoglBool
+gboolean
_cogl_pipeline_layer_texture_data_equal (CoglPipelineLayer *authority0,
CoglPipelineLayer *authority1,
CoglPipelineEvalFlags flags)
@@ -984,7 +984,7 @@ _cogl_pipeline_layer_texture_data_equal (CoglPipelineLayer *authority0,
}
}
-CoglBool
+gboolean
_cogl_pipeline_layer_combine_state_equal (CoglPipelineLayer *authority0,
CoglPipelineLayer *authority1)
{
@@ -1026,7 +1026,7 @@ _cogl_pipeline_layer_combine_state_equal (CoglPipelineLayer *authority0,
return TRUE;
}
-CoglBool
+gboolean
_cogl_pipeline_layer_combine_constant_equal (CoglPipelineLayer *authority0,
CoglPipelineLayer *authority1)
{
@@ -1035,7 +1035,7 @@ _cogl_pipeline_layer_combine_constant_equal (CoglPipelineLayer *authority0,
sizeof (float) * 4) == 0 ? TRUE : FALSE;
}
-CoglBool
+gboolean
_cogl_pipeline_layer_sampler_equal (CoglPipelineLayer *authority0,
CoglPipelineLayer *authority1)
{
@@ -1046,7 +1046,7 @@ _cogl_pipeline_layer_sampler_equal (CoglPipelineLayer *authority0,
authority1->sampler_cache_entry->sampler_object);
}
-CoglBool
+gboolean
_cogl_pipeline_layer_user_matrix_equal (CoglPipelineLayer *authority0,
CoglPipelineLayer *authority1)
{
@@ -1059,7 +1059,7 @@ _cogl_pipeline_layer_user_matrix_equal (CoglPipelineLayer *authority0,
return TRUE;
}
-CoglBool
+gboolean
_cogl_pipeline_layer_point_sprite_coords_equal (CoglPipelineLayer *authority0,
CoglPipelineLayer *authority1)
{
@@ -1069,7 +1069,7 @@ _cogl_pipeline_layer_point_sprite_coords_equal (CoglPipelineLayer *authority0,
return big_state0->point_sprite_coords == big_state1->point_sprite_coords;
}
-CoglBool
+gboolean
_cogl_pipeline_layer_vertex_snippets_equal (CoglPipelineLayer *authority0,
CoglPipelineLayer *authority1)
{
@@ -1079,7 +1079,7 @@ _cogl_pipeline_layer_vertex_snippets_equal (CoglPipelineLayer *authority0,
vertex_snippets);
}
-CoglBool
+gboolean
_cogl_pipeline_layer_fragment_snippets_equal (CoglPipelineLayer *authority0,
CoglPipelineLayer *authority1)
{
@@ -1171,7 +1171,7 @@ setup_texture_combine_state (CoglBlendStringStatement *statement,
}
}
-CoglBool
+gboolean
cogl_pipeline_set_layer_combine (CoglPipeline *pipeline,
int layer_index,
const char *combine_description,
@@ -1481,7 +1481,7 @@ _cogl_pipeline_layer_get_texture (CoglPipelineLayer *layer)
return _cogl_pipeline_layer_get_texture_real (layer);
}
-CoglBool
+gboolean
_cogl_pipeline_layer_has_user_matrix (CoglPipeline *pipeline,
int layer_index)
{
@@ -1728,7 +1728,7 @@ _cogl_pipeline_layer_hash_combine_constant_state (CoglPipelineLayer *authority,
CoglPipelineHashState *state)
{
CoglPipelineLayerBigState *b = authority->big_state;
- CoglBool need_hash = FALSE;
+ gboolean need_hash = FALSE;
int n_args;
int i;
diff --git a/cogl/cogl/cogl-pipeline-layer-state.h b/cogl/cogl/cogl-pipeline-layer-state.h
index 7f827407d..11fcbaaa2 100644
--- a/cogl/cogl/cogl-pipeline-layer-state.h
+++ b/cogl/cogl/cogl-pipeline-layer-state.h
@@ -300,7 +300,7 @@ cogl_pipeline_remove_layer (CoglPipeline *pipeline,
* Since: 2.0
* Stability: unstable
*/
-CoglBool
+gboolean
cogl_pipeline_set_layer_combine (CoglPipeline *pipeline,
int layer_index,
const char *blend_string,
@@ -443,10 +443,10 @@ cogl_pipeline_get_layer_mag_filter (CoglPipeline *pipeline,
* Since: 2.0
* Stability: unstable
*/
-CoglBool
+gboolean
cogl_pipeline_set_layer_point_sprite_coords_enabled (CoglPipeline *pipeline,
int layer_index,
- CoglBool enable,
+ gboolean enable,
CoglError **error);
/**
@@ -463,7 +463,7 @@ cogl_pipeline_set_layer_point_sprite_coords_enabled (CoglPipeline *pipeline,
* Since: 2.0
* Stability: unstable
*/
-CoglBool
+gboolean
cogl_pipeline_get_layer_point_sprite_coords_enabled (CoglPipeline *pipeline,
int layer_index);
diff --git a/cogl/cogl/cogl-pipeline-layer.c b/cogl/cogl/cogl-pipeline-layer.c
index 7829304b7..823d4b285 100644
--- a/cogl/cogl/cogl-pipeline-layer.c
+++ b/cogl/cogl/cogl-pipeline-layer.c
@@ -76,7 +76,7 @@ _cogl_pipeline_layer_get_unit_index (CoglPipelineLayer *layer)
return authority->unit_index;
}
-CoglBool
+gboolean
_cogl_pipeline_layer_has_alpha (CoglPipelineLayer *layer)
{
CoglPipelineLayer *combine_authority =
@@ -592,7 +592,7 @@ _cogl_pipeline_layer_compare_differences (CoglPipelineLayer *layer0,
return layers_difference;
}
-static CoglBool
+static gboolean
layer_state_equal (CoglPipelineLayerStateIndex state_index,
CoglPipelineLayer **authorities0,
CoglPipelineLayer **authorities1,
@@ -636,7 +636,7 @@ _cogl_pipeline_layer_resolve_authorities (CoglPipelineLayer *layer,
g_assert (remaining == 0);
}
-CoglBool
+gboolean
_cogl_pipeline_layer_equal (CoglPipelineLayer *layer0,
CoglPipelineLayer *layer1,
unsigned long differences_mask,
@@ -867,7 +867,7 @@ _cogl_pipeline_layer_pre_paint (CoglPipelineLayer *layer)
* separately or is the same function used for both channel masks and
* with the same arguments...
*/
-CoglBool
+gboolean
_cogl_pipeline_layer_needs_combine_separate
(CoglPipelineLayer *combine_authority)
{
diff --git a/cogl/cogl/cogl-pipeline-private.h b/cogl/cogl/cogl-pipeline-private.h
index ae6494cf3..030ad5d5e 100644
--- a/cogl/cogl/cogl-pipeline-private.h
+++ b/cogl/cogl/cogl-pipeline-private.h
@@ -257,7 +257,7 @@ typedef struct
typedef struct
{
- CoglBool enabled;
+ gboolean enabled;
CoglColor color;
CoglFogMode mode;
float density;
@@ -479,11 +479,11 @@ typedef struct _CoglPipelineFragend
void (*start) (CoglPipeline *pipeline,
int n_layers,
unsigned long pipelines_difference);
- CoglBool (*add_layer) (CoglPipeline *pipeline,
+ gboolean (*add_layer) (CoglPipeline *pipeline,
CoglPipelineLayer *layer,
unsigned long layers_difference);
- CoglBool (*passthrough) (CoglPipeline *pipeline);
- CoglBool (*end) (CoglPipeline *pipeline,
+ gboolean (*passthrough) (CoglPipeline *pipeline);
+ gboolean (*end) (CoglPipeline *pipeline,
unsigned long pipelines_difference);
void (*pipeline_pre_change_notify) (CoglPipeline *pipeline,
@@ -500,11 +500,11 @@ typedef struct _CoglPipelineVertend
void (*start) (CoglPipeline *pipeline,
int n_layers,
unsigned long pipelines_difference);
- CoglBool (*add_layer) (CoglPipeline *pipeline,
+ gboolean (*add_layer) (CoglPipeline *pipeline,
CoglPipelineLayer *layer,
unsigned long layers_difference,
CoglFramebuffer *framebuffer);
- CoglBool (*end) (CoglPipeline *pipeline,
+ gboolean (*end) (CoglPipeline *pipeline,
unsigned long pipelines_difference);
void (*pipeline_pre_change_notify) (CoglPipeline *pipeline,
@@ -519,7 +519,7 @@ typedef struct
{
int vertend;
int fragend;
- CoglBool (*start) (CoglPipeline *pipeline);
+ gboolean (*start) (CoglPipeline *pipeline);
void (*end) (CoglPipeline *pipeline,
unsigned long pipelines_difference);
void (*pipeline_pre_change_notify) (CoglPipeline *pipeline,
@@ -566,7 +566,7 @@ _cogl_pipeline_get_authority (CoglPipeline *pipeline,
return authority;
}
-typedef CoglBool (*CoglPipelineStateComparitor) (CoglPipeline *authority0,
+typedef gboolean (*CoglPipelineStateComparitor) (CoglPipeline *authority0,
CoglPipeline *authority1);
void
@@ -579,14 +579,14 @@ void
_cogl_pipeline_pre_change_notify (CoglPipeline *pipeline,
CoglPipelineState change,
const CoglColor *new_color,
- CoglBool from_layer_change);
+ gboolean from_layer_change);
void
_cogl_pipeline_prune_redundant_ancestry (CoglPipeline *pipeline);
void
_cogl_pipeline_update_real_blend_enable (CoglPipeline *pipeline,
- CoglBool unknown_color_alpha);
+ gboolean unknown_color_alpha);
typedef enum
{
@@ -601,7 +601,7 @@ _cogl_pipeline_get_layer_with_flags (CoglPipeline *pipeline,
#define _cogl_pipeline_get_layer(p, l) \
_cogl_pipeline_get_layer_with_flags (p, l, 0)
-CoglBool
+gboolean
_cogl_is_pipeline_layer (void *object);
void
@@ -619,7 +619,7 @@ _cogl_pipeline_prune_empty_layer_difference (CoglPipeline *layers_authority,
* able to fill your geometry according to a given Cogl pipeline.
*/
-CoglBool
+gboolean
_cogl_pipeline_get_real_blend_enabled (CoglPipeline *pipeline);
/*
@@ -817,7 +817,7 @@ unsigned long
_cogl_pipeline_compare_differences (CoglPipeline *pipeline0,
CoglPipeline *pipeline1);
-CoglBool
+gboolean
_cogl_pipeline_equal (CoglPipeline *pipeline0,
CoglPipeline *pipeline1,
unsigned int differences,
@@ -868,7 +868,7 @@ void
_cogl_pipeline_set_blend_enabled (CoglPipeline *pipeline,
CoglPipelineBlendEnable enable);
-CoglBool
+gboolean
_cogl_pipeline_get_fog_enabled (CoglPipeline *pipeline);
#ifdef COGL_DEBUG_ENABLED
@@ -883,12 +883,12 @@ _cogl_pipeline_get_age (CoglPipeline *pipeline);
void
_cogl_pipeline_add_layer_difference (CoglPipeline *pipeline,
CoglPipelineLayer *layer,
- CoglBool inc_n_layers);
+ gboolean inc_n_layers);
void
_cogl_pipeline_remove_layer_difference (CoglPipeline *pipeline,
CoglPipelineLayer *layer,
- CoglBool dec_n_layers);
+ gboolean dec_n_layers);
CoglPipeline *
_cogl_pipeline_find_equivalent_parent (CoglPipeline *pipeline,
@@ -911,7 +911,7 @@ _cogl_pipeline_prune_to_n_layers (CoglPipeline *pipeline, int n);
const GList *
_cogl_pipeline_get_layers (CoglPipeline *pipeline);
-typedef CoglBool (*CoglPipelineInternalLayerCallback) (CoglPipelineLayer *layer,
+typedef gboolean (*CoglPipelineInternalLayerCallback) (CoglPipelineLayer *layer,
void *user_data);
void
@@ -919,15 +919,15 @@ _cogl_pipeline_foreach_layer_internal (CoglPipeline *pipeline,
CoglPipelineInternalLayerCallback callback,
void *user_data);
-CoglBool
+gboolean
_cogl_pipeline_layer_numbers_equal (CoglPipeline *pipeline0,
CoglPipeline *pipeline1);
-CoglBool
+gboolean
_cogl_pipeline_layer_and_unit_numbers_equal (CoglPipeline *pipeline0,
CoglPipeline *pipeline1);
-CoglBool
+gboolean
_cogl_pipeline_need_texture_combine_separate
(CoglPipelineLayer *combine_authority);
diff --git a/cogl/cogl/cogl-pipeline-snippet-private.h b/cogl/cogl/cogl-pipeline-snippet-private.h
index 7a9d233c8..9207f2036 100644
--- a/cogl/cogl/cogl-pipeline-snippet-private.h
+++ b/cogl/cogl/cogl-pipeline-snippet-private.h
@@ -73,7 +73,7 @@ typedef struct
the return value. Instead it is expected that the snippet will
modify one of the argument variables directly and that will be
returned */
- CoglBool return_variable_is_argument;
+ gboolean return_variable_is_argument;
/* The argument names or NULL if there are none */
const char *arguments;
@@ -108,7 +108,7 @@ void
_cogl_pipeline_snippet_list_hash (CoglPipelineSnippetList *list,
unsigned int *hash);
-CoglBool
+gboolean
_cogl_pipeline_snippet_list_equal (CoglPipelineSnippetList *list0,
CoglPipelineSnippetList *list1);
diff --git a/cogl/cogl/cogl-pipeline-snippet.c b/cogl/cogl/cogl-pipeline-snippet.c
index 3f8c5c6d8..ae83bc398 100644
--- a/cogl/cogl/cogl-pipeline-snippet.c
+++ b/cogl/cogl/cogl-pipeline-snippet.c
@@ -268,7 +268,7 @@ _cogl_pipeline_snippet_list_hash (CoglPipelineSnippetList *list,
}
}
-CoglBool
+gboolean
_cogl_pipeline_snippet_list_equal (CoglPipelineSnippetList *list0,
CoglPipelineSnippetList *list1)
{
diff --git a/cogl/cogl/cogl-pipeline-state-private.h b/cogl/cogl/cogl-pipeline-state-private.h
index 366683ec4..c105d1c62 100644
--- a/cogl/cogl/cogl-pipeline-state-private.h
+++ b/cogl/cogl/cogl-pipeline-state-private.h
@@ -37,82 +37,82 @@
CoglPipeline *
_cogl_pipeline_get_user_program (CoglPipeline *pipeline);
-CoglBool
+gboolean
_cogl_pipeline_has_vertex_snippets (CoglPipeline *pipeline);
-CoglBool
+gboolean
_cogl_pipeline_has_fragment_snippets (CoglPipeline *pipeline);
-CoglBool
+gboolean
_cogl_pipeline_has_non_layer_vertex_snippets (CoglPipeline *pipeline);
-CoglBool
+gboolean
_cogl_pipeline_has_non_layer_fragment_snippets (CoglPipeline *pipeline);
void
_cogl_pipeline_set_fog_state (CoglPipeline *pipeline,
const CoglPipelineFogState *fog_state);
-CoglBool
+gboolean
_cogl_pipeline_color_equal (CoglPipeline *authority0,
CoglPipeline *authority1);
-CoglBool
+gboolean
_cogl_pipeline_lighting_state_equal (CoglPipeline *authority0,
CoglPipeline *authority1);
-CoglBool
+gboolean
_cogl_pipeline_alpha_func_state_equal (CoglPipeline *authority0,
CoglPipeline *authority1);
-CoglBool
+gboolean
_cogl_pipeline_alpha_func_reference_state_equal (CoglPipeline *authority0,
CoglPipeline *authority1);
-CoglBool
+gboolean
_cogl_pipeline_blend_state_equal (CoglPipeline *authority0,
CoglPipeline *authority1);
-CoglBool
+gboolean
_cogl_pipeline_depth_state_equal (CoglPipeline *authority0,
CoglPipeline *authority1);
-CoglBool
+gboolean
_cogl_pipeline_fog_state_equal (CoglPipeline *authority0,
CoglPipeline *authority1);
-CoglBool
+gboolean
_cogl_pipeline_non_zero_point_size_equal (CoglPipeline *authority0,
CoglPipeline *authority1);
-CoglBool
+gboolean
_cogl_pipeline_point_size_equal (CoglPipeline *authority0,
CoglPipeline *authority1);
-CoglBool
+gboolean
_cogl_pipeline_per_vertex_point_size_equal (CoglPipeline *authority0,
CoglPipeline *authority1);
-CoglBool
+gboolean
_cogl_pipeline_logic_ops_state_equal (CoglPipeline *authority0,
CoglPipeline *authority1);
-CoglBool
+gboolean
_cogl_pipeline_user_shader_equal (CoglPipeline *authority0,
CoglPipeline *authority1);
-CoglBool
+gboolean
_cogl_pipeline_cull_face_state_equal (CoglPipeline *authority0,
CoglPipeline *authority1);
-CoglBool
+gboolean
_cogl_pipeline_uniforms_state_equal (CoglPipeline *authority0,
CoglPipeline *authority1);
-CoglBool
+gboolean
_cogl_pipeline_vertex_snippets_state_equal (CoglPipeline *authority0,
CoglPipeline *authority1);
-CoglBool
+gboolean
_cogl_pipeline_fragment_snippets_state_equal (CoglPipeline *authority0,
CoglPipeline *authority1);
diff --git a/cogl/cogl/cogl-pipeline-state.c b/cogl/cogl/cogl-pipeline-state.c
index 17fa8fe24..d27b0a03f 100644
--- a/cogl/cogl/cogl-pipeline-state.c
+++ b/cogl/cogl/cogl-pipeline-state.c
@@ -63,14 +63,14 @@ _cogl_pipeline_get_user_program (CoglPipeline *pipeline)
return authority->big_state->user_program;
}
-CoglBool
+gboolean
_cogl_pipeline_color_equal (CoglPipeline *authority0,
CoglPipeline *authority1)
{
return cogl_color_equal (&authority0->color, &authority1->color);
}
-CoglBool
+gboolean
_cogl_pipeline_lighting_state_equal (CoglPipeline *authority0,
CoglPipeline *authority1)
{
@@ -91,7 +91,7 @@ _cogl_pipeline_lighting_state_equal (CoglPipeline *authority0,
return TRUE;
}
-CoglBool
+gboolean
_cogl_pipeline_alpha_func_state_equal (CoglPipeline *authority0,
CoglPipeline *authority1)
{
@@ -103,7 +103,7 @@ _cogl_pipeline_alpha_func_state_equal (CoglPipeline *authority0,
return alpha_state0->alpha_func == alpha_state1->alpha_func;
}
-CoglBool
+gboolean
_cogl_pipeline_alpha_func_reference_state_equal (CoglPipeline *authority0,
CoglPipeline *authority1)
{
@@ -116,7 +116,7 @@ _cogl_pipeline_alpha_func_reference_state_equal (CoglPipeline *authority0,
alpha_state1->alpha_func_reference);
}
-CoglBool
+gboolean
_cogl_pipeline_blend_state_equal (CoglPipeline *authority0,
CoglPipeline *authority1)
{
@@ -158,7 +158,7 @@ _cogl_pipeline_blend_state_equal (CoglPipeline *authority0,
return TRUE;
}
-CoglBool
+gboolean
_cogl_pipeline_depth_state_equal (CoglPipeline *authority0,
CoglPipeline *authority1)
{
@@ -177,7 +177,7 @@ _cogl_pipeline_depth_state_equal (CoglPipeline *authority0,
}
}
-CoglBool
+gboolean
_cogl_pipeline_fog_state_equal (CoglPipeline *authority0,
CoglPipeline *authority1)
{
@@ -195,7 +195,7 @@ _cogl_pipeline_fog_state_equal (CoglPipeline *authority0,
return FALSE;
}
-CoglBool
+gboolean
_cogl_pipeline_non_zero_point_size_equal (CoglPipeline *authority0,
CoglPipeline *authority1)
{
@@ -203,14 +203,14 @@ _cogl_pipeline_non_zero_point_size_equal (CoglPipeline *authority0,
authority1->big_state->non_zero_point_size);
}
-CoglBool
+gboolean
_cogl_pipeline_point_size_equal (CoglPipeline *authority0,
CoglPipeline *authority1)
{
return authority0->big_state->point_size == authority1->big_state->point_size;
}
-CoglBool
+gboolean
_cogl_pipeline_per_vertex_point_size_equal (CoglPipeline *authority0,
CoglPipeline *authority1)
{
@@ -218,7 +218,7 @@ _cogl_pipeline_per_vertex_point_size_equal (CoglPipeline *authority0,
authority1->big_state->per_vertex_point_size);
}
-CoglBool
+gboolean
_cogl_pipeline_logic_ops_state_equal (CoglPipeline *authority0,
CoglPipeline *authority1)
{
@@ -228,7 +228,7 @@ _cogl_pipeline_logic_ops_state_equal (CoglPipeline *authority0,
return logic_ops_state0->color_mask == logic_ops_state1->color_mask;
}
-CoglBool
+gboolean
_cogl_pipeline_cull_face_state_equal (CoglPipeline *authority0,
CoglPipeline *authority1)
{
@@ -249,7 +249,7 @@ _cogl_pipeline_cull_face_state_equal (CoglPipeline *authority0,
cull_face_state0->front_winding == cull_face_state1->front_winding);
}
-CoglBool
+gboolean
_cogl_pipeline_user_shader_equal (CoglPipeline *authority0,
CoglPipeline *authority1)
{
@@ -264,7 +264,7 @@ typedef struct
int override_count;
} GetUniformsClosure;
-static CoglBool
+static gboolean
get_uniforms_cb (int uniform_num, void *user_data)
{
GetUniformsClosure *data = user_data;
@@ -309,7 +309,7 @@ _cogl_pipeline_get_all_uniform_values (CoglPipeline *pipeline,
while (pipeline);
}
-CoglBool
+gboolean
_cogl_pipeline_uniforms_state_equal (CoglPipeline *authority0,
CoglPipeline *authority1)
{
@@ -359,7 +359,7 @@ _cogl_pipeline_uniforms_state_equal (CoglPipeline *authority0,
return TRUE;
}
-CoglBool
+gboolean
_cogl_pipeline_vertex_snippets_state_equal (CoglPipeline *authority0,
CoglPipeline *authority1)
{
@@ -369,7 +369,7 @@ _cogl_pipeline_vertex_snippets_state_equal (CoglPipeline *authority0,
vertex_snippets);
}
-CoglBool
+gboolean
_cogl_pipeline_fragment_snippets_state_equal (CoglPipeline *authority0,
CoglPipeline *authority1)
{
@@ -469,7 +469,7 @@ _cogl_pipeline_get_blend_enabled (CoglPipeline *pipeline)
return authority->blend_enable;
}
-static CoglBool
+static gboolean
_cogl_pipeline_blend_enable_equal (CoglPipeline *authority0,
CoglPipeline *authority1)
{
@@ -953,7 +953,7 @@ setup_blend_state (CoglBlendStringStatement *statement,
*blend_dst_factor = arg_to_gl_blend_factor (&statement->args[1]);
}
-CoglBool
+gboolean
cogl_pipeline_set_blend (CoglPipeline *pipeline,
const char *blend_description,
CoglError **error)
@@ -1151,7 +1151,7 @@ cogl_pipeline_set_user_program (CoglPipeline *pipeline,
pipeline->dirty_real_blend_enable = TRUE;
}
-CoglBool
+gboolean
cogl_pipeline_set_depth_state (CoglPipeline *pipeline,
const CoglDepthState *depth_state,
CoglError **error)
@@ -1384,7 +1384,7 @@ cogl_pipeline_get_point_size (CoglPipeline *pipeline)
static void
_cogl_pipeline_set_non_zero_point_size (CoglPipeline *pipeline,
- CoglBool value)
+ gboolean value)
{
CoglPipelineState state = COGL_PIPELINE_STATE_NON_ZERO_POINT_SIZE;
CoglPipeline *authority;
@@ -1439,9 +1439,9 @@ cogl_pipeline_set_point_size (CoglPipeline *pipeline,
_cogl_pipeline_point_size_equal);
}
-CoglBool
+gboolean
cogl_pipeline_set_per_vertex_point_size (CoglPipeline *pipeline,
- CoglBool enable,
+ gboolean enable,
CoglError **error)
{
CoglPipelineState state = COGL_PIPELINE_STATE_PER_VERTEX_POINT_SIZE;
@@ -1482,7 +1482,7 @@ cogl_pipeline_set_per_vertex_point_size (CoglPipeline *pipeline,
return TRUE;
}
-CoglBool
+gboolean
cogl_pipeline_get_per_vertex_point_size (CoglPipeline *pipeline)
{
CoglPipeline *authority;
@@ -1625,7 +1625,7 @@ cogl_pipeline_set_uniform_matrix (CoglPipeline *pipeline,
int uniform_location,
int dimensions,
int count,
- CoglBool transpose,
+ gboolean transpose,
const float *value)
{
CoglBoxedValue *boxed_value;
@@ -1687,7 +1687,7 @@ cogl_pipeline_add_snippet (CoglPipeline *pipeline,
_cogl_pipeline_add_fragment_snippet (pipeline, snippet);
}
-CoglBool
+gboolean
_cogl_pipeline_has_non_layer_vertex_snippets (CoglPipeline *pipeline)
{
CoglPipeline *authority =
@@ -1697,14 +1697,14 @@ _cogl_pipeline_has_non_layer_vertex_snippets (CoglPipeline *pipeline)
return authority->big_state->vertex_snippets.entries != NULL;
}
-static CoglBool
+static gboolean
check_layer_has_vertex_snippet (CoglPipelineLayer *layer,
void *user_data)
{
unsigned long state = COGL_PIPELINE_LAYER_STATE_VERTEX_SNIPPETS;
CoglPipelineLayer *authority =
_cogl_pipeline_layer_get_authority (layer, state);
- CoglBool *found_vertex_snippet = user_data;
+ gboolean *found_vertex_snippet = user_data;
if (authority->big_state->vertex_snippets.entries)
{
@@ -1715,10 +1715,10 @@ check_layer_has_vertex_snippet (CoglPipelineLayer *layer,
return TRUE;
}
-CoglBool
+gboolean
_cogl_pipeline_has_vertex_snippets (CoglPipeline *pipeline)
{
- CoglBool found_vertex_snippet = FALSE;
+ gboolean found_vertex_snippet = FALSE;
if (_cogl_pipeline_has_non_layer_vertex_snippets (pipeline))
return TRUE;
@@ -1730,7 +1730,7 @@ _cogl_pipeline_has_vertex_snippets (CoglPipeline *pipeline)
return found_vertex_snippet;
}
-CoglBool
+gboolean
_cogl_pipeline_has_non_layer_fragment_snippets (CoglPipeline *pipeline)
{
CoglPipeline *authority =
@@ -1740,14 +1740,14 @@ _cogl_pipeline_has_non_layer_fragment_snippets (CoglPipeline *pipeline)
return authority->big_state->fragment_snippets.entries != NULL;
}
-static CoglBool
+static gboolean
check_layer_has_fragment_snippet (CoglPipelineLayer *layer,
void *user_data)
{
unsigned long state = COGL_PIPELINE_LAYER_STATE_FRAGMENT_SNIPPETS;
CoglPipelineLayer *authority =
_cogl_pipeline_layer_get_authority (layer, state);
- CoglBool *found_fragment_snippet = user_data;
+ gboolean *found_fragment_snippet = user_data;
if (authority->big_state->fragment_snippets.entries)
{
@@ -1758,10 +1758,10 @@ check_layer_has_fragment_snippet (CoglPipelineLayer *layer,
return TRUE;
}
-CoglBool
+gboolean
_cogl_pipeline_has_fragment_snippets (CoglPipeline *pipeline)
{
- CoglBool found_fragment_snippet = FALSE;
+ gboolean found_fragment_snippet = FALSE;
if (_cogl_pipeline_has_non_layer_fragment_snippets (pipeline))
return TRUE;
@@ -1925,7 +1925,7 @@ void
_cogl_pipeline_hash_non_zero_point_size_state (CoglPipeline *authority,
CoglPipelineHashState *state)
{
- CoglBool non_zero_point_size = authority->big_state->non_zero_point_size;
+ gboolean non_zero_point_size = authority->big_state->non_zero_point_size;
state->hash = _cogl_util_one_at_a_time_hash (state->hash,
&non_zero_point_size,
@@ -1945,7 +1945,7 @@ void
_cogl_pipeline_hash_per_vertex_point_size_state (CoglPipeline *authority,
CoglPipelineHashState *state)
{
- CoglBool per_vertex_point_size = authority->big_state->per_vertex_point_size;
+ gboolean per_vertex_point_size = authority->big_state->per_vertex_point_size;
state->hash = _cogl_util_one_at_a_time_hash (state->hash,
&per_vertex_point_size,
sizeof (per_vertex_point_size));
diff --git a/cogl/cogl/cogl-pipeline-state.h b/cogl/cogl/cogl-pipeline-state.h
index c6ff607c5..d87a32cda 100644
--- a/cogl/cogl/cogl-pipeline-state.h
+++ b/cogl/cogl/cogl-pipeline-state.h
@@ -466,7 +466,7 @@ cogl_pipeline_get_alpha_test_reference (CoglPipeline *pipeline);
* Since: 2.0
* Stability: Unstable
*/
-CoglBool
+gboolean
cogl_pipeline_set_blend (CoglPipeline *pipeline,
const char *blend_string,
CoglError **error);
@@ -552,9 +552,9 @@ cogl_pipeline_get_point_size (CoglPipeline *pipeline);
* Stability: Unstable
* Return value: %TRUE if the change suceeded or %FALSE otherwise
*/
-CoglBool
+gboolean
cogl_pipeline_set_per_vertex_point_size (CoglPipeline *pipeline,
- CoglBool enable,
+ gboolean enable,
CoglError **error);
/**
@@ -567,7 +567,7 @@ cogl_pipeline_set_per_vertex_point_size (CoglPipeline *pipeline,
* enabled or %FALSE otherwise. The per-vertex point size can be
* enabled with cogl_pipeline_set_per_vertex_point_size().
*/
-CoglBool
+gboolean
cogl_pipeline_get_per_vertex_point_size (CoglPipeline *pipeline);
/**
@@ -688,7 +688,7 @@ cogl_pipeline_set_user_program (CoglPipeline *pipeline,
* Since: 2.0
* Stability: Unstable
*/
-CoglBool
+gboolean
cogl_pipeline_set_depth_state (CoglPipeline *pipeline,
const CoglDepthState *state,
CoglError **error);
@@ -951,7 +951,7 @@ cogl_pipeline_set_uniform_matrix (CoglPipeline *pipeline,
int uniform_location,
int dimensions,
int count,
- CoglBool transpose,
+ gboolean transpose,
const float *value);
/**
diff --git a/cogl/cogl/cogl-pipeline.c b/cogl/cogl/cogl-pipeline.c
index 12bb543cf..16af79ada 100644
--- a/cogl/cogl/cogl-pipeline.c
+++ b/cogl/cogl/cogl-pipeline.c
@@ -57,7 +57,7 @@
static void _cogl_pipeline_free (CoglPipeline *tex);
static void recursively_free_layer_caches (CoglPipeline *pipeline);
-static CoglBool _cogl_pipeline_is_weak (CoglPipeline *pipeline);
+static gboolean _cogl_pipeline_is_weak (CoglPipeline *pipeline);
const CoglPipelineFragend *_cogl_pipeline_fragends[COGL_PIPELINE_N_FRAGENDS];
const CoglPipelineVertend *_cogl_pipeline_vertends[COGL_PIPELINE_N_VERTENDS];
@@ -208,7 +208,7 @@ _cogl_pipeline_unparent (CoglNode *pipeline)
_cogl_pipeline_node_unparent_real (pipeline);
}
-static CoglBool
+static gboolean
recursively_free_layer_caches_cb (CoglNode *node,
void *user_data)
{
@@ -243,7 +243,7 @@ recursively_free_layer_caches (CoglPipeline *pipeline)
static void
_cogl_pipeline_set_parent (CoglPipeline *pipeline,
CoglPipeline *parent,
- CoglBool take_strong_reference)
+ gboolean take_strong_reference)
{
/* Chain up */
_cogl_pipeline_node_set_parent_real (COGL_NODE (pipeline),
@@ -320,7 +320,7 @@ _cogl_pipeline_revert_weak_ancestors (CoglPipeline *strong)
/* XXX: Always have an eye out for opportunities to lower the cost of
* cogl_pipeline_copy. */
static CoglPipeline *
-_cogl_pipeline_copy (CoglPipeline *src, CoglBool is_weak)
+_cogl_pipeline_copy (CoglPipeline *src, gboolean is_weak)
{
CoglPipeline *pipeline = g_slice_new (CoglPipeline);
@@ -402,7 +402,7 @@ cogl_pipeline_new (CoglContext *context)
return new;
}
-static CoglBool
+static gboolean
destroy_weak_children_cb (CoglNode *node,
void *user_data)
{
@@ -478,7 +478,7 @@ _cogl_pipeline_free (CoglPipeline *pipeline)
g_slice_free (CoglPipeline, pipeline);
}
-CoglBool
+gboolean
_cogl_pipeline_get_real_blend_enabled (CoglPipeline *pipeline)
{
_COGL_RETURN_VAL_IF_FAIL (cogl_is_pipeline (pipeline), FALSE);
@@ -576,7 +576,7 @@ _cogl_pipeline_foreach_layer_internal (CoglPipeline *pipeline,
_cogl_pipeline_get_authority (pipeline, COGL_PIPELINE_STATE_LAYERS);
int n_layers;
int i;
- CoglBool cont;
+ gboolean cont;
n_layers = authority->n_layers;
if (n_layers == 0)
@@ -591,7 +591,7 @@ _cogl_pipeline_foreach_layer_internal (CoglPipeline *pipeline,
}
}
-CoglBool
+gboolean
_cogl_pipeline_layer_numbers_equal (CoglPipeline *pipeline0,
CoglPipeline *pipeline1)
{
@@ -620,7 +620,7 @@ _cogl_pipeline_layer_numbers_equal (CoglPipeline *pipeline0,
return TRUE;
}
-CoglBool
+gboolean
_cogl_pipeline_layer_and_unit_numbers_equal (CoglPipeline *pipeline0,
CoglPipeline *pipeline1)
{
@@ -661,7 +661,7 @@ typedef struct
int *indices;
} AppendLayerIndexState;
-static CoglBool
+static gboolean
append_layer_index_cb (CoglPipelineLayer *layer,
void *user_data)
{
@@ -678,7 +678,7 @@ cogl_pipeline_foreach_layer (CoglPipeline *pipeline,
CoglPipeline *authority =
_cogl_pipeline_get_authority (pipeline, COGL_PIPELINE_STATE_LAYERS);
AppendLayerIndexState state;
- CoglBool cont;
+ gboolean cont;
int i;
/* XXX: We don't know what the user is going to want to do to the layers
@@ -698,10 +698,10 @@ cogl_pipeline_foreach_layer (CoglPipeline *pipeline,
cont = callback (pipeline, state.indices[i], user_data);
}
-static CoglBool
+static gboolean
layer_has_alpha_cb (CoglPipelineLayer *layer, void *data)
{
- CoglBool *has_alpha = data;
+ gboolean *has_alpha = data;
*has_alpha = _cogl_pipeline_layer_has_alpha (layer);
/* return FALSE to stop iterating layers if we find any layer
@@ -723,11 +723,11 @@ layer_has_alpha_cb (CoglPipelineLayer *layer, void *data)
* this returns FALSE for a set of changes then you can follow
* up
*/
-static CoglBool
+static gboolean
_cogl_pipeline_change_implies_transparency (CoglPipeline *pipeline,
unsigned int changes,
const CoglColor *override_color,
- CoglBool unknown_color_alpha)
+ gboolean unknown_color_alpha)
{
/* In the case of a layer state change we need to check everything
* else first since they contribute to the has_alpha status of the
@@ -803,7 +803,7 @@ _cogl_pipeline_change_implies_transparency (CoglPipeline *pipeline,
/* has_alpha tracks the alpha status of the GL_PREVIOUS layer.
* To start with that's defined by the pipeline color which
* must be fully opaque if we got this far. */
- CoglBool has_alpha = FALSE;
+ gboolean has_alpha = FALSE;
_cogl_pipeline_foreach_layer_internal (pipeline,
layer_has_alpha_cb,
&has_alpha);
@@ -814,11 +814,11 @@ _cogl_pipeline_change_implies_transparency (CoglPipeline *pipeline,
return FALSE;
}
-static CoglBool
+static gboolean
_cogl_pipeline_needs_blending_enabled (CoglPipeline *pipeline,
unsigned int changes,
const CoglColor *override_color,
- CoglBool unknown_color_alpha)
+ gboolean unknown_color_alpha)
{
CoglPipeline *enable_authority;
CoglPipeline *blend_authority;
@@ -1186,11 +1186,11 @@ _cogl_pipeline_init_multi_property_sparse_state (CoglPipeline *pipeline,
}
}
-static CoglBool
+static gboolean
check_if_strong_cb (CoglNode *node, void *user_data)
{
CoglPipeline *pipeline = COGL_PIPELINE (node);
- CoglBool *has_strong_child = user_data;
+ gboolean *has_strong_child = user_data;
if (!_cogl_pipeline_is_weak (pipeline))
{
@@ -1201,17 +1201,17 @@ check_if_strong_cb (CoglNode *node, void *user_data)
return TRUE;
}
-static CoglBool
+static gboolean
has_strong_children (CoglPipeline *pipeline)
{
- CoglBool has_strong_child = FALSE;
+ gboolean has_strong_child = FALSE;
_cogl_pipeline_node_foreach_child (COGL_NODE (pipeline),
check_if_strong_cb,
&has_strong_child);
return has_strong_child;
}
-static CoglBool
+static gboolean
_cogl_pipeline_is_weak (CoglPipeline *pipeline)
{
if (pipeline->is_weak && !has_strong_children (pipeline))
@@ -1220,7 +1220,7 @@ _cogl_pipeline_is_weak (CoglPipeline *pipeline)
return FALSE;
}
-static CoglBool
+static gboolean
reparent_children_cb (CoglNode *node,
void *user_data)
{
@@ -1236,7 +1236,7 @@ void
_cogl_pipeline_pre_change_notify (CoglPipeline *pipeline,
CoglPipelineState change,
const CoglColor *new_color,
- CoglBool from_layer_change)
+ gboolean from_layer_change)
{
_COGL_GET_CONTEXT (ctx, NO_RETVAL);
@@ -1245,7 +1245,7 @@ _cogl_pipeline_pre_change_notify (CoglPipeline *pipeline,
* before we can modify it... */
if (pipeline->journal_ref_count)
{
- CoglBool skip_journal_flush = FALSE;
+ gboolean skip_journal_flush = FALSE;
/* XXX: We don't usually need to flush the journal just due to
* color changes since pipeline colors are logged in the
@@ -1253,12 +1253,12 @@ _cogl_pipeline_pre_change_notify (CoglPipeline *pipeline,
* color enables or disables the need for blending. */
if (change == COGL_PIPELINE_STATE_COLOR)
{
- CoglBool will_need_blending =
+ gboolean will_need_blending =
_cogl_pipeline_needs_blending_enabled (pipeline,
change,
new_color,
FALSE);
- CoglBool blend_enable = pipeline->real_blend_enable ? TRUE : FALSE;
+ gboolean blend_enable = pipeline->real_blend_enable ? TRUE : FALSE;
if (will_need_blending == blend_enable)
skip_journal_flush = TRUE;
@@ -1444,7 +1444,7 @@ _cogl_pipeline_pre_change_notify (CoglPipeline *pipeline,
void
_cogl_pipeline_add_layer_difference (CoglPipeline *pipeline,
CoglPipelineLayer *layer,
- CoglBool inc_n_layers)
+ gboolean inc_n_layers)
{
_COGL_RETURN_IF_FAIL (layer->owner == NULL);
@@ -1483,7 +1483,7 @@ _cogl_pipeline_add_layer_difference (CoglPipeline *pipeline,
void
_cogl_pipeline_remove_layer_difference (CoglPipeline *pipeline,
CoglPipelineLayer *layer,
- CoglBool dec_n_layers)
+ gboolean dec_n_layers)
{
/* - Flush journal primitives referencing the current state.
* - Make sure the pipeline has no dependants so it may be modified.
@@ -1546,7 +1546,7 @@ _cogl_pipeline_try_reverting_layers_authority (CoglPipeline *authority,
void
_cogl_pipeline_update_real_blend_enable (CoglPipeline *pipeline,
- CoglBool unknown_color_alpha)
+ gboolean unknown_color_alpha)
{
CoglPipeline *parent;
unsigned int differences;
@@ -1598,7 +1598,7 @@ typedef struct
int first_index_to_prune;
} CoglPipelinePruneLayersInfo;
-static CoglBool
+static gboolean
update_prune_layers_info_cb (CoglPipelineLayer *layer, void *user_data)
{
CoglPipelinePruneLayersInfo *state = user_data;
@@ -1679,12 +1679,12 @@ typedef struct
/* When adding a layer we don't need a complete list of
* layers_to_shift if we find a layer already corresponding to the
* layer_index. */
- CoglBool ignore_shift_layers_if_found;
+ gboolean ignore_shift_layers_if_found;
} CoglPipelineLayerInfo;
/* Returns TRUE once we know there is nothing more to update */
-static CoglBool
+static gboolean
update_layer_info (CoglPipelineLayer *layer,
CoglPipelineLayerInfo *layer_info)
{
@@ -1707,7 +1707,7 @@ update_layer_info (CoglPipelineLayer *layer,
}
/* Returns FALSE to break out of a _foreach_layer () iteration */
-static CoglBool
+static gboolean
update_layer_info_cb (CoglPipelineLayer *layer,
void *user_data)
{
@@ -1916,7 +1916,7 @@ typedef struct
unsigned long fallback_layers;
} CoglPipelineFallbackState;
-static CoglBool
+static gboolean
fallback_layer_cb (CoglPipelineLayer *layer, void *user_data)
{
CoglPipelineFallbackState *state = user_data;
@@ -1973,7 +1973,7 @@ typedef struct
CoglTexture *texture;
} CoglPipelineOverrideLayerState;
-static CoglBool
+static gboolean
override_layer_texture_cb (CoglPipelineLayer *layer, void *user_data)
{
CoglPipelineOverrideLayerState *state = user_data;
@@ -2040,7 +2040,7 @@ _cogl_pipeline_apply_overrides (CoglPipeline *pipeline,
}
}
-static CoglBool
+static gboolean
_cogl_pipeline_layers_equal (CoglPipeline *authority0,
CoglPipeline *authority1,
unsigned long differences,
@@ -2201,7 +2201,7 @@ _cogl_pipeline_resolve_authorities (CoglPipeline *pipeline,
* COGL_PIPELINE_WRAP_MODE_CLAMP_TO_EDGE because once they get to the
* journal stage they act exactly the same.
*/
-CoglBool
+gboolean
_cogl_pipeline_equal (CoglPipeline *pipeline0,
CoglPipeline *pipeline1,
unsigned int differences,
@@ -2212,7 +2212,7 @@ _cogl_pipeline_equal (CoglPipeline *pipeline0,
CoglPipeline *authorities0[COGL_PIPELINE_STATE_SPARSE_COUNT];
CoglPipeline *authorities1[COGL_PIPELINE_STATE_SPARSE_COUNT];
int bit;
- CoglBool ret;
+ gboolean ret;
COGL_STATIC_TIMER (pipeline_equal_timer,
"Mainloop", /* parent */
@@ -2407,7 +2407,7 @@ _cogl_pipeline_prune_redundant_ancestry (CoglPipeline *pipeline)
if (new_parent != _cogl_pipeline_get_parent (pipeline))
{
- CoglBool is_weak = _cogl_pipeline_is_weak (pipeline);
+ gboolean is_weak = _cogl_pipeline_is_weak (pipeline);
_cogl_pipeline_set_parent (pipeline, new_parent, is_weak ? FALSE : TRUE);
}
}
@@ -2441,7 +2441,7 @@ _cogl_pipeline_update_authority (CoglPipeline *pipeline,
}
}
-CoglBool
+gboolean
_cogl_pipeline_get_fog_enabled (CoglPipeline *pipeline)
{
CoglPipeline *authority;
@@ -2513,7 +2513,7 @@ cogl_pipeline_remove_layer (CoglPipeline *pipeline, int layer_index)
pipeline->dirty_real_blend_enable = TRUE;
}
-static CoglBool
+static gboolean
prepend_layer_to_list_cb (CoglPipelineLayer *layer,
void *user_data)
{
@@ -2678,7 +2678,7 @@ _cogl_pipeline_init_layer_state_hash_functions (void)
}
}
-static CoglBool
+static gboolean
_cogl_pipeline_hash_layer_cb (CoglPipelineLayer *layer,
void *user_data)
{
@@ -2816,7 +2816,7 @@ _cogl_pipeline_hash (CoglPipeline *pipeline,
if (differences & COGL_PIPELINE_STATE_REAL_BLEND_ENABLE)
{
- CoglBool enable = pipeline->real_blend_enable;
+ gboolean enable = pipeline->real_blend_enable;
state.hash =
_cogl_util_one_at_a_time_hash (state.hash, &enable, sizeof (enable));
}
@@ -2857,7 +2857,7 @@ typedef struct
unsigned int layer_differences;
} DeepCopyData;
-static CoglBool
+static gboolean
deep_copy_layer_cb (CoglPipelineLayer *src_layer,
void *user_data)
{
@@ -2891,7 +2891,7 @@ _cogl_pipeline_deep_copy (CoglPipeline *pipeline,
unsigned long layer_differences)
{
CoglPipeline *new, *authority;
- CoglBool copy_layer_state;
+ gboolean copy_layer_state;
_COGL_GET_CONTEXT (ctx, NULL);
@@ -2946,7 +2946,7 @@ typedef struct
CoglPipelineLayer **layers;
} AddLayersToArrayState;
-static CoglBool
+static gboolean
add_layer_to_array_cb (CoglPipelineLayer *layer,
void *user_data)
{
diff --git a/cogl/cogl/cogl-pipeline.h b/cogl/cogl/cogl-pipeline.h
index 75cd9823e..9e81b659c 100644
--- a/cogl/cogl/cogl-pipeline.h
+++ b/cogl/cogl/cogl-pipeline.h
@@ -119,7 +119,7 @@ cogl_pipeline_copy (CoglPipeline *source);
* Since: 2.0
* Stability: Unstable
*/
-CoglBool
+gboolean
cogl_is_pipeline (void *object);
/**
@@ -134,7 +134,7 @@ cogl_is_pipeline (void *object);
* Since: 2.0
* Stability: Unstable
*/
-typedef CoglBool (*CoglPipelineLayerCallback) (CoglPipeline *pipeline,
+typedef gboolean (*CoglPipelineLayerCallback) (CoglPipeline *pipeline,
int layer_index,
void *user_data);
diff --git a/cogl/cogl/cogl-pixel-buffer.h b/cogl/cogl/cogl-pixel-buffer.h
index febdc6066..3fd421fac 100644
--- a/cogl/cogl/cogl-pixel-buffer.h
+++ b/cogl/cogl/cogl-pixel-buffer.h
@@ -99,7 +99,7 @@ cogl_pixel_buffer_new (CoglContext *context,
* Since: 1.2
* Stability: Unstable
*/
-CoglBool
+gboolean
cogl_is_pixel_buffer (void *object);
#if 0
@@ -123,7 +123,7 @@ cogl_is_pixel_buffer (void *object);
* Since: 1.2
* Stability: Unstable
*/
-CoglBool
+gboolean
cogl_pixel_buffer_set_region (CoglPixelBuffer *buffer,
uint8_t *data,
unsigned int src_width,
diff --git a/cogl/cogl/cogl-primitive-texture.c b/cogl/cogl/cogl-primitive-texture.c
index 754567355..18c742ac1 100644
--- a/cogl/cogl/cogl-primitive-texture.c
+++ b/cogl/cogl/cogl-primitive-texture.c
@@ -35,7 +35,7 @@
#include "cogl-primitive-texture.h"
#include "cogl-texture-private.h"
-CoglBool
+gboolean
cogl_is_primitive_texture (void *object)
{
return (cogl_is_texture (object) &&
@@ -44,7 +44,7 @@ cogl_is_primitive_texture (void *object)
void
cogl_primitive_texture_set_auto_mipmap (CoglPrimitiveTexture *primitive_texture,
- CoglBool value)
+ gboolean value)
{
CoglTexture *texture;
diff --git a/cogl/cogl/cogl-primitive-texture.h b/cogl/cogl/cogl-primitive-texture.h
index 232fa5af5..6fd26a529 100644
--- a/cogl/cogl/cogl-primitive-texture.h
+++ b/cogl/cogl/cogl-primitive-texture.h
@@ -85,7 +85,7 @@ typedef struct _CoglPrimitiveTexture CoglPrimitiveTexture;
* Since: 2.0
* Stability: unstable
*/
-CoglBool
+gboolean
cogl_is_primitive_texture (void *object);
/**
@@ -105,7 +105,7 @@ cogl_is_primitive_texture (void *object);
*/
void
cogl_primitive_texture_set_auto_mipmap (CoglPrimitiveTexture *primitive_texture,
- CoglBool value);
+ gboolean value);
G_END_DECLS
diff --git a/cogl/cogl/cogl-primitive.c b/cogl/cogl/cogl-primitive.c
index f1db751a7..fcaef455f 100644
--- a/cogl/cogl/cogl-primitive.c
+++ b/cogl/cogl/cogl-primitive.c
@@ -398,7 +398,7 @@ _cogl_primitive_free (CoglPrimitive *primitive)
static void
warn_about_midscene_changes (void)
{
- static CoglBool seen = FALSE;
+ static gboolean seen = FALSE;
if (!seen)
{
g_warning ("Mid-scene modification of primitives has "
diff --git a/cogl/cogl/cogl-primitive.h b/cogl/cogl/cogl-primitive.h
index ccfbcd43e..6503b53a5 100644
--- a/cogl/cogl/cogl-primitive.h
+++ b/cogl/cogl/cogl-primitive.h
@@ -874,7 +874,7 @@ cogl_primitive_copy (CoglPrimitive *primitive);
* Since: 1.6
* Stability: Unstable
*/
-CoglBool
+gboolean
cogl_is_primitive (void *object);
/**
@@ -892,7 +892,7 @@ cogl_is_primitive (void *object);
* Since: 1.10
* Stability: Unstable
*/
-typedef CoglBool (* CoglPrimitiveAttributeCallback) (CoglPrimitive *primitive,
+typedef gboolean (* CoglPrimitiveAttributeCallback) (CoglPrimitive *primitive,
CoglAttribute *attribute,
void *user_data);
diff --git a/cogl/cogl/cogl-primitives-private.h b/cogl/cogl/cogl-primitives-private.h
index 188976f28..8f324ff33 100644
--- a/cogl/cogl/cogl-primitives-private.h
+++ b/cogl/cogl/cogl-primitives-private.h
@@ -60,7 +60,7 @@ _cogl_framebuffer_draw_multitextured_rectangles (
CoglPipeline *pipeline,
CoglMultiTexturedRect *rects,
int n_rects,
- CoglBool disable_legacy_state);
+ gboolean disable_legacy_state);
G_END_DECLS
diff --git a/cogl/cogl/cogl-primitives.c b/cogl/cogl/cogl-primitives.c
index 3ff1bac7b..912ef5475 100644
--- a/cogl/cogl/cogl-primitives.c
+++ b/cogl/cogl/cogl-primitives.c
@@ -63,8 +63,8 @@ typedef struct _TextureSlicedQuadState
float v_to_q_scale_y;
float quad_len_x;
float quad_len_y;
- CoglBool flipped_x;
- CoglBool flipped_y;
+ gboolean flipped_x;
+ gboolean flipped_y;
} TextureSlicedQuadState;
typedef struct _TextureSlicedPolygonState
@@ -139,7 +139,7 @@ typedef struct _ValidateFirstLayerState
CoglPipeline *override_pipeline;
} ValidateFirstLayerState;
-static CoglBool
+static gboolean
validate_first_layer_cb (CoglPipeline *pipeline,
int layer_index,
void *user_data)
@@ -205,10 +205,10 @@ _cogl_texture_quad_multiple_primitives (CoglFramebuffer *framebuffer,
float ty_2)
{
TextureSlicedQuadState state;
- CoglBool tex_virtual_flipped_x;
- CoglBool tex_virtual_flipped_y;
- CoglBool quad_flipped_x;
- CoglBool quad_flipped_y;
+ gboolean tex_virtual_flipped_x;
+ gboolean tex_virtual_flipped_y;
+ gboolean quad_flipped_x;
+ gboolean quad_flipped_y;
ValidateFirstLayerState validate_first_layer_state;
CoglPipelineWrapMode wrap_s, wrap_t;
@@ -295,13 +295,13 @@ typedef struct _ValidateTexCoordsState
int user_tex_coords_len;
float *final_tex_coords;
CoglPipeline *override_pipeline;
- CoglBool needs_multiple_primitives;
+ gboolean needs_multiple_primitives;
} ValidateTexCoordsState;
/*
* Validate the texture coordinates for this rectangle.
*/
-static CoglBool
+static gboolean
validate_tex_coords_cb (CoglPipeline *pipeline,
int layer_index,
void *user_data)
@@ -355,7 +355,7 @@ validate_tex_coords_cb (CoglPipeline *pipeline,
{
if (state->n_layers > 1)
{
- static CoglBool warning_seen = FALSE;
+ static gboolean warning_seen = FALSE;
if (!warning_seen)
g_warning ("Skipping layers 1..n of your material since "
"the first layer doesn't support hardware "
@@ -374,7 +374,7 @@ validate_tex_coords_cb (CoglPipeline *pipeline,
}
else
{
- static CoglBool warning_seen = FALSE;
+ static gboolean warning_seen = FALSE;
if (!warning_seen)
g_warning ("Skipping layer %d of your material "
"since you have supplied texture coords "
@@ -435,7 +435,7 @@ validate_tex_coords_cb (CoglPipeline *pipeline,
* - CoglTexturePixmap: assuming the users given texture coordinates don't
* require repeating.
*/
-static CoglBool
+static gboolean
_cogl_multitexture_quad_single_primitive (CoglFramebuffer *framebuffer,
CoglPipeline *pipeline,
const float *position,
@@ -484,10 +484,10 @@ typedef struct _ValidateLayerState
int i;
int first_layer;
CoglPipeline *override_source;
- CoglBool all_use_sliced_quad_fallback;
+ gboolean all_use_sliced_quad_fallback;
} ValidateLayerState;
-static CoglBool
+static gboolean
_cogl_rectangles_validate_layer_cb (CoglPipeline *pipeline,
int layer_index,
void *user_data)
@@ -564,7 +564,7 @@ _cogl_rectangles_validate_layer_cb (CoglPipeline *pipeline,
{
if (cogl_pipeline_get_n_layers (pipeline) > 1)
{
- static CoglBool warning_seen = FALSE;
+ static gboolean warning_seen = FALSE;
if (!state->override_source)
state->override_source = cogl_pipeline_copy (pipeline);
@@ -585,7 +585,7 @@ _cogl_rectangles_validate_layer_cb (CoglPipeline *pipeline,
}
else
{
- static CoglBool warning_seen = FALSE;
+ static gboolean warning_seen = FALSE;
CoglTexture2D *tex_2d;
if (!warning_seen)
@@ -616,7 +616,7 @@ _cogl_rectangles_validate_layer_cb (CoglPipeline *pipeline,
if (!_cogl_texture_can_hardware_repeat (texture) &&
_cogl_pipeline_layer_has_user_matrix (pipeline, layer_index))
{
- static CoglBool warning_seen = FALSE;
+ static gboolean warning_seen = FALSE;
if (!warning_seen)
g_warning ("layer %d of your pipeline uses a custom "
"texture matrix but because the texture doesn't "
@@ -636,7 +636,7 @@ _cogl_framebuffer_draw_multitextured_rectangles (
CoglPipeline *pipeline,
CoglMultiTexturedRect *rects,
int n_rects,
- CoglBool disable_legacy_state)
+ gboolean disable_legacy_state)
{
CoglContext *ctx = framebuffer->context;
CoglPipeline *original_pipeline;
@@ -684,7 +684,7 @@ _cogl_framebuffer_draw_multitextured_rectangles (
if (!state.all_use_sliced_quad_fallback)
{
- CoglBool success =
+ gboolean success =
_cogl_multitexture_quad_single_primitive (framebuffer,
pipeline,
rects[i].position,
@@ -913,7 +913,7 @@ typedef struct _AppendTexCoordsState
float *vertices_out;
} AppendTexCoordsState;
-static CoglBool
+static gboolean
append_tex_coord_attributes_cb (CoglPipeline *pipeline,
int layer_index,
void *user_data)
@@ -949,7 +949,7 @@ typedef struct _ValidateState
CoglPipeline *pipeline;
} ValidateState;
-static CoglBool
+static gboolean
_cogl_polygon_validate_layer_cb (CoglPipeline *pipeline,
int layer_index,
void *user_data)
@@ -987,7 +987,7 @@ _cogl_polygon_validate_layer_cb (CoglPipeline *pipeline,
void
cogl_polygon (const CoglTextureVertex *vertices,
unsigned int n_vertices,
- CoglBool use_color)
+ gboolean use_color)
{
CoglPipeline *pipeline;
ValidateState validate_state;
diff --git a/cogl/cogl/cogl-primitives.h b/cogl/cogl/cogl-primitives.h
index 682cffac1..a24dc5990 100644
--- a/cogl/cogl/cogl-primitives.h
+++ b/cogl/cogl/cogl-primitives.h
@@ -190,7 +190,7 @@ cogl_rectangles (const float *verts,
void
cogl_polygon (const CoglTextureVertex *vertices,
unsigned int n_vertices,
- CoglBool use_color);
+ gboolean use_color);
G_END_DECLS
diff --git a/cogl/cogl/cogl-private.h b/cogl/cogl/cogl-private.h
index faddf2c0c..9f918b851 100644
--- a/cogl/cogl/cogl-private.h
+++ b/cogl/cogl/cogl-private.h
@@ -98,7 +98,7 @@ _cogl_transform_point (const CoglMatrix *matrix_mv,
float *x,
float *y);
-CoglBool
+gboolean
_cogl_check_extension (const char *name, char * const *ext);
void
@@ -108,9 +108,9 @@ void
_cogl_init (void);
void
-_cogl_push_source (CoglPipeline *pipeline, CoglBool enable_legacy);
+_cogl_push_source (CoglPipeline *pipeline, gboolean enable_legacy);
-CoglBool
+gboolean
_cogl_get_enable_legacy_state (void);
#define _cogl_has_private_feature(ctx, feature) \
@@ -152,7 +152,7 @@ _cogl_pixel_format_get_bytes_per_pixel (CoglPixelFormat format);
* endianness when dealing with the given @format
* else %FALSE.
*/
-CoglBool
+gboolean
_cogl_pixel_format_is_endian_dependant (CoglPixelFormat format);
/*
diff --git a/cogl/cogl/cogl-profile.c b/cogl/cogl/cogl-profile.c
index 5099c333d..c7ee7dca1 100644
--- a/cogl/cogl/cogl-profile.c
+++ b/cogl/cogl/cogl-profile.c
@@ -10,7 +10,7 @@
UProfContext *_cogl_uprof_context;
-static CoglBool
+static gboolean
debug_option_getter (void *user_data)
{
unsigned int shift = GPOINTER_TO_UINT (user_data);
@@ -18,7 +18,7 @@ debug_option_getter (void *user_data)
}
static void
-debug_option_setter (CoglBool value, void *user_data)
+debug_option_setter (gboolean value, void *user_data)
{
unsigned int shift = GPOINTER_TO_UINT (user_data);
diff --git a/cogl/cogl/cogl-quaternion.c b/cogl/cogl/cogl-quaternion.c
index 8b747f48d..e4fc4644c 100644
--- a/cogl/cogl/cogl-quaternion.c
+++ b/cogl/cogl/cogl-quaternion.c
@@ -324,7 +324,7 @@ cogl_quaternion_init_from_matrix (CoglQuaternion *quaternion,
}
}
-CoglBool
+gboolean
cogl_quaternion_equal (const void *v1, const void *v2)
{
const CoglQuaternion *a = v1;
diff --git a/cogl/cogl/cogl-quaternion.h b/cogl/cogl/cogl-quaternion.h
index 59cc7401e..6e8db6bf8 100644
--- a/cogl/cogl/cogl-quaternion.h
+++ b/cogl/cogl/cogl-quaternion.h
@@ -318,7 +318,7 @@ cogl_quaternion_init_from_matrix (CoglQuaternion *quaternion,
*
* Since: 2.0
*/
-CoglBool
+gboolean
cogl_quaternion_equal (const void *v1, const void *v2);
/**
diff --git a/cogl/cogl/cogl-rectangle-map.c b/cogl/cogl/cogl-rectangle-map.c
index 5a0b3ddbf..056d68006 100644
--- a/cogl/cogl/cogl-rectangle-map.c
+++ b/cogl/cogl/cogl-rectangle-map.c
@@ -115,7 +115,7 @@ struct _CoglRectangleMapStackEntry
CoglRectangleMapNode *node;
/* Index of next branch of this node to explore. Basically either 0
to go left or 1 to go right */
- CoglBool next_index;
+ gboolean next_index;
};
static CoglRectangleMapNode *
@@ -159,7 +159,7 @@ _cogl_rectangle_map_new (unsigned int width,
static void
_cogl_rectangle_map_stack_push (GArray *stack,
CoglRectangleMapNode *node,
- CoglBool next_index)
+ gboolean next_index)
{
CoglRectangleMapStackEntry *new_entry;
@@ -346,7 +346,7 @@ _cogl_rectangle_map_verify (CoglRectangleMap *map)
#endif /* COGL_ENABLE_DEBUG */
-CoglBool
+gboolean
_cogl_rectangle_map_add (CoglRectangleMap *map,
unsigned int width,
unsigned int height,
diff --git a/cogl/cogl/cogl-rectangle-map.h b/cogl/cogl/cogl-rectangle-map.h
index 1dd50fdbe..613965d68 100644
--- a/cogl/cogl/cogl-rectangle-map.h
+++ b/cogl/cogl/cogl-rectangle-map.h
@@ -50,7 +50,7 @@ _cogl_rectangle_map_new (unsigned int width,
unsigned int height,
GDestroyNotify value_destroy_func);
-CoglBool
+gboolean
_cogl_rectangle_map_add (CoglRectangleMap *map,
unsigned int width,
unsigned int height,
diff --git a/cogl/cogl/cogl-renderer-private.h b/cogl/cogl/cogl-renderer-private.h
index 01e18a57c..a308801a7 100644
--- a/cogl/cogl/cogl-renderer-private.h
+++ b/cogl/cogl/cogl-renderer-private.h
@@ -49,7 +49,7 @@ typedef const CoglWinsysVtable *(*CoglCustomWinsysVtableGetter) (CoglRenderer *r
struct _CoglRenderer
{
CoglObject _parent;
- CoglBool connected;
+ gboolean connected;
CoglDriver driver_override;
const CoglDriverVtable *driver_vtable;
const CoglTextureDriver *texture_driver;
@@ -69,9 +69,9 @@ struct _CoglRenderer
#ifdef COGL_HAS_XLIB_SUPPORT
Display *foreign_xdpy;
- CoglBool xlib_enable_event_retrieval;
- CoglBool xlib_want_reset_on_video_memory_purge;
- CoglBool xlib_enable_threaded_swap_wait;
+ gboolean xlib_enable_event_retrieval;
+ gboolean xlib_want_reset_on_video_memory_purge;
+ gboolean xlib_enable_threaded_swap_wait;
#endif
CoglDriver driver;
@@ -109,6 +109,6 @@ _cogl_renderer_remove_native_filter (CoglRenderer *renderer,
void *
_cogl_renderer_get_proc_address (CoglRenderer *renderer,
const char *name,
- CoglBool in_core);
+ gboolean in_core);
#endif /* __COGL_RENDERER_PRIVATE_H */
diff --git a/cogl/cogl/cogl-renderer.c b/cogl/cogl/cogl-renderer.c
index b51ad1a97..854aa1fdd 100644
--- a/cogl/cogl/cogl-renderer.c
+++ b/cogl/cogl/cogl-renderer.c
@@ -252,7 +252,7 @@ cogl_xlib_renderer_get_foreign_display (CoglRenderer *renderer)
void
cogl_xlib_renderer_set_event_retrieval_enabled (CoglRenderer *renderer,
- CoglBool enable)
+ gboolean enable)
{
_COGL_RETURN_IF_FAIL (cogl_is_renderer (renderer));
/* NB: Renderers are considered immutable once connected */
@@ -263,7 +263,7 @@ cogl_xlib_renderer_set_event_retrieval_enabled (CoglRenderer *renderer,
void
cogl_xlib_renderer_request_reset_on_video_memory_purge (CoglRenderer *renderer,
- CoglBool enable)
+ gboolean enable)
{
_COGL_RETURN_IF_FAIL (cogl_is_renderer (renderer));
_COGL_RETURN_IF_FAIL (!renderer->connected);
@@ -273,7 +273,7 @@ cogl_xlib_renderer_request_reset_on_video_memory_purge (CoglRenderer *renderer,
void
cogl_xlib_renderer_set_threaded_swap_wait_enabled (CoglRenderer *renderer,
- CoglBool enable)
+ gboolean enable)
{
_COGL_RETURN_IF_FAIL (cogl_is_renderer (renderer));
/* NB: Renderers are considered immutable once connected */
@@ -283,7 +283,7 @@ cogl_xlib_renderer_set_threaded_swap_wait_enabled (CoglRenderer *renderer,
}
#endif /* COGL_HAS_XLIB_SUPPORT */
-CoglBool
+gboolean
cogl_renderer_check_onscreen_template (CoglRenderer *renderer,
CoglOnscreenTemplate *onscreen_template,
CoglError **error)
@@ -305,7 +305,7 @@ cogl_renderer_check_onscreen_template (CoglRenderer *renderer,
return TRUE;
}
-typedef CoglBool (*CoglDriverCallback) (CoglDriverDescription *description,
+typedef gboolean (*CoglDriverCallback) (CoglDriverDescription *description,
void *user_data);
static void
@@ -405,7 +405,7 @@ typedef struct _SatisfyConstraintsState
const CoglDriverDescription *driver_description;
} SatisfyConstraintsState;
-static CoglBool
+static gboolean
satisfy_constraints (CoglDriverDescription *description,
void *user_data)
{
@@ -432,7 +432,7 @@ satisfy_constraints (CoglDriverDescription *description,
return FALSE;
}
-static CoglBool
+static gboolean
_cogl_renderer_choose_driver (CoglRenderer *renderer,
CoglError **error)
{
@@ -472,7 +472,7 @@ _cogl_renderer_choose_driver (CoglRenderer *renderer,
if (driver_override != COGL_DRIVER_ANY)
{
- CoglBool found = FALSE;
+ gboolean found = FALSE;
int i;
for (i = 0; i < G_N_ELEMENTS (_cogl_drivers); i++)
@@ -554,7 +554,7 @@ cogl_renderer_set_custom_winsys (CoglRenderer *renderer,
renderer->custom_winsys_vtable_getter = winsys_vtable_getter;
}
-static CoglBool
+static gboolean
connect_custom_winsys (CoglRenderer *renderer,
CoglError **error)
{
@@ -588,12 +588,12 @@ connect_custom_winsys (CoglRenderer *renderer,
return FALSE;
}
-CoglBool
+gboolean
cogl_renderer_connect (CoglRenderer *renderer, CoglError **error)
{
int i;
GString *error_message;
- CoglBool constraints_failed = FALSE;
+ gboolean constraints_failed = FALSE;
if (renderer->connected)
return TRUE;
@@ -613,7 +613,7 @@ cogl_renderer_connect (CoglRenderer *renderer, CoglError **error)
const CoglWinsysVtable *winsys = _cogl_winsys_vtable_getters[i]();
CoglError *tmp_error = NULL;
GList *l;
- CoglBool skip_due_to_constraints = FALSE;
+ gboolean skip_due_to_constraints = FALSE;
if (renderer->winsys_id_override != COGL_WINSYS_ID_ANY)
{
@@ -769,7 +769,7 @@ cogl_renderer_get_winsys_id (CoglRenderer *renderer)
void *
_cogl_renderer_get_proc_address (CoglRenderer *renderer,
const char *name,
- CoglBool in_core)
+ gboolean in_core)
{
const CoglWinsysVtable *winsys = _cogl_renderer_get_winsys (renderer);
diff --git a/cogl/cogl/cogl-renderer.h b/cogl/cogl/cogl-renderer.h
index 6b52ea657..0b3ddb8f2 100644
--- a/cogl/cogl/cogl-renderer.h
+++ b/cogl/cogl/cogl-renderer.h
@@ -103,7 +103,7 @@ GType cogl_renderer_get_gtype (void);
* Since: 1.10
* Stability: unstable
*/
-CoglBool
+gboolean
cogl_is_renderer (void *object);
/**
@@ -231,7 +231,7 @@ cogl_renderer_get_n_fragment_texture_units (CoglRenderer *renderer);
* Since: 1.10
* Stability: unstable
*/
-CoglBool
+gboolean
cogl_renderer_check_onscreen_template (CoglRenderer *renderer,
CoglOnscreenTemplate *onscreen_template,
CoglError **error);
@@ -253,7 +253,7 @@ cogl_renderer_check_onscreen_template (CoglRenderer *renderer,
* Since: 1.10
* Stability: unstable
*/
-CoglBool
+gboolean
cogl_renderer_connect (CoglRenderer *renderer, CoglError **error);
/**
diff --git a/cogl/cogl/cogl-sampler-cache.c b/cogl/cogl/cogl-sampler-cache.c
index c72b8b247..b77c49c37 100644
--- a/cogl/cogl/cogl-sampler-cache.c
+++ b/cogl/cogl/cogl-sampler-cache.c
@@ -80,7 +80,7 @@ canonicalize_key (CoglSamplerCacheEntry *key)
key->wrap_mode_p = get_real_wrap_mode (key->wrap_mode_p);
}
-static CoglBool
+static gboolean
wrap_mode_equal_gl (CoglSamplerCacheWrapMode wrap_mode0,
CoglSamplerCacheWrapMode wrap_mode1)
{
@@ -90,7 +90,7 @@ wrap_mode_equal_gl (CoglSamplerCacheWrapMode wrap_mode0,
return get_real_wrap_mode (wrap_mode0) == get_real_wrap_mode (wrap_mode1);
}
-static CoglBool
+static gboolean
sampler_state_equal_gl (const void *value0,
const void *value1)
{
@@ -135,7 +135,7 @@ hash_sampler_state_gl (const void *key)
return _cogl_util_one_at_a_time_mix (hash);
}
-static CoglBool
+static gboolean
sampler_state_equal_cogl (const void *value0,
const void *value1)
{
diff --git a/cogl/cogl/cogl-snippet-private.h b/cogl/cogl/cogl-snippet-private.h
index e3269f20d..323117b77 100644
--- a/cogl/cogl/cogl-snippet-private.h
+++ b/cogl/cogl/cogl-snippet-private.h
@@ -62,7 +62,7 @@ struct _CoglSnippet
/* This is set to TRUE the first time the snippet is attached to the
pipeline. After that any attempts to modify the snippet will be
ignored. */
- CoglBool immutable;
+ gboolean immutable;
char *declarations;
char *pre;
diff --git a/cogl/cogl/cogl-snippet.c b/cogl/cogl/cogl-snippet.c
index 603074942..1db2b4557 100644
--- a/cogl/cogl/cogl-snippet.c
+++ b/cogl/cogl/cogl-snippet.c
@@ -69,7 +69,7 @@ cogl_snippet_get_hook (CoglSnippet *snippet)
return snippet->hook;
}
-static CoglBool
+static gboolean
_cogl_snippet_modify (CoglSnippet *snippet)
{
if (snippet->immutable)
diff --git a/cogl/cogl/cogl-snippet.h b/cogl/cogl/cogl-snippet.h
index 7880c5a5f..2cf5b7ddf 100644
--- a/cogl/cogl/cogl-snippet.h
+++ b/cogl/cogl/cogl-snippet.h
@@ -719,7 +719,7 @@ cogl_snippet_get_hook (CoglSnippet *snippet);
* Since: 1.10
* Stability: Unstable
*/
-CoglBool
+gboolean
cogl_is_snippet (void *object);
/**
diff --git a/cogl/cogl/cogl-spans.c b/cogl/cogl/cogl-spans.c
index 3f275dcfa..a253ace4e 100644
--- a/cogl/cogl/cogl-spans.c
+++ b/cogl/cogl/cogl-spans.c
@@ -171,7 +171,7 @@ _cogl_span_iter_next (CoglSpanIter *iter)
_cogl_span_iter_update (iter);
}
-CoglBool
+gboolean
_cogl_span_iter_end (CoglSpanIter *iter)
{
/* End reached when whole area covered */
diff --git a/cogl/cogl/cogl-spans.h b/cogl/cogl/cogl-spans.h
index a236784c4..d93c39688 100644
--- a/cogl/cogl/cogl-spans.h
+++ b/cogl/cogl/cogl-spans.h
@@ -54,8 +54,8 @@ typedef struct _CoglSpanIter
float cover_end;
float intersect_start;
float intersect_end;
- CoglBool intersects;
- CoglBool flipped;
+ gboolean intersects;
+ gboolean flipped;
CoglPipelineWrapMode wrap_mode;
int mirror_direction;
} CoglSpanIter;
@@ -75,7 +75,7 @@ _cogl_span_iter_begin (CoglSpanIter *iter,
void
_cogl_span_iter_next (CoglSpanIter *iter);
-CoglBool
+gboolean
_cogl_span_iter_end (CoglSpanIter *iter);
#endif /* __COGL_SPANS_PRIVATE_H */
diff --git a/cogl/cogl/cogl-sub-texture.c b/cogl/cogl/cogl-sub-texture.c
index b33ea52ae..00a962f91 100644
--- a/cogl/cogl/cogl-sub-texture.c
+++ b/cogl/cogl/cogl-sub-texture.c
@@ -268,12 +268,12 @@ cogl_sub_texture_new (CoglContext *ctx,
return _cogl_sub_texture_object_new (sub_tex);
}
-static CoglBool
+static gboolean
_cogl_sub_texture_allocate (CoglTexture *tex,
CoglError **error)
{
CoglSubTexture *sub_tex = COGL_SUB_TEXTURE (tex);
- CoglBool status = cogl_texture_allocate (sub_tex->full_texture, error);
+ gboolean status = cogl_texture_allocate (sub_tex->full_texture, error);
_cogl_texture_set_allocated (tex,
_cogl_texture_get_format (sub_tex->full_texture),
@@ -296,7 +296,7 @@ _cogl_sub_texture_get_max_waste (CoglTexture *tex)
return cogl_texture_get_max_waste (sub_tex->full_texture);
}
-static CoglBool
+static gboolean
_cogl_sub_texture_is_sliced (CoglTexture *tex)
{
CoglSubTexture *sub_tex = COGL_SUB_TEXTURE (tex);
@@ -304,7 +304,7 @@ _cogl_sub_texture_is_sliced (CoglTexture *tex)
return cogl_texture_is_sliced (sub_tex->full_texture);
}
-static CoglBool
+static gboolean
_cogl_sub_texture_can_hardware_repeat (CoglTexture *tex)
{
CoglSubTexture *sub_tex = COGL_SUB_TEXTURE (tex);
@@ -354,7 +354,7 @@ _cogl_sub_texture_transform_quad_coords_to_gl (CoglTexture *tex,
coords);
}
-static CoglBool
+static gboolean
_cogl_sub_texture_get_gl_texture (CoglTexture *tex,
GLuint *out_gl_handle,
GLenum *out_gl_target)
@@ -391,7 +391,7 @@ _cogl_sub_texture_ensure_non_quad_rendering (CoglTexture *tex)
{
}
-static CoglBool
+static gboolean
_cogl_sub_texture_set_region (CoglTexture *tex,
int src_x,
int src_y,
@@ -428,7 +428,7 @@ _cogl_sub_texture_set_region (CoglTexture *tex,
error);
}
-static CoglBool
+static gboolean
_cogl_sub_texture_is_get_data_supported (CoglTexture *tex)
{
CoglSubTexture *sub_tex = COGL_SUB_TEXTURE (tex);
diff --git a/cogl/cogl/cogl-sub-texture.h b/cogl/cogl/cogl-sub-texture.h
index 59de9a933..e12d75c2e 100644
--- a/cogl/cogl/cogl-sub-texture.h
+++ b/cogl/cogl/cogl-sub-texture.h
@@ -126,7 +126,7 @@ cogl_sub_texture_get_parent (CoglSubTexture *sub_texture);
* Since: 1.10
* Stability: unstable
*/
-CoglBool
+gboolean
cogl_is_sub_texture (void *object);
G_END_DECLS
diff --git a/cogl/cogl/cogl-swap-chain-private.h b/cogl/cogl/cogl-swap-chain-private.h
index c67e6f08b..34c2e2120 100644
--- a/cogl/cogl/cogl-swap-chain-private.h
+++ b/cogl/cogl/cogl-swap-chain-private.h
@@ -37,7 +37,7 @@ struct _CoglSwapChain
{
CoglObject _parent;
- CoglBool has_alpha;
+ gboolean has_alpha;
int length;
};
diff --git a/cogl/cogl/cogl-swap-chain.c b/cogl/cogl/cogl-swap-chain.c
index fbec88ea7..89bab0049 100644
--- a/cogl/cogl/cogl-swap-chain.c
+++ b/cogl/cogl/cogl-swap-chain.c
@@ -61,7 +61,7 @@ cogl_swap_chain_new (void)
void
cogl_swap_chain_set_has_alpha (CoglSwapChain *swap_chain,
- CoglBool has_alpha)
+ gboolean has_alpha)
{
swap_chain->has_alpha = has_alpha;
}
diff --git a/cogl/cogl/cogl-swap-chain.h b/cogl/cogl/cogl-swap-chain.h
index 2d8d02e86..0ec1b3bc5 100644
--- a/cogl/cogl/cogl-swap-chain.h
+++ b/cogl/cogl/cogl-swap-chain.h
@@ -53,13 +53,13 @@ cogl_swap_chain_new (void);
void
cogl_swap_chain_set_has_alpha (CoglSwapChain *swap_chain,
- CoglBool has_alpha);
+ gboolean has_alpha);
void
cogl_swap_chain_set_length (CoglSwapChain *swap_chain,
int length);
-CoglBool
+gboolean
cogl_is_swap_chain (void *object);
G_END_DECLS
diff --git a/cogl/cogl/cogl-texture-2d-private.h b/cogl/cogl/cogl-texture-2d-private.h
index feda782c1..450d156f1 100644
--- a/cogl/cogl/cogl-texture-2d-private.h
+++ b/cogl/cogl/cogl-texture-2d-private.h
@@ -44,9 +44,9 @@ struct _CoglTexture2D
CoglPixelFormat */
CoglPixelFormat internal_format;
- CoglBool auto_mipmap;
- CoglBool mipmaps_dirty;
- CoglBool is_foreign;
+ gboolean auto_mipmap;
+ gboolean mipmaps_dirty;
+ gboolean is_foreign;
/* TODO: factor out these OpenGL specific members into some form
* of driver private state. */
@@ -70,7 +70,7 @@ struct _CoglTexture2D
CoglTexture2D *
_cogl_texture_2d_new_from_bitmap (CoglBitmap *bmp,
- CoglBool can_convert_in_place);
+ gboolean can_convert_in_place);
CoglTexture2D *
_cogl_texture_2d_create_base (CoglContext *ctx,
@@ -81,7 +81,7 @@ _cogl_texture_2d_create_base (CoglContext *ctx,
void
_cogl_texture_2d_set_auto_mipmap (CoglTexture *tex,
- CoglBool value);
+ gboolean value);
/*
* _cogl_texture_2d_externally_modified:
diff --git a/cogl/cogl/cogl-texture-2d-sliced-private.h b/cogl/cogl/cogl-texture-2d-sliced-private.h
index e827923c0..ba1766831 100644
--- a/cogl/cogl/cogl-texture-2d-sliced-private.h
+++ b/cogl/cogl/cogl-texture-2d-sliced-private.h
@@ -62,6 +62,6 @@ _cogl_texture_2d_sliced_new_from_foreign (CoglContext *context,
CoglTexture2DSliced *
_cogl_texture_2d_sliced_new_from_bitmap (CoglBitmap *bmp,
int max_waste,
- CoglBool can_convert_in_place);
+ gboolean can_convert_in_place);
#endif /* __COGL_TEXTURE_2D_SLICED_PRIVATE_H */
diff --git a/cogl/cogl/cogl-texture-2d-sliced.c b/cogl/cogl/cogl-texture-2d-sliced.c
index 3e276f9f0..57a0bc601 100644
--- a/cogl/cogl/cogl-texture-2d-sliced.c
+++ b/cogl/cogl/cogl-texture-2d-sliced.c
@@ -178,7 +178,7 @@ _cogl_texture_2d_sliced_allocate_waste_buffer (CoglTexture2DSliced *tex_2ds,
return waste_buf;
}
-static CoglBool
+static gboolean
_cogl_texture_2d_sliced_set_waste (CoglTexture2DSliced *tex_2ds,
CoglBitmap *source_bmp,
CoglTexture2D *slice_tex,
@@ -193,7 +193,7 @@ _cogl_texture_2d_sliced_set_waste (CoglTexture2DSliced *tex_2ds,
int dst_y,
CoglError **error)
{
- CoglBool need_x, need_y;
+ gboolean need_x, need_y;
CoglContext *ctx = COGL_TEXTURE (tex_2ds)->context;
/* If the x_span is sliced and the upload touches the
@@ -339,7 +339,7 @@ _cogl_texture_2d_sliced_set_waste (CoglTexture2DSliced *tex_2ds,
return TRUE;
}
-static CoglBool
+static gboolean
_cogl_texture_2d_sliced_upload_bitmap (CoglTexture2DSliced *tex_2ds,
CoglBitmap *bmp,
CoglError **error)
@@ -429,7 +429,7 @@ _cogl_texture_2d_sliced_upload_bitmap (CoglTexture2DSliced *tex_2ds,
return TRUE;
}
-static CoglBool
+static gboolean
_cogl_texture_2d_sliced_upload_subregion (CoglTexture2DSliced *tex_2ds,
int src_x,
int src_y,
@@ -683,7 +683,7 @@ free_spans (CoglTexture2DSliced *tex_2ds)
}
}
-static CoglBool
+static gboolean
setup_spans (CoglContext *ctx,
CoglTexture2DSliced *tex_2ds,
int width,
@@ -834,7 +834,7 @@ free_slices (CoglTexture2DSliced *tex_2ds)
free_spans (tex_2ds);
}
-static CoglBool
+static gboolean
allocate_slices (CoglTexture2DSliced *tex_2ds,
int width,
int height,
@@ -955,7 +955,7 @@ cogl_texture_2d_sliced_new_with_size (CoglContext *ctx,
CoglTexture2DSliced *
_cogl_texture_2d_sliced_new_from_bitmap (CoglBitmap *bmp,
int max_waste,
- CoglBool can_convert_in_place)
+ gboolean can_convert_in_place)
{
CoglTextureLoader *loader;
@@ -1094,7 +1094,7 @@ cogl_texture_2d_sliced_new_from_file (CoglContext *ctx,
return tex_2ds;
}
-static CoglBool
+static gboolean
allocate_with_size (CoglTexture2DSliced *tex_2ds,
CoglTextureLoader *loader,
CoglError **error)
@@ -1120,7 +1120,7 @@ allocate_with_size (CoglTexture2DSliced *tex_2ds,
return FALSE;
}
-static CoglBool
+static gboolean
allocate_from_bitmap (CoglTexture2DSliced *tex_2ds,
CoglTextureLoader *loader,
CoglError **error)
@@ -1129,7 +1129,7 @@ allocate_from_bitmap (CoglTexture2DSliced *tex_2ds,
CoglBitmap *bmp = loader->src.bitmap.bitmap;
int width = cogl_bitmap_get_width (bmp);
int height = cogl_bitmap_get_height (bmp);
- CoglBool can_convert_in_place = loader->src.bitmap.can_convert_in_place;
+ gboolean can_convert_in_place = loader->src.bitmap.can_convert_in_place;
CoglPixelFormat internal_format;
CoglBitmap *upload_bmp;
@@ -1173,7 +1173,7 @@ allocate_from_bitmap (CoglTexture2DSliced *tex_2ds,
return TRUE;
}
-static CoglBool
+static gboolean
allocate_from_gl_foreign (CoglTexture2DSliced *tex_2ds,
CoglTextureLoader *loader,
CoglError **error)
@@ -1238,7 +1238,7 @@ allocate_from_gl_foreign (CoglTexture2DSliced *tex_2ds,
return TRUE;
}
-static CoglBool
+static gboolean
_cogl_texture_2d_sliced_allocate (CoglTexture *tex,
CoglError **error)
{
@@ -1262,7 +1262,7 @@ _cogl_texture_2d_sliced_allocate (CoglTexture *tex,
g_return_val_if_reached (FALSE);
}
-static CoglBool
+static gboolean
_cogl_texture_2d_sliced_is_foreign (CoglTexture *tex)
{
CoglTexture2DSliced *tex_2ds = COGL_TEXTURE_2D_SLICED (tex);
@@ -1285,7 +1285,7 @@ _cogl_texture_2d_sliced_get_max_waste (CoglTexture *tex)
return tex_2ds->max_waste;
}
-static CoglBool
+static gboolean
_cogl_texture_2d_sliced_is_sliced (CoglTexture *tex)
{
CoglTexture2DSliced *tex_2ds = COGL_TEXTURE_2D_SLICED (tex);
@@ -1302,7 +1302,7 @@ _cogl_texture_2d_sliced_is_sliced (CoglTexture *tex)
return FALSE;
}
-static CoglBool
+static gboolean
_cogl_texture_2d_sliced_can_hardware_repeat (CoglTexture *tex)
{
CoglTexture2DSliced *tex_2ds = COGL_TEXTURE_2D_SLICED (tex);
@@ -1353,7 +1353,7 @@ static CoglTransformResult
_cogl_texture_2d_sliced_transform_quad_coords_to_gl (CoglTexture *tex,
float *coords)
{
- CoglBool need_repeat = FALSE;
+ gboolean need_repeat = FALSE;
int i;
/* This is a bit lazy - in the case where the quad lies entirely
@@ -1378,7 +1378,7 @@ _cogl_texture_2d_sliced_transform_quad_coords_to_gl (CoglTexture *tex,
? COGL_TRANSFORM_HARDWARE_REPEAT : COGL_TRANSFORM_NO_REPEAT);
}
-static CoglBool
+static gboolean
_cogl_texture_2d_sliced_get_gl_texture (CoglTexture *tex,
GLuint *out_gl_handle,
GLenum *out_gl_target)
@@ -1455,7 +1455,7 @@ _cogl_texture_2d_sliced_ensure_non_quad_rendering (CoglTexture *tex)
}
}
-static CoglBool
+static gboolean
_cogl_texture_2d_sliced_set_region (CoglTexture *tex,
int src_x,
int src_y,
@@ -1469,7 +1469,7 @@ _cogl_texture_2d_sliced_set_region (CoglTexture *tex,
{
CoglTexture2DSliced *tex_2ds = COGL_TEXTURE_2D_SLICED (tex);
CoglBitmap *upload_bmp;
- CoglBool status;
+ gboolean status;
upload_bmp = _cogl_bitmap_convert_for_upload (bmp,
_cogl_texture_get_format (tex),
diff --git a/cogl/cogl/cogl-texture-2d-sliced.h b/cogl/cogl/cogl-texture-2d-sliced.h
index 7208ef41e..8d43fc5ee 100644
--- a/cogl/cogl/cogl-texture-2d-sliced.h
+++ b/cogl/cogl/cogl-texture-2d-sliced.h
@@ -293,7 +293,7 @@ cogl_texture_2d_sliced_new_from_bitmap (CoglBitmap *bmp,
* Since: 1.10
* Stability: unstable
*/
-CoglBool
+gboolean
cogl_is_texture_2d_sliced (void *object);
#endif /* __COGL_TEXURE_2D_SLICED_H */
diff --git a/cogl/cogl/cogl-texture-2d.c b/cogl/cogl/cogl-texture-2d.c
index 52fab8213..76f0e3a87 100644
--- a/cogl/cogl/cogl-texture-2d.c
+++ b/cogl/cogl/cogl-texture-2d.c
@@ -85,7 +85,7 @@ _cogl_texture_2d_free (CoglTexture2D *tex_2d)
void
_cogl_texture_2d_set_auto_mipmap (CoglTexture *tex,
- CoglBool value)
+ gboolean value)
{
CoglTexture2D *tex_2d = COGL_TEXTURE_2D (tex);
@@ -133,7 +133,7 @@ cogl_texture_2d_new_with_size (CoglContext *ctx,
COGL_PIXEL_FORMAT_RGBA_8888_PRE, loader);
}
-static CoglBool
+static gboolean
_cogl_texture_2d_allocate (CoglTexture *tex,
CoglError **error)
{
@@ -144,7 +144,7 @@ _cogl_texture_2d_allocate (CoglTexture *tex,
CoglTexture2D *
_cogl_texture_2d_new_from_bitmap (CoglBitmap *bmp,
- CoglBool can_convert_in_place)
+ gboolean can_convert_in_place)
{
CoglTextureLoader *loader;
@@ -313,7 +313,7 @@ shm_buffer_get_cogl_pixel_format (struct wl_shm_buffer *shm_buffer,
*components_out = components;
}
-CoglBool
+gboolean
cogl_wayland_texture_set_region_from_shm_buffer (CoglTexture *texture,
int src_x,
int src_y,
@@ -496,13 +496,13 @@ _cogl_texture_2d_get_max_waste (CoglTexture *tex)
return -1;
}
-static CoglBool
+static gboolean
_cogl_texture_2d_is_sliced (CoglTexture *tex)
{
return FALSE;
}
-static CoglBool
+static gboolean
_cogl_texture_2d_can_hardware_repeat (CoglTexture *tex)
{
CoglContext *ctx = tex->context;
@@ -546,7 +546,7 @@ _cogl_texture_2d_transform_quad_coords_to_gl (CoglTexture *tex,
return COGL_TRANSFORM_NO_REPEAT;
}
-static CoglBool
+static gboolean
_cogl_texture_2d_get_gl_texture (CoglTexture *tex,
GLuint *out_gl_handle,
GLenum *out_gl_target)
@@ -595,7 +595,7 @@ _cogl_texture_2d_ensure_non_quad_rendering (CoglTexture *tex)
/* Nothing needs to be done */
}
-static CoglBool
+static gboolean
_cogl_texture_2d_set_region (CoglTexture *tex,
int src_x,
int src_y,
@@ -629,7 +629,7 @@ _cogl_texture_2d_set_region (CoglTexture *tex,
return TRUE;
}
-static CoglBool
+static gboolean
_cogl_texture_2d_is_get_data_supported (CoglTexture *tex)
{
CoglTexture2D *tex_2d = COGL_TEXTURE_2D (tex);
@@ -638,7 +638,7 @@ _cogl_texture_2d_is_get_data_supported (CoglTexture *tex)
return ctx->driver_vtable->texture_2d_is_get_data_supported (tex_2d);
}
-static CoglBool
+static gboolean
_cogl_texture_2d_get_data (CoglTexture *tex,
CoglPixelFormat format,
int rowstride,
@@ -668,7 +668,7 @@ _cogl_texture_2d_get_gl_format (CoglTexture *tex)
return COGL_TEXTURE_2D (tex)->gl_internal_format;
}
-static CoglBool
+static gboolean
_cogl_texture_2d_is_foreign (CoglTexture *tex)
{
return COGL_TEXTURE_2D (tex)->is_foreign;
diff --git a/cogl/cogl/cogl-texture-2d.h b/cogl/cogl/cogl-texture-2d.h
index a58ded4b0..85cadba95 100644
--- a/cogl/cogl/cogl-texture-2d.h
+++ b/cogl/cogl/cogl-texture-2d.h
@@ -82,7 +82,7 @@ GType cogl_texture_2d_get_gtype (void);
* Return value: %TRUE if the object references a #CoglTexture2D,
* %FALSE otherwise
*/
-CoglBool
+gboolean
cogl_is_texture_2d (void *object);
/**
diff --git a/cogl/cogl/cogl-texture-3d-private.h b/cogl/cogl/cogl-texture-3d-private.h
index b6e0066d3..170970e24 100644
--- a/cogl/cogl/cogl-texture-3d-private.h
+++ b/cogl/cogl/cogl-texture-3d-private.h
@@ -45,8 +45,8 @@ struct _CoglTexture3D
CoglPixelFormat */
CoglPixelFormat internal_format;
int depth;
- CoglBool auto_mipmap;
- CoglBool mipmaps_dirty;
+ gboolean auto_mipmap;
+ gboolean mipmaps_dirty;
/* TODO: factor out these OpenGL specific members into some form
* of driver private state. */
diff --git a/cogl/cogl/cogl-texture-3d.c b/cogl/cogl/cogl-texture-3d.c
index 0d59f771c..b23bc3761 100644
--- a/cogl/cogl/cogl-texture-3d.c
+++ b/cogl/cogl/cogl-texture-3d.c
@@ -112,7 +112,7 @@ _cogl_texture_3d_free (CoglTexture3D *tex_3d)
static void
_cogl_texture_3d_set_auto_mipmap (CoglTexture *tex,
- CoglBool value)
+ gboolean value)
{
CoglTexture3D *tex_3d = COGL_TEXTURE_3D (tex);
@@ -284,7 +284,7 @@ cogl_texture_3d_new_from_data (CoglContext *context,
return ret;
}
-static CoglBool
+static gboolean
_cogl_texture_3d_can_create (CoglContext *ctx,
int width,
int height,
@@ -345,7 +345,7 @@ _cogl_texture_3d_can_create (CoglContext *ctx,
return TRUE;
}
-static CoglBool
+static gboolean
allocate_with_size (CoglTexture3D *tex_3d,
CoglTextureLoader *loader,
CoglError **error)
@@ -408,7 +408,7 @@ allocate_with_size (CoglTexture3D *tex_3d,
return TRUE;
}
-static CoglBool
+static gboolean
allocate_from_bitmap (CoglTexture3D *tex_3d,
CoglTextureLoader *loader,
CoglError **error)
@@ -421,7 +421,7 @@ allocate_from_bitmap (CoglTexture3D *tex_3d,
int height = loader->src.bitmap.height;
int depth = loader->src.bitmap.depth;
CoglPixelFormat bmp_format = cogl_bitmap_get_format (bmp);
- CoglBool can_convert_in_place = loader->src.bitmap.can_convert_in_place;
+ gboolean can_convert_in_place = loader->src.bitmap.can_convert_in_place;
CoglBitmap *upload_bmp;
CoglPixelFormat upload_format;
GLenum gl_intformat;
@@ -517,7 +517,7 @@ allocate_from_bitmap (CoglTexture3D *tex_3d,
return TRUE;
}
-static CoglBool
+static gboolean
_cogl_texture_3d_allocate (CoglTexture *tex,
CoglError **error)
{
@@ -545,13 +545,13 @@ _cogl_texture_3d_get_max_waste (CoglTexture *tex)
return -1;
}
-static CoglBool
+static gboolean
_cogl_texture_3d_is_sliced (CoglTexture *tex)
{
return FALSE;
}
-static CoglBool
+static gboolean
_cogl_texture_3d_can_hardware_repeat (CoglTexture *tex)
{
return TRUE;
@@ -573,7 +573,7 @@ _cogl_texture_3d_transform_quad_coords_to_gl (CoglTexture *tex,
/* The texture coordinates map directly so we don't need to do
anything other than check for repeats */
- CoglBool need_repeat = FALSE;
+ gboolean need_repeat = FALSE;
int i;
for (i = 0; i < 4; i++)
@@ -584,7 +584,7 @@ _cogl_texture_3d_transform_quad_coords_to_gl (CoglTexture *tex,
: COGL_TRANSFORM_NO_REPEAT);
}
-static CoglBool
+static gboolean
_cogl_texture_3d_get_gl_texture (CoglTexture *tex,
GLuint *out_gl_handle,
GLenum *out_gl_target)
@@ -676,7 +676,7 @@ _cogl_texture_3d_ensure_non_quad_rendering (CoglTexture *tex)
/* Nothing needs to be done */
}
-static CoglBool
+static gboolean
_cogl_texture_3d_set_region (CoglTexture *tex,
int src_x,
int src_y,
diff --git a/cogl/cogl/cogl-texture-3d.h b/cogl/cogl/cogl-texture-3d.h
index f13f91901..d1ab623eb 100644
--- a/cogl/cogl/cogl-texture-3d.h
+++ b/cogl/cogl/cogl-texture-3d.h
@@ -194,7 +194,7 @@ cogl_texture_3d_new_from_bitmap (CoglBitmap *bitmap,
* Since: 1.4
* Stability: Unstable
*/
-CoglBool
+gboolean
cogl_is_texture_3d (void *object);
G_END_DECLS
diff --git a/cogl/cogl/cogl-texture-driver.h b/cogl/cogl/cogl-texture-driver.h
index e548605db..ee98c22ed 100644
--- a/cogl/cogl/cogl-texture-driver.h
+++ b/cogl/cogl/cogl-texture-driver.h
@@ -70,10 +70,10 @@ struct _CoglTextureDriver
*
* XXX: sorry for the ridiculous number of arguments :-(
*/
- CoglBool
+ gboolean
(* upload_subregion_to_gl) (CoglContext *ctx,
CoglTexture *texture,
- CoglBool is_foreign,
+ gboolean is_foreign,
int src_x,
int src_y,
int dst_x,
@@ -92,11 +92,11 @@ struct _CoglTextureDriver
* to copy the bitmap if the rowstride is not a multiple of a possible
* alignment value because there is no GL_UNPACK_ROW_LENGTH
*/
- CoglBool
+ gboolean
(* upload_to_gl) (CoglContext *ctx,
GLenum gl_target,
GLuint gl_handle,
- CoglBool is_foreign,
+ gboolean is_foreign,
CoglBitmap *source_bmp,
GLint internal_gl_format,
GLuint source_gl_format,
@@ -110,11 +110,11 @@ struct _CoglTextureDriver
* is the number of rows between images) is inferred by dividing the
* height of the bitmap by the depth.
*/
- CoglBool
+ gboolean
(* upload_to_gl_3d) (CoglContext *ctx,
GLenum gl_target,
GLuint gl_handle,
- CoglBool is_foreign,
+ gboolean is_foreign,
GLint height,
GLint depth,
CoglBitmap *source_bmp,
@@ -143,7 +143,7 @@ struct _CoglTextureDriver
* renders the texture and reads it back from the framebuffer. (See
* _cogl_texture_draw_and_read () )
*/
- CoglBool
+ gboolean
(* gl_get_tex_image) (CoglContext *ctx,
GLenum gl_target,
GLenum dest_gl_format,
@@ -153,7 +153,7 @@ struct _CoglTextureDriver
/*
* It may depend on the driver as to what texture sizes are supported...
*/
- CoglBool
+ gboolean
(* size_supported) (CoglContext *ctx,
GLenum gl_target,
GLenum gl_intformat,
@@ -162,7 +162,7 @@ struct _CoglTextureDriver
int width,
int height);
- CoglBool
+ gboolean
(* size_supported_3d) (CoglContext *ctx,
GLenum gl_target,
GLenum gl_format,
@@ -185,7 +185,7 @@ struct _CoglTextureDriver
* creating a foreign texture. E.g. OpenGL supports ARB_texture_rectangle
* but GLES doesn't
*/
- CoglBool
+ gboolean
(* allows_foreign_gl_target) (CoglContext *ctx,
GLenum gl_target);
diff --git a/cogl/cogl/cogl-texture-private.h b/cogl/cogl/cogl-texture-private.h
index 27406827b..f90953fc8 100644
--- a/cogl/cogl/cogl-texture-private.h
+++ b/cogl/cogl/cogl-texture-private.h
@@ -70,9 +70,9 @@ struct _CoglTextureVtable
/* Virtual functions that must be implemented for a texture
backend */
- CoglBool is_primitive;
+ gboolean is_primitive;
- CoglBool (* allocate) (CoglTexture *tex,
+ gboolean (* allocate) (CoglTexture *tex,
CoglError **error);
/* This should update the specified sub region of the texture with a
@@ -80,7 +80,7 @@ struct _CoglTextureVtable
before being set so the caller is expected to have called
_cogl_bitmap_convert_for_upload with a suitable internal_format
before passing here */
- CoglBool (* set_region) (CoglTexture *tex,
+ gboolean (* set_region) (CoglTexture *tex,
int src_x,
int src_y,
int dst_x,
@@ -91,14 +91,14 @@ struct _CoglTextureVtable
CoglBitmap *bitmap,
CoglError **error);
- CoglBool (* is_get_data_supported) (CoglTexture *texture);
+ gboolean (* is_get_data_supported) (CoglTexture *texture);
/* This should copy the image data of the texture into @data. The
requested format will have been first passed through
ctx->texture_driver->find_best_gl_get_data_format so it should
always be a format that is valid for GL (ie, no conversion should
be necessary). */
- CoglBool (* get_data) (CoglTexture *tex,
+ gboolean (* get_data) (CoglTexture *tex,
CoglPixelFormat format,
int rowstride,
uint8_t *data);
@@ -113,9 +113,9 @@ struct _CoglTextureVtable
int (* get_max_waste) (CoglTexture *tex);
- CoglBool (* is_sliced) (CoglTexture *tex);
+ gboolean (* is_sliced) (CoglTexture *tex);
- CoglBool (* can_hardware_repeat) (CoglTexture *tex);
+ gboolean (* can_hardware_repeat) (CoglTexture *tex);
void (* transform_coords_to_gl) (CoglTexture *tex,
float *s,
@@ -123,7 +123,7 @@ struct _CoglTextureVtable
CoglTransformResult (* transform_quad_coords_to_gl) (CoglTexture *tex,
float *coords);
- CoglBool (* get_gl_texture) (CoglTexture *tex,
+ gboolean (* get_gl_texture) (CoglTexture *tex,
GLuint *out_gl_handle,
GLenum *out_gl_target);
@@ -146,11 +146,11 @@ struct _CoglTextureVtable
CoglTextureType (* get_type) (CoglTexture *tex);
- CoglBool (* is_foreign) (CoglTexture *tex);
+ gboolean (* is_foreign) (CoglTexture *tex);
/* Only needs to be implemented if is_primitive == TRUE */
void (* set_auto_mipmap) (CoglTexture *texture,
- CoglBool value);
+ gboolean value);
};
typedef enum _CoglTextureSoureType {
@@ -174,7 +174,7 @@ typedef struct _CoglTextureLoader
CoglBitmap *bitmap;
int height; /* for 3d textures */
int depth; /* for 3d textures */
- CoglBool can_convert_in_place;
+ gboolean can_convert_in_place;
} bitmap;
#if defined (COGL_HAS_EGL_SUPPORT) && defined (EGL_KHR_image_base)
struct {
@@ -210,7 +210,7 @@ struct _CoglTexture
int max_level;
int width;
int height;
- CoglBool allocated;
+ gboolean allocated;
/*
* Internal format
@@ -275,7 +275,7 @@ _cogl_texture_register_texture_type (const CoglObjectClass *klass);
(TypeName, type_name, \
_cogl_texture_register_texture_type (&_cogl_##type_name##_class))
-CoglBool
+gboolean
_cogl_texture_can_hardware_repeat (CoglTexture *texture);
void
@@ -325,7 +325,7 @@ void
_cogl_texture_set_internal_format (CoglTexture *texture,
CoglPixelFormat internal_format);
-CoglBool
+gboolean
_cogl_texture_is_foreign (CoglTexture *texture);
void
@@ -364,7 +364,7 @@ _cogl_texture_spans_foreach_in_region (CoglSpan *x_spans,
CoglTextureType
_cogl_texture_get_type (CoglTexture *texture);
-CoglBool
+gboolean
_cogl_texture_set_region (CoglTexture *texture,
int width,
int height,
@@ -376,7 +376,7 @@ _cogl_texture_set_region (CoglTexture *texture,
int level,
CoglError **error);
-CoglBool
+gboolean
_cogl_texture_set_region_from_bitmap (CoglTexture *texture,
int src_x,
int src_y,
@@ -388,7 +388,7 @@ _cogl_texture_set_region_from_bitmap (CoglTexture *texture,
int level,
CoglError **error);
-CoglBool
+gboolean
_cogl_texture_needs_premult_conversion (CoglPixelFormat src_format,
CoglPixelFormat dst_format);
diff --git a/cogl/cogl/cogl-texture-rectangle-private.h b/cogl/cogl/cogl-texture-rectangle-private.h
index 75029e76e..107093fb0 100644
--- a/cogl/cogl/cogl-texture-rectangle-private.h
+++ b/cogl/cogl/cogl-texture-rectangle-private.h
@@ -54,7 +54,7 @@ struct _CoglTextureRectangle
GLenum gl_legacy_texobj_mag_filter;
GLint gl_legacy_texobj_wrap_mode_s;
GLint gl_legacy_texobj_wrap_mode_t;
- CoglBool is_foreign;
+ gboolean is_foreign;
};
CoglTextureRectangle *
diff --git a/cogl/cogl/cogl-texture-rectangle.c b/cogl/cogl/cogl-texture-rectangle.c
index e6d58eff1..7110029e6 100644
--- a/cogl/cogl/cogl-texture-rectangle.c
+++ b/cogl/cogl/cogl-texture-rectangle.c
@@ -68,7 +68,7 @@ COGL_GTYPE_DEFINE_CLASS (TextureRectangle, texture_rectangle,
static const CoglTextureVtable cogl_texture_rectangle_vtable;
-static CoglBool
+static gboolean
can_use_wrap_mode (GLenum wrap_mode)
{
return (wrap_mode == GL_CLAMP ||
@@ -117,7 +117,7 @@ _cogl_texture_rectangle_free (CoglTextureRectangle *tex_rect)
_cogl_texture_free (COGL_TEXTURE (tex_rect));
}
-static CoglBool
+static gboolean
_cogl_texture_rectangle_can_create (CoglContext *ctx,
unsigned int width,
unsigned int height,
@@ -164,7 +164,7 @@ _cogl_texture_rectangle_can_create (CoglContext *ctx,
static void
_cogl_texture_rectangle_set_auto_mipmap (CoglTexture *tex,
- CoglBool value)
+ gboolean value)
{
/* Rectangle textures currently never support mipmapping so there's
no point in doing anything here */
@@ -213,7 +213,7 @@ cogl_texture_rectangle_new_with_size (CoglContext *ctx,
loader);
}
-static CoglBool
+static gboolean
allocate_with_size (CoglTextureRectangle *tex_rect,
CoglTextureLoader *loader,
CoglError **error)
@@ -275,7 +275,7 @@ allocate_with_size (CoglTextureRectangle *tex_rect,
return TRUE;
}
-static CoglBool
+static gboolean
allocate_from_bitmap (CoglTextureRectangle *tex_rect,
CoglTextureLoader *loader,
CoglError **error)
@@ -286,7 +286,7 @@ allocate_from_bitmap (CoglTextureRectangle *tex_rect,
CoglBitmap *bmp = loader->src.bitmap.bitmap;
int width = cogl_bitmap_get_width (bmp);
int height = cogl_bitmap_get_height (bmp);
- CoglBool can_convert_in_place = loader->src.bitmap.can_convert_in_place;
+ gboolean can_convert_in_place = loader->src.bitmap.can_convert_in_place;
CoglBitmap *upload_bmp;
GLenum gl_intformat;
GLenum gl_format;
@@ -349,7 +349,7 @@ allocate_from_bitmap (CoglTextureRectangle *tex_rect,
return TRUE;
}
-static CoglBool
+static gboolean
allocate_from_gl_foreign (CoglTextureRectangle *tex_rect,
CoglTextureLoader *loader,
CoglError **error)
@@ -458,7 +458,7 @@ allocate_from_gl_foreign (CoglTextureRectangle *tex_rect,
return TRUE;
}
-static CoglBool
+static gboolean
_cogl_texture_rectangle_allocate (CoglTexture *tex,
CoglError **error)
{
@@ -541,13 +541,13 @@ _cogl_texture_rectangle_get_max_waste (CoglTexture *tex)
return -1;
}
-static CoglBool
+static gboolean
_cogl_texture_rectangle_is_sliced (CoglTexture *tex)
{
return FALSE;
}
-static CoglBool
+static gboolean
_cogl_texture_rectangle_can_hardware_repeat (CoglTexture *tex)
{
return FALSE;
@@ -566,7 +566,7 @@ static CoglTransformResult
_cogl_texture_rectangle_transform_quad_coords_to_gl (CoglTexture *tex,
float *coords)
{
- CoglBool need_repeat = FALSE;
+ gboolean need_repeat = FALSE;
int i;
for (i = 0; i < 4; i++)
@@ -580,7 +580,7 @@ _cogl_texture_rectangle_transform_quad_coords_to_gl (CoglTexture *tex,
: COGL_TRANSFORM_NO_REPEAT);
}
-static CoglBool
+static gboolean
_cogl_texture_rectangle_get_gl_texture (CoglTexture *tex,
GLuint *out_gl_handle,
GLenum *out_gl_target)
@@ -639,7 +639,7 @@ _cogl_texture_rectangle_ensure_non_quad_rendering (CoglTexture *tex)
/* Nothing needs to be done */
}
-static CoglBool
+static gboolean
_cogl_texture_rectangle_set_region (CoglTexture *tex,
int src_x,
int src_y,
@@ -655,7 +655,7 @@ _cogl_texture_rectangle_set_region (CoglTexture *tex,
GLenum gl_format;
GLenum gl_type;
CoglContext *ctx = tex->context;
- CoglBool status;
+ gboolean status;
upload_bmp =
_cogl_bitmap_convert_for_upload (bmp,
@@ -690,7 +690,7 @@ _cogl_texture_rectangle_set_region (CoglTexture *tex,
return status;
}
-static CoglBool
+static gboolean
_cogl_texture_rectangle_get_data (CoglTexture *tex,
CoglPixelFormat format,
int rowstride,
@@ -737,7 +737,7 @@ _cogl_texture_rectangle_get_gl_format (CoglTexture *tex)
return COGL_TEXTURE_RECTANGLE (tex)->gl_format;
}
-static CoglBool
+static gboolean
_cogl_texture_rectangle_is_foreign (CoglTexture *tex)
{
return COGL_TEXTURE_RECTANGLE (tex)->is_foreign;
diff --git a/cogl/cogl/cogl-texture-rectangle.h b/cogl/cogl/cogl-texture-rectangle.h
index 4fc0566e3..b0959a76f 100644
--- a/cogl/cogl/cogl-texture-rectangle.h
+++ b/cogl/cogl/cogl-texture-rectangle.h
@@ -86,7 +86,7 @@ GType cogl_texture_rectangle_get_gtype (void);
* Return value: %TRUE if the object references a
* #CoglTextureRectangle, %FALSE otherwise.
*/
-CoglBool
+gboolean
cogl_is_texture_rectangle (void *object);
/**
diff --git a/cogl/cogl/cogl-texture.c b/cogl/cogl/cogl-texture.c
index 918f1ccf7..52165ab65 100644
--- a/cogl/cogl/cogl-texture.c
+++ b/cogl/cogl/cogl-texture.c
@@ -94,7 +94,7 @@ _cogl_texture_register_texture_type (const CoglObjectClass *klass)
_cogl_texture_types = g_slist_prepend (_cogl_texture_types, (void *) klass);
}
-CoglBool
+gboolean
cogl_is_texture (void *object)
{
CoglObject *obj = (CoglObject *)object;
@@ -183,7 +183,7 @@ _cogl_texture_free (CoglTexture *texture)
g_free (texture);
}
-CoglBool
+gboolean
_cogl_texture_needs_premult_conversion (CoglPixelFormat src_format,
CoglPixelFormat dst_format)
{
@@ -194,7 +194,7 @@ _cogl_texture_needs_premult_conversion (CoglPixelFormat src_format,
(dst_format & COGL_PREMULT_BIT));
}
-CoglBool
+gboolean
_cogl_texture_is_foreign (CoglTexture *texture)
{
if (texture->vtable->is_foreign)
@@ -203,7 +203,7 @@ _cogl_texture_is_foreign (CoglTexture *texture)
return FALSE;
}
-CoglBool
+gboolean
cogl_texture_is_get_data_supported (CoglTexture *texture)
{
if (texture->vtable->is_get_data_supported)
@@ -293,7 +293,7 @@ _cogl_texture_get_level_size (CoglTexture *texture,
*depth = current_depth;
}
-CoglBool
+gboolean
cogl_texture_is_sliced (CoglTexture *texture)
{
if (!texture->allocated)
@@ -305,7 +305,7 @@ cogl_texture_is_sliced (CoglTexture *texture)
* will be needed to iterate over multiple sub textures for regions whos
* texture coordinates extend out of the range [0,1]
*/
-CoglBool
+gboolean
_cogl_texture_can_hardware_repeat (CoglTexture *texture)
{
if (!texture->allocated)
@@ -331,7 +331,7 @@ _cogl_texture_transform_quad_coords_to_gl (CoglTexture *texture,
return texture->vtable->transform_quad_coords_to_gl (texture, coords);
}
-CoglBool
+gboolean
cogl_texture_get_gl_texture (CoglTexture *texture,
GLuint *out_gl_handle,
GLenum *out_gl_target)
@@ -375,7 +375,7 @@ _cogl_texture_ensure_non_quad_rendering (CoglTexture *texture)
texture->vtable->ensure_non_quad_rendering (texture);
}
-CoglBool
+gboolean
_cogl_texture_set_region_from_bitmap (CoglTexture *texture,
int src_x,
int src_y,
@@ -414,7 +414,7 @@ _cogl_texture_set_region_from_bitmap (CoglTexture *texture,
error);
}
-CoglBool
+gboolean
cogl_texture_set_region_from_bitmap (CoglTexture *texture,
int src_x,
int src_y,
@@ -425,7 +425,7 @@ cogl_texture_set_region_from_bitmap (CoglTexture *texture,
CoglBitmap *bitmap)
{
CoglError *ignore_error = NULL;
- CoglBool status =
+ gboolean status =
_cogl_texture_set_region_from_bitmap (texture,
src_x, src_y,
dst_width, dst_height,
@@ -439,7 +439,7 @@ cogl_texture_set_region_from_bitmap (CoglTexture *texture,
return status;
}
-CoglBool
+gboolean
_cogl_texture_set_region (CoglTexture *texture,
int width,
int height,
@@ -453,7 +453,7 @@ _cogl_texture_set_region (CoglTexture *texture,
{
CoglContext *ctx = texture->context;
CoglBitmap *source_bmp;
- CoglBool ret;
+ gboolean ret;
_COGL_RETURN_VAL_IF_FAIL (format != COGL_PIXEL_FORMAT_ANY, FALSE);
@@ -481,7 +481,7 @@ _cogl_texture_set_region (CoglTexture *texture,
return ret;
}
-CoglBool
+gboolean
cogl_texture_set_region (CoglTexture *texture,
int src_x,
int src_y,
@@ -498,7 +498,7 @@ cogl_texture_set_region (CoglTexture *texture,
CoglError *ignore_error = NULL;
const uint8_t *first_pixel;
int bytes_per_pixel = _cogl_pixel_format_get_bytes_per_pixel (format);
- CoglBool status;
+ gboolean status;
/* Rowstride from width if none specified */
if (rowstride == 0)
@@ -521,7 +521,7 @@ cogl_texture_set_region (CoglTexture *texture,
return status;
}
-CoglBool
+gboolean
cogl_texture_set_data (CoglTexture *texture,
CoglPixelFormat format,
int rowstride,
@@ -549,7 +549,7 @@ cogl_texture_set_data (CoglTexture *texture,
error);
}
-static CoglBool
+static gboolean
get_texture_bits_via_offscreen (CoglTexture *meta_texture,
CoglTexture *sub_texture,
int x,
@@ -564,7 +564,7 @@ get_texture_bits_via_offscreen (CoglTexture *meta_texture,
CoglOffscreen *offscreen;
CoglFramebuffer *framebuffer;
CoglBitmap *bitmap;
- CoglBool ret;
+ gboolean ret;
CoglError *ignore_error = NULL;
CoglPixelFormat real_format;
@@ -618,7 +618,7 @@ get_texture_bits_via_offscreen (CoglTexture *meta_texture,
return ret;
}
-static CoglBool
+static gboolean
get_texture_bits_via_copy (CoglTexture *texture,
int x,
int y,
@@ -630,7 +630,7 @@ get_texture_bits_via_copy (CoglTexture *texture,
{
unsigned int full_rowstride;
uint8_t *full_bits;
- CoglBool ret = TRUE;
+ gboolean ret = TRUE;
int bpp;
int full_tex_width, full_tex_height;
@@ -673,7 +673,7 @@ typedef struct
int orig_height;
CoglBitmap *target_bmp;
uint8_t *target_bits;
- CoglBool success;
+ gboolean success;
CoglError *error;
} CoglTextureGetData;
@@ -897,7 +897,7 @@ cogl_texture_get_data (CoglTexture *texture,
if (closest_format != format)
{
CoglBitmap *new_bmp;
- CoglBool result;
+ gboolean result;
CoglError *error = NULL;
/* Convert to requested format directly into the user's buffer */
@@ -1098,7 +1098,7 @@ _cogl_texture_set_allocated (CoglTexture *texture,
_cogl_texture_free_loader (texture);
}
-CoglBool
+gboolean
cogl_texture_allocate (CoglTexture *texture,
CoglError **error)
{
@@ -1231,7 +1231,7 @@ cogl_texture_get_components (CoglTexture *texture)
void
cogl_texture_set_premultiplied (CoglTexture *texture,
- CoglBool premultiplied)
+ gboolean premultiplied)
{
_COGL_RETURN_IF_FAIL (!texture->allocated);
@@ -1243,7 +1243,7 @@ cogl_texture_set_premultiplied (CoglTexture *texture,
texture->premultiplied = premultiplied;
}
-CoglBool
+gboolean
cogl_texture_get_premultiplied (CoglTexture *texture)
{
return texture->premultiplied;
diff --git a/cogl/cogl/cogl-texture.h b/cogl/cogl/cogl-texture.h
index 3a07e8545..dcbf6e19a 100644
--- a/cogl/cogl/cogl-texture.h
+++ b/cogl/cogl/cogl-texture.h
@@ -135,7 +135,7 @@ uint32_t cogl_texture_error_quark (void);
* Return value: %TRUE if the @object references a texture, and
* %FALSE otherwise
*/
-CoglBool
+gboolean
cogl_is_texture (void *object);
/**
@@ -241,7 +241,7 @@ cogl_texture_get_components (CoglTexture *texture);
*/
void
cogl_texture_set_premultiplied (CoglTexture *texture,
- CoglBool premultiplied);
+ gboolean premultiplied);
/**
* cogl_texture_get_premultiplied:
@@ -258,7 +258,7 @@ cogl_texture_set_premultiplied (CoglTexture *texture,
* value or %FALSE if not.
* Since: 1.18
*/
-CoglBool
+gboolean
cogl_texture_get_premultiplied (CoglTexture *texture);
/**
@@ -305,7 +305,7 @@ cogl_texture_get_max_waste (CoglTexture *texture);
* Return value: %TRUE if the texture is sliced, %FALSE if the texture
* is stored as a single GPU texture
*/
-CoglBool
+gboolean
cogl_texture_is_sliced (CoglTexture *texture);
/**
@@ -324,7 +324,7 @@ cogl_texture_is_sliced (CoglTexture *texture);
* Return value: %TRUE if the handle was successfully retrieved, %FALSE
* if the handle was invalid
*/
-CoglBool
+gboolean
cogl_texture_get_gl_texture (CoglTexture *texture,
unsigned int *out_gl_handle,
unsigned int *out_gl_target);
@@ -380,7 +380,7 @@ cogl_texture_get_data (CoglTexture *texture,
* Return value: %TRUE if the subregion upload was successful, and
* %FALSE otherwise
*/
-CoglBool
+gboolean
cogl_texture_set_region (CoglTexture *texture,
int src_x,
int src_y,
@@ -446,7 +446,7 @@ cogl_texture_set_region (CoglTexture *texture,
* Return value: %TRUE if the data upload was successful, and
* %FALSE otherwise
*/
-CoglBool
+gboolean
cogl_texture_set_data (CoglTexture *texture,
CoglPixelFormat format,
int rowstride,
@@ -479,7 +479,7 @@ cogl_texture_set_data (CoglTexture *texture,
* Since: 1.8
* Stability: unstable
*/
-CoglBool
+gboolean
cogl_texture_set_region_from_bitmap (CoglTexture *texture,
int src_x,
int src_y,
@@ -507,14 +507,14 @@ cogl_texture_set_region_from_bitmap (CoglTexture *texture,
* otherwise %FALSE and @error will be updated if it
* wasn't %NULL.
*/
-CoglBool
+gboolean
cogl_texture_allocate (CoglTexture *texture,
CoglError **error);
/**
* cogl_texture_is_get_data_supported: (skip)
*/
-CoglBool
+gboolean
cogl_texture_is_get_data_supported (CoglTexture *texture);
G_END_DECLS
diff --git a/cogl/cogl/cogl-types.h b/cogl/cogl/cogl-types.h
index 2b9643ed8..92740eb9e 100644
--- a/cogl/cogl/cogl-types.h
+++ b/cogl/cogl/cogl-types.h
@@ -52,18 +52,6 @@ G_BEGIN_DECLS
* General types used by various Cogl functions.
*/
-/**
- * CoglBool:
- *
- * A boolean data type used throughout the Cogl C api. This should be
- * used in conjunction with the %TRUE and %FALSE macro defines for
- * setting and testing boolean values.
- *
- * Since: 2.0
- * Stability: stable
- */
-typedef int CoglBool;
-
/* Some structures are meant to be opaque but they have public
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
diff --git a/cogl/cogl/cogl-util.c b/cogl/cogl/cogl-util.c
index a2d887835..4c2cd50e7 100644
--- a/cogl/cogl/cogl-util.c
+++ b/cogl/cogl/cogl-util.c
@@ -94,8 +94,8 @@ _cogl_util_pixel_format_from_masks_real (unsigned long r_mask,
unsigned long g_mask,
unsigned long b_mask,
int depth, int bpp,
- CoglBool check_bgr,
- CoglBool check_afirst,
+ gboolean check_bgr,
+ gboolean check_afirst,
int recursion_depth)
{
CoglPixelFormat image_format;
@@ -163,7 +163,7 @@ _cogl_util_pixel_format_from_masks (unsigned long r_mask,
unsigned long g_mask,
unsigned long b_mask,
int depth, int bpp,
- CoglBool byte_order_is_lsb_first)
+ gboolean byte_order_is_lsb_first)
{
CoglPixelFormat image_format =
_cogl_util_pixel_format_from_masks_real (r_mask, g_mask, b_mask,
diff --git a/cogl/cogl/cogl-util.h b/cogl/cogl/cogl-util.h
index b8132220a..5bcfec4c7 100644
--- a/cogl/cogl/cogl-util.h
+++ b/cogl/cogl/cogl-util.h
@@ -58,7 +58,7 @@ _cogl_util_next_p2 (int a);
It xors the integer reinterpretations of -1.0f and 1.0f. In theory
they should only differ by the signbit so that gives a mask for the
sign which we can just test against the value */
-static inline CoglBool
+static inline gboolean
cogl_util_float_signbit (float x)
{
static const union { float f; uint32_t i; } negative_one = { -1.0f };
@@ -78,7 +78,7 @@ cogl_util_float_signbit (float x)
#define COGL_UTIL_NEARBYINT(x) ((int) ((x) < 0.0f ? (x) - 0.5f : (x) + 0.5f))
/* Returns whether the given integer is a power of two */
-static inline CoglBool
+static inline gboolean
_cogl_util_is_pot (unsigned int num)
{
/* Make sure there is only one bit set */
diff --git a/cogl/cogl/cogl-vector.c b/cogl/cogl/cogl-vector.c
index 31f65581a..a2f3deca7 100644
--- a/cogl/cogl/cogl-vector.c
+++ b/cogl/cogl/cogl-vector.c
@@ -57,7 +57,7 @@ cogl_vector3_init_zero (float *vector)
memset (vector, 0, sizeof (float) * 3);
}
-CoglBool
+gboolean
cogl_vector3_equal (const void *v1, const void *v2)
{
float *vector0 = (float *)v1;
@@ -75,7 +75,7 @@ cogl_vector3_equal (const void *v1, const void *v2)
vector0[Z] == vector1[Z];
}
-CoglBool
+gboolean
cogl_vector3_equal_with_epsilon (const float *vector0,
const float *vector1,
float epsilon)
@@ -230,7 +230,7 @@ cogl_vector4_init_from_vector4 (float *vector, float *src)
*vector4 = *src;
}
-CoglBool
+gboolean
cogl_vector4_equal (const void *v0, const void *v1)
{
_COGL_RETURN_VAL_IF_FAIL (v1 != NULL, FALSE);
diff --git a/cogl/cogl/cogl-vector.h b/cogl/cogl/cogl-vector.h
index b39139e0c..8518d4268 100644
--- a/cogl/cogl/cogl-vector.h
+++ b/cogl/cogl/cogl-vector.h
@@ -96,7 +96,7 @@ cogl_vector3_init_zero (float *vector);
* Since: 1.4
* Stability: Unstable
*/
-CoglBool
+gboolean
cogl_vector3_equal (const void *v1, const void *v2);
/**
@@ -120,7 +120,7 @@ cogl_vector3_equal (const void *v1, const void *v2);
* Since: 1.4
* Stability: Unstable
*/
-CoglBool
+gboolean
cogl_vector3_equal_with_epsilon (const float *vector0,
const float *vector1,
float epsilon);
diff --git a/cogl/cogl/cogl-wayland-server.h b/cogl/cogl/cogl-wayland-server.h
index 322620a8a..d6d953930 100644
--- a/cogl/cogl/cogl-wayland-server.h
+++ b/cogl/cogl/cogl-wayland-server.h
@@ -132,7 +132,7 @@ cogl_wayland_texture_2d_new_from_buffer (CoglContext *ctx,
* Since: 1.18
* Stability: unstable
*/
-CoglBool
+gboolean
cogl_wayland_texture_set_region_from_shm_buffer (CoglTexture *texture,
int src_x,
int src_y,
diff --git a/cogl/cogl/cogl-xlib-renderer-private.h b/cogl/cogl/cogl-xlib-renderer-private.h
index 2a80d215e..59e761111 100644
--- a/cogl/cogl/cogl-xlib-renderer-private.h
+++ b/cogl/cogl/cogl-xlib-renderer-private.h
@@ -54,7 +54,7 @@ typedef struct _CoglXlibRenderer
XVisualInfo *xvisinfo;
} CoglXlibRenderer;
-CoglBool
+gboolean
_cogl_xlib_renderer_connect (CoglRenderer *renderer, CoglError **error);
void
diff --git a/cogl/cogl/cogl-xlib-renderer.c b/cogl/cogl/cogl-xlib-renderer.c
index f0259531f..68dfbe147 100644
--- a/cogl/cogl/cogl-xlib-renderer.c
+++ b/cogl/cogl/cogl-xlib-renderer.c
@@ -228,16 +228,16 @@ static CoglSubpixelOrder subpixel_map[6][6] = {
static void
update_outputs (CoglRenderer *renderer,
- CoglBool notify)
+ gboolean notify)
{
CoglXlibRenderer *xlib_renderer =
_cogl_xlib_renderer_get_data (renderer);
XRRScreenResources *resources;
CoglXlibTrapState state;
- CoglBool error = FALSE;
+ gboolean error = FALSE;
GList *new_outputs = NULL;
GList *l, *m;
- CoglBool changed = FALSE;
+ gboolean changed = FALSE;
int i;
xlib_renderer->outputs_update_serial = XNextRequest (xlib_renderer->xdpy);
@@ -502,7 +502,7 @@ dispatch_xlib_events (void *user_data, int revents)
}
}
-CoglBool
+gboolean
_cogl_xlib_renderer_connect (CoglRenderer *renderer, CoglError **error)
{
CoglXlibRenderer *xlib_renderer =
diff --git a/cogl/cogl/cogl-xlib-renderer.h b/cogl/cogl/cogl-xlib-renderer.h
index 48fe11796..3a3c08d64 100644
--- a/cogl/cogl/cogl-xlib-renderer.h
+++ b/cogl/cogl/cogl-xlib-renderer.h
@@ -165,7 +165,7 @@ cogl_xlib_renderer_set_foreign_display (CoglRenderer *renderer,
*/
void
cogl_xlib_renderer_set_event_retrieval_enabled (CoglRenderer *renderer,
- CoglBool enable);
+ gboolean enable);
/**
* cogl_xlib_renderer_set_threaded_swap_wait_enabled: (skip)
@@ -195,7 +195,7 @@ cogl_xlib_renderer_set_event_retrieval_enabled (CoglRenderer *renderer,
*/
void
cogl_xlib_renderer_set_threaded_swap_wait_enabled (CoglRenderer *renderer,
- CoglBool enable);
+ gboolean enable);
/**
* cogl_xlib_renderer_get_display: (skip)
@@ -249,7 +249,7 @@ cogl_xlib_renderer_get_visual_info (CoglRenderer *renderer);
*/
void
cogl_xlib_renderer_request_reset_on_video_memory_purge (CoglRenderer *renderer,
- CoglBool enable);
+ gboolean enable);
G_END_DECLS
/* The gobject introspection scanner seems to parse public headers in
diff --git a/cogl/cogl/cogl.c b/cogl/cogl/cogl.c
index cf6a9844e..e2f9e0ff9 100644
--- a/cogl/cogl/cogl.c
+++ b/cogl/cogl/cogl.c
@@ -67,7 +67,7 @@ cogl_get_proc_address (const char* name)
return _cogl_renderer_get_proc_address (ctx->display->renderer, name, FALSE);
}
-CoglBool
+gboolean
_cogl_check_extension (const char *name, char * const *ext)
{
while (*ext)
@@ -80,7 +80,7 @@ _cogl_check_extension (const char *name, char * const *ext)
}
/* XXX: This has been deprecated as public API */
-CoglBool
+gboolean
cogl_check_extension (const char *name, const char *ext)
{
return cogl_clutter_check_extension (name, ext);
@@ -96,7 +96,7 @@ cogl_clear (const CoglColor *color, unsigned long buffers)
/* XXX: This API has been deprecated */
void
-cogl_set_depth_test_enabled (CoglBool setting)
+cogl_set_depth_test_enabled (gboolean setting)
{
_COGL_GET_CONTEXT (ctx, NO_RETVAL);
@@ -111,7 +111,7 @@ cogl_set_depth_test_enabled (CoglBool setting)
}
/* XXX: This API has been deprecated */
-CoglBool
+gboolean
cogl_get_depth_test_enabled (void)
{
_COGL_GET_CONTEXT (ctx, FALSE);
@@ -119,7 +119,7 @@ cogl_get_depth_test_enabled (void)
}
void
-cogl_set_backface_culling_enabled (CoglBool setting)
+cogl_set_backface_culling_enabled (gboolean setting)
{
_COGL_GET_CONTEXT (ctx, NO_RETVAL);
@@ -134,7 +134,7 @@ cogl_set_backface_culling_enabled (CoglBool setting)
ctx->legacy_state_set--;
}
-CoglBool
+gboolean
cogl_get_backface_culling_enabled (void)
{
_COGL_GET_CONTEXT (ctx, FALSE);
@@ -201,7 +201,7 @@ cogl_get_features (void)
return ctx->feature_flags;
}
-CoglBool
+gboolean
cogl_features_available (CoglFeatureFlags features)
{
_COGL_GET_CONTEXT (ctx, 0);
@@ -209,13 +209,13 @@ cogl_features_available (CoglFeatureFlags features)
return (ctx->feature_flags & features) == features;
}
-CoglBool
+gboolean
cogl_has_feature (CoglContext *ctx, CoglFeatureID feature)
{
return COGL_FLAGS_GET (ctx->features, feature);
}
-CoglBool
+gboolean
cogl_has_features (CoglContext *ctx, ...)
{
va_list args;
@@ -356,7 +356,7 @@ cogl_begin_gl (void)
if (ctx->in_begin_gl_block)
{
- static CoglBool shown = FALSE;
+ static gboolean shown = FALSE;
if (!shown)
g_warning ("You should not nest cogl_begin_gl/cogl_end_gl blocks");
shown = TRUE;
@@ -414,7 +414,7 @@ cogl_end_gl (void)
if (!ctx->in_begin_gl_block)
{
- static CoglBool shown = FALSE;
+ static gboolean shown = FALSE;
if (!shown)
g_warning ("cogl_end_gl is being called before cogl_begin_gl");
shown = TRUE;
@@ -532,11 +532,11 @@ typedef struct _CoglSourceState
necessary because some internal Cogl code expects to be able to
push a temporary pipeline to put GL into a known state. For that
to work it also needs to prevent applying the legacy state */
- CoglBool enable_legacy;
+ gboolean enable_legacy;
} CoglSourceState;
static void
-_push_source_real (CoglPipeline *pipeline, CoglBool enable_legacy)
+_push_source_real (CoglPipeline *pipeline, gboolean enable_legacy)
{
CoglSourceState *top = g_slice_new (CoglSourceState);
_COGL_GET_CONTEXT (ctx, NO_RETVAL);
@@ -565,7 +565,7 @@ cogl_push_source (void *material_or_pipeline)
never applies the legacy state. Some parts of Cogl use this
internally to set a temporary pipeline with a known state */
void
-_cogl_push_source (CoglPipeline *pipeline, CoglBool enable_legacy)
+_cogl_push_source (CoglPipeline *pipeline, gboolean enable_legacy)
{
CoglSourceState *top;
@@ -623,7 +623,7 @@ cogl_get_source (void)
return top->pipeline;
}
-CoglBool
+gboolean
_cogl_get_enable_legacy_state (void)
{
CoglSourceState *top;
@@ -751,7 +751,7 @@ _cogl_system_error_quark (void)
void
_cogl_init (void)
{
- static CoglBool initialized = FALSE;
+ static gboolean initialized = FALSE;
if (initialized == FALSE)
{
@@ -798,7 +798,7 @@ _cogl_pixel_format_get_bytes_per_pixel (CoglPixelFormat format)
/* Note: this also refers to the mapping defined above for
* _cogl_pixel_format_get_bytes_per_pixel() */
-CoglBool
+gboolean
_cogl_pixel_format_is_endian_dependant (CoglPixelFormat format)
{
int aligned_lut[] = { -1, 1, 1, 1,
diff --git a/cogl/cogl/cogl1-context.h b/cogl/cogl/cogl1-context.h
index 8e7a28fde..bef2ded1c 100644
--- a/cogl/cogl/cogl1-context.h
+++ b/cogl/cogl/cogl1-context.h
@@ -88,7 +88,7 @@ cogl_get_features (void);
* Deprecated: 1.10: Use cogl_has_feature() instead
*/
COGL_DEPRECATED_FOR (cogl_has_feature)
-CoglBool
+gboolean
cogl_features_available (CoglFeatureFlags features);
/**
@@ -122,11 +122,11 @@ cogl_get_proc_address (const char *name);
* not appropriate to expose OpenGL extensions through the Cogl API. This
* function can be replaced by the following equivalent code:
* |[
- * CoglBool retval = (strstr (ext, name) != NULL) ? TRUE : FALSE;
+ * gboolean retval = (strstr (ext, name) != NULL) ? TRUE : FALSE;
* ]|
*/
COGL_DEPRECATED
-CoglBool
+gboolean
cogl_check_extension (const char *name,
const char *ext);
@@ -451,7 +451,7 @@ cogl_get_viewport (float v[4]);
*/
COGL_DEPRECATED_FOR (cogl_pipeline_set_depth_state)
void
-cogl_set_depth_test_enabled (CoglBool setting);
+cogl_set_depth_test_enabled (gboolean setting);
/**
* cogl_get_depth_test_enabled:
@@ -463,7 +463,7 @@ cogl_set_depth_test_enabled (CoglBool setting);
* Deprecated: 1.16: Use cogl_pipeline_set_depth_state() instead
*/
COGL_DEPRECATED_FOR (cogl_pipeline_set_depth_state)
-CoglBool
+gboolean
cogl_get_depth_test_enabled (void);
/**
@@ -480,7 +480,7 @@ cogl_get_depth_test_enabled (void);
*/
COGL_DEPRECATED_FOR (cogl_pipeline_set_cull_face_mode)
void
-cogl_set_backface_culling_enabled (CoglBool setting);
+cogl_set_backface_culling_enabled (gboolean setting);
/**
* cogl_get_backface_culling_enabled:
@@ -493,7 +493,7 @@ cogl_set_backface_culling_enabled (CoglBool setting);
* Deprecated: 1.16: Use cogl_pipeline_get_cull_face_mode() instead
*/
COGL_DEPRECATED_FOR (cogl_pipeline_get_cull_face_mode)
-CoglBool
+gboolean
cogl_get_backface_culling_enabled (void);
/**
diff --git a/cogl/cogl/deprecated/cogl-auto-texture.c b/cogl/cogl/deprecated/cogl-auto-texture.c
index fe52e1575..c36c5b7a2 100644
--- a/cogl/cogl/deprecated/cogl-auto-texture.c
+++ b/cogl/cogl/deprecated/cogl-auto-texture.c
@@ -58,7 +58,7 @@ static CoglTexture *
_cogl_texture_new_from_bitmap (CoglBitmap *bitmap,
CoglTextureFlags flags,
CoglPixelFormat internal_format,
- CoglBool can_convert_in_place,
+ gboolean can_convert_in_place,
CoglError **error);
static void
@@ -207,7 +207,7 @@ static CoglTexture *
_cogl_texture_new_from_bitmap (CoglBitmap *bitmap,
CoglTextureFlags flags,
CoglPixelFormat internal_format,
- CoglBool can_convert_in_place,
+ gboolean can_convert_in_place,
CoglError **error)
{
CoglContext *ctx = _cogl_bitmap_get_context (bitmap);
diff --git a/cogl/cogl/deprecated/cogl-clutter.c b/cogl/cogl/deprecated/cogl-clutter.c
index 2c57bb18a..abe59862a 100644
--- a/cogl/cogl/deprecated/cogl-clutter.c
+++ b/cogl/cogl/deprecated/cogl-clutter.c
@@ -48,7 +48,7 @@
#include "winsys/cogl-winsys-stub-private.h"
#include "deprecated/cogl-clutter.h"
-CoglBool
+gboolean
cogl_clutter_check_extension (const char *name, const char *ext)
{
char *end;
@@ -73,7 +73,7 @@ cogl_clutter_check_extension (const char *name, const char *ext)
return FALSE;
}
-CoglBool
+gboolean
cogl_clutter_winsys_has_feature (CoglWinsysFeature feature)
{
return _cogl_winsys_has_feature (feature);
diff --git a/cogl/cogl/deprecated/cogl-clutter.h b/cogl/cogl/deprecated/cogl-clutter.h
index aa47144a3..72d69c643 100644
--- a/cogl/cogl/deprecated/cogl-clutter.h
+++ b/cogl/cogl/deprecated/cogl-clutter.h
@@ -37,12 +37,12 @@ G_BEGIN_DECLS
#define cogl_clutter_check_extension cogl_clutter_check_extension_CLUTTER
COGL_DEPRECATED
-CoglBool
+gboolean
cogl_clutter_check_extension (const char *name, const char *ext);
#define cogl_clutter_winsys_has_feature cogl_clutter_winsys_has_feature_CLUTTER
COGL_DEPRECATED_FOR (cogl_has_feature)
-CoglBool
+gboolean
cogl_clutter_winsys_has_feature (CoglWinsysFeature feature);
#define cogl_onscreen_clutter_backend_set_size cogl_onscreen_clutter_backend_set_size_CLUTTER
diff --git a/cogl/cogl/deprecated/cogl-material-compat.c b/cogl/cogl/deprecated/cogl-material-compat.c
index cf096623a..a7e653f54 100644
--- a/cogl/cogl/deprecated/cogl-material-compat.c
+++ b/cogl/cogl/deprecated/cogl-material-compat.c
@@ -66,7 +66,7 @@ cogl_material_unref (CoglHandle handle)
cogl_object_unref (handle);
}
-CoglBool
+gboolean
cogl_is_material (CoglHandle handle)
{
return cogl_is_pipeline (handle);
@@ -197,7 +197,7 @@ cogl_material_set_alpha_test_function (CoglMaterial *material,
alpha_reference);
}
-CoglBool
+gboolean
cogl_material_set_blend (CoglMaterial *material,
const char *blend_string,
CoglError **error)
@@ -256,7 +256,7 @@ cogl_material_remove_layer (CoglMaterial *material,
cogl_pipeline_remove_layer (COGL_PIPELINE (material), layer_index);
}
-CoglBool
+gboolean
cogl_material_set_layer_combine (CoglMaterial *material,
int layer_index,
const char *blend_string,
@@ -335,10 +335,10 @@ cogl_material_set_layer_filters (CoglMaterial *material,
mag_filter);
}
-CoglBool
+gboolean
cogl_material_set_layer_point_sprite_coords_enabled (CoglMaterial *material,
int layer_index,
- CoglBool enable,
+ gboolean enable,
CoglError **error)
{
CoglPipeline *pipeline = COGL_PIPELINE (material);
@@ -348,7 +348,7 @@ cogl_material_set_layer_point_sprite_coords_enabled (CoglMaterial *material,
error);
}
-CoglBool
+gboolean
cogl_material_get_layer_point_sprite_coords_enabled (CoglMaterial *material,
int layer_index)
{
@@ -444,7 +444,7 @@ cogl_material_foreach_layer (CoglMaterial *material,
(CoglPipelineLayerCallback)callback, user_data);
}
-CoglBool
+gboolean
cogl_material_set_depth_state (CoglMaterial *material,
const CoglDepthState *state,
CoglError **error)
diff --git a/cogl/cogl/deprecated/cogl-material-compat.h b/cogl/cogl/deprecated/cogl-material-compat.h
index 3b091978c..22a6dd589 100644
--- a/cogl/cogl/deprecated/cogl-material-compat.h
+++ b/cogl/cogl/deprecated/cogl-material-compat.h
@@ -215,7 +215,7 @@ cogl_material_unref (CoglHandle material);
* Deprecated: 1.16: Use cogl_is_pipeline() instead
*/
COGL_DEPRECATED_FOR (cogl_is_pipeline)
-CoglBool
+gboolean
cogl_is_material (CoglHandle handle);
/**
@@ -638,7 +638,7 @@ cogl_material_set_alpha_test_function (CoglMaterial *material,
* Deprecated: 1.16: Use cogl_pipeline_set_blend() instead
*/
COGL_DEPRECATED_FOR (cogl_pipeline_set_blend)
-CoglBool
+gboolean
cogl_material_set_blend (CoglMaterial *material,
const char *blend_string,
CoglError **error);
@@ -899,7 +899,7 @@ cogl_material_remove_layer (CoglMaterial *material,
* Deprecated: 1.16: Use cogl_pipeline_set_layer_combine() instead
*/
COGL_DEPRECATED_FOR (cogl_pipeline_set_layer_combine)
-CoglBool
+gboolean
cogl_material_set_layer_combine (CoglMaterial *material,
int layer_index,
const char *blend_string,
@@ -1102,10 +1102,10 @@ cogl_material_set_layer_filters (CoglMaterial *material,
* instead
*/
COGL_DEPRECATED_FOR (cogl_pipeline_set_layer_point_sprite_coords_enabled)
-CoglBool
+gboolean
cogl_material_set_layer_point_sprite_coords_enabled (CoglMaterial *material,
int layer_index,
- CoglBool enable,
+ gboolean enable,
CoglError **error);
/**
@@ -1124,7 +1124,7 @@ cogl_material_set_layer_point_sprite_coords_enabled (CoglMaterial *material,
* instead
*/
COGL_DEPRECATED_FOR (cogl_pipeline_get_layer_point_sprite_coords_enabled)
-CoglBool
+gboolean
cogl_material_get_layer_point_sprite_coords_enabled (CoglMaterial *material,
int layer_index);
@@ -1328,7 +1328,7 @@ cogl_material_layer_get_wrap_mode_p (CoglMaterialLayer *layer);
* Deprecated: 1.16: Use cogl_pipeline_set_depth_state() instead
*/
COGL_DEPRECATED_FOR (cogl_pipeline_set_depth_state)
-CoglBool
+gboolean
cogl_material_set_depth_state (CoglMaterial *material,
const CoglDepthState *state,
CoglError **error);
@@ -1363,7 +1363,7 @@ cogl_material_get_depth_state (CoglMaterial *material,
* Stability: Unstable
* Deprecated: 1.16
*/
-typedef CoglBool (*CoglMaterialLayerCallback) (CoglMaterial *material,
+typedef gboolean (*CoglMaterialLayerCallback) (CoglMaterial *material,
int layer_index,
void *user_data);
diff --git a/cogl/cogl/deprecated/cogl-program-private.h b/cogl/cogl/deprecated/cogl-program-private.h
index 64ed72c6e..a692e2ebd 100644
--- a/cogl/cogl/deprecated/cogl-program-private.h
+++ b/cogl/cogl/deprecated/cogl-program-private.h
@@ -74,15 +74,15 @@ struct _CoglProgramUniform
void
_cogl_program_flush_uniforms (CoglProgram *program,
GLuint gl_program,
- CoglBool gl_program_changed);
+ gboolean gl_program_changed);
CoglShaderLanguage
_cogl_program_get_language (CoglHandle handle);
-CoglBool
+gboolean
_cogl_program_has_fragment_shader (CoglHandle handle);
-CoglBool
+gboolean
_cogl_program_has_vertex_shader (CoglHandle handle);
#endif /* __COGL_PROGRAM_H */
diff --git a/cogl/cogl/deprecated/cogl-program.c b/cogl/cogl/deprecated/cogl-program.c
index d501a4517..1cd2f7a50 100644
--- a/cogl/cogl/deprecated/cogl-program.c
+++ b/cogl/cogl/deprecated/cogl-program.c
@@ -312,7 +312,7 @@ cogl_program_set_uniform_matrix (CoglHandle handle,
int uniform_location,
int dimensions,
int count,
- CoglBool transpose,
+ gboolean transpose,
const float *value)
{
CoglProgramUniform *uniform;
@@ -329,7 +329,7 @@ void
cogl_program_uniform_matrix (int uniform_no,
int size,
int count,
- CoglBool transpose,
+ gboolean transpose,
const float *value)
{
CoglProgramUniform *uniform;
@@ -343,7 +343,7 @@ cogl_program_uniform_matrix (int uniform_no,
void
_cogl_program_flush_uniforms (CoglProgram *program,
GLuint gl_program,
- CoglBool gl_program_changed)
+ gboolean gl_program_changed)
{
CoglProgramUniform *uniform;
int i;
@@ -402,7 +402,7 @@ _cogl_program_get_language (CoglHandle handle)
return COGL_SHADER_LANGUAGE_GLSL;
}
-static CoglBool
+static gboolean
_cogl_program_has_shader_type (CoglProgram *program,
CoglShaderType type)
{
@@ -419,13 +419,13 @@ _cogl_program_has_shader_type (CoglProgram *program,
return FALSE;
}
-CoglBool
+gboolean
_cogl_program_has_fragment_shader (CoglHandle handle)
{
return _cogl_program_has_shader_type (handle, COGL_SHADER_TYPE_FRAGMENT);
}
-CoglBool
+gboolean
_cogl_program_has_vertex_shader (CoglHandle handle)
{
return _cogl_program_has_shader_type (handle, COGL_SHADER_TYPE_VERTEX);
diff --git a/cogl/cogl/deprecated/cogl-shader.c b/cogl/cogl/deprecated/cogl-shader.c
index fbec7486b..c7e17e1f8 100644
--- a/cogl/cogl/deprecated/cogl-shader.c
+++ b/cogl/cogl/deprecated/cogl-shader.c
@@ -263,7 +263,7 @@ cogl_shader_get_type (CoglHandle handle)
return shader->type;
}
-CoglBool
+gboolean
cogl_shader_is_compiled (CoglHandle handle)
{
#if defined (HAVE_COGL_GL) || defined (HAVE_COGL_GLES2)
diff --git a/cogl/cogl/deprecated/cogl-shader.h b/cogl/cogl/deprecated/cogl-shader.h
index ad94d30bf..91733c8f6 100644
--- a/cogl/cogl/deprecated/cogl-shader.h
+++ b/cogl/cogl/deprecated/cogl-shader.h
@@ -290,7 +290,7 @@ cogl_shader_unref (CoglHandle handle);
* Deprecated: 1.16: Use #CoglSnippet api
*/
COGL_DEPRECATED_FOR (cogl_snippet_)
-CoglBool
+gboolean
cogl_is_shader (CoglHandle handle);
/**
@@ -366,7 +366,7 @@ cogl_shader_get_type (CoglHandle handle);
* Deprecated: 1.16: Use #CoglSnippet api
*/
COGL_DEPRECATED_FOR (cogl_snippet_)
-CoglBool
+gboolean
cogl_shader_is_compiled (CoglHandle handle);
/**
@@ -421,7 +421,7 @@ cogl_program_unref (CoglHandle handle);
* Deprecated: 1.16: Use #CoglSnippet api
*/
COGL_DEPRECATED_FOR (cogl_snippet_)
-CoglBool
+gboolean
cogl_is_program (CoglHandle handle);
/**
@@ -605,7 +605,7 @@ cogl_program_set_uniform_matrix (CoglHandle program,
int uniform_location,
int dimensions,
int count,
- CoglBool transpose,
+ gboolean transpose,
const float *value);
/**
@@ -695,7 +695,7 @@ void
cogl_program_uniform_matrix (int uniform_no,
int size,
int count,
- CoglBool transpose,
+ gboolean transpose,
const float *value);
G_END_DECLS
diff --git a/cogl/cogl/deprecated/cogl-vertex-buffer-private.h
b/cogl/cogl/deprecated/cogl-vertex-buffer-private.h
index f803bbba6..69af36ebf 100644
--- a/cogl/cogl/deprecated/cogl-vertex-buffer-private.h
+++ b/cogl/cogl/deprecated/cogl-vertex-buffer-private.h
@@ -155,7 +155,7 @@ typedef struct _CoglVertexBuffer
* modifying a buffer. */
GList *new_attributes; /*!< attributes pending submission */
- CoglBool dirty_attributes;
+ gboolean dirty_attributes;
CoglPrimitive *primitive;
diff --git a/cogl/cogl/deprecated/cogl-vertex-buffer.c b/cogl/cogl/deprecated/cogl-vertex-buffer.c
index c0f0ca6e4..d4b837aca 100644
--- a/cogl/cogl/deprecated/cogl-vertex-buffer.c
+++ b/cogl/cogl/deprecated/cogl-vertex-buffer.c
@@ -304,7 +304,7 @@ validate_cogl_attribute (const char *cogl_attribute,
*
* maybe I should hang a compiled regex somewhere to handle this
*/
-static CoglBool
+static gboolean
validate_custom_attribute_name (const char *attribute_name)
{
char *detail_seperator = NULL;
@@ -440,14 +440,14 @@ cogl_vertex_buffer_add (CoglHandle handle,
const char *attribute_name,
uint8_t n_components,
CoglAttributeType type,
- CoglBool normalized,
+ gboolean normalized,
uint16_t stride,
const void *pointer)
{
CoglVertexBuffer *buffer;
char *cogl_attribute_name;
GQuark name_quark;
- CoglBool modifying_an_attrib = FALSE;
+ gboolean modifying_an_attrib = FALSE;
CoglVertexBufferAttrib *attribute;
CoglVertexBufferAttribFlags flags = 0;
uint8_t texture_unit = 0;
@@ -612,7 +612,7 @@ cogl_vertex_buffer_delete (CoglHandle handle,
static void
set_attribute_enable (CoglHandle handle,
const char *attribute_name,
- CoglBool state)
+ gboolean state)
{
CoglVertexBuffer *buffer;
char *cogl_attribute_name = canonize_attribute_name (attribute_name);
@@ -985,7 +985,7 @@ prep_strided_vbo_for_upload (CoglVertexBufferVBO *cogl_vbo)
return lowest_pointer;
}
-static CoglBool
+static gboolean
upload_multipack_vbo_via_map_buffer (CoglVertexBufferVBO *cogl_vbo)
{
GList *tmp;
@@ -1093,7 +1093,7 @@ cogl_vertex_buffer_vbo_resolve (CoglVertexBuffer *buffer,
GList *conflicts;
GList *tmp;
GList *next;
- CoglBool found_target_vbo = FALSE;
+ gboolean found_target_vbo = FALSE;
_COGL_GET_CONTEXT (ctx, NO_RETVAL);
@@ -1513,7 +1513,7 @@ weak_override_source_destroyed_cb (CoglPipeline *pipeline,
unref_pipeline_priv (pipeline_priv);
}
-static CoglBool
+static gboolean
validate_layer_cb (CoglPipeline *pipeline,
int layer_index,
void *user_data)
@@ -1527,7 +1527,7 @@ validate_layer_cb (CoglPipeline *pipeline,
CoglPipelineWrapMode wrap_s;
CoglPipelineWrapMode wrap_t;
CoglPipelineWrapMode wrap_p;
- CoglBool need_override_source = FALSE;
+ gboolean need_override_source = FALSE;
/* By default COGL_PIPELINE_WRAP_MODE_AUTOMATIC becomes
* GL_CLAMP_TO_EDGE but we want GL_REPEAT to maintain
diff --git a/cogl/cogl/deprecated/cogl-vertex-buffer.h b/cogl/cogl/deprecated/cogl-vertex-buffer.h
index 56f6aead4..44998565b 100644
--- a/cogl/cogl/deprecated/cogl-vertex-buffer.h
+++ b/cogl/cogl/deprecated/cogl-vertex-buffer.h
@@ -180,7 +180,7 @@ cogl_vertex_buffer_add (CoglHandle handle,
const char *attribute_name,
uint8_t n_components,
CoglAttributeType type,
- CoglBool normalized,
+ gboolean normalized,
uint16_t stride,
const void *pointer);
@@ -427,7 +427,7 @@ cogl_vertex_buffer_indices_get_for_quads (unsigned int n_indices);
* Deprecated: 1.16: Use the #CoglPrimitive api instead
*/
COGL_DEPRECATED_FOR (cogl_primitive_API)
-CoglBool
+gboolean
cogl_is_vertex_buffer (CoglHandle handle);
/**
@@ -444,7 +444,7 @@ cogl_is_vertex_buffer (CoglHandle handle);
* Deprecated: 1.16: Use the #CoglPrimitive api instead
*/
COGL_DEPRECATED_FOR (cogl_primitive_API)
-CoglBool
+gboolean
cogl_is_vertex_buffer_indices (CoglHandle handle);
G_END_DECLS
diff --git a/cogl/cogl/driver/gl/cogl-attribute-gl.c b/cogl/cogl/driver/gl/cogl-attribute-gl.c
index 9d0f0f77c..8b160bbd9 100644
--- a/cogl/cogl/driver/gl/cogl-attribute-gl.c
+++ b/cogl/cogl/driver/gl/cogl-attribute-gl.c
@@ -54,7 +54,7 @@ typedef struct _ForeachChangedBitState
CoglPipeline *pipeline;
} ForeachChangedBitState;
-static CoglBool
+static gboolean
toggle_builtin_attribute_enabled_cb (int bit_num, void *user_data)
{
ForeachChangedBitState *state = user_data;
@@ -66,7 +66,7 @@ toggle_builtin_attribute_enabled_cb (int bit_num, void *user_data)
#ifdef HAVE_COGL_GL
{
- CoglBool enabled = _cogl_bitmask_get (state->new_bits, bit_num);
+ gboolean enabled = _cogl_bitmask_get (state->new_bits, bit_num);
GLenum cap;
switch (bit_num)
@@ -93,7 +93,7 @@ toggle_builtin_attribute_enabled_cb (int bit_num, void *user_data)
return TRUE;
}
-static CoglBool
+static gboolean
toggle_texcood_attribute_enabled_cb (int bit_num, void *user_data)
{
ForeachChangedBitState *state = user_data;
@@ -105,7 +105,7 @@ toggle_texcood_attribute_enabled_cb (int bit_num, void *user_data)
#ifdef HAVE_COGL_GL
{
- CoglBool enabled = _cogl_bitmask_get (state->new_bits, bit_num);
+ gboolean enabled = _cogl_bitmask_get (state->new_bits, bit_num);
GE( context, glClientActiveTexture (GL_TEXTURE0 + bit_num) );
@@ -119,11 +119,11 @@ toggle_texcood_attribute_enabled_cb (int bit_num, void *user_data)
return TRUE;
}
-static CoglBool
+static gboolean
toggle_custom_attribute_enabled_cb (int bit_num, void *user_data)
{
ForeachChangedBitState *state = user_data;
- CoglBool enabled = _cogl_bitmask_get (state->new_bits, bit_num);
+ gboolean enabled = _cogl_bitmask_get (state->new_bits, bit_num);
CoglContext *context = state->context;
if (enabled)
@@ -401,8 +401,8 @@ _cogl_gl_flush_attributes_state (CoglFramebuffer *framebuffer,
{
CoglContext *ctx = framebuffer->context;
int i;
- CoglBool with_color_attrib = FALSE;
- CoglBool unknown_color_alpha = FALSE;
+ gboolean with_color_attrib = FALSE;
+ gboolean unknown_color_alpha = FALSE;
CoglPipeline *copy = NULL;
/* Iterate the attributes to see if we have a color attribute which
diff --git a/cogl/cogl/driver/gl/cogl-buffer-gl-private.h b/cogl/cogl/driver/gl/cogl-buffer-gl-private.h
index b8f0435b3..140e34569 100644
--- a/cogl/cogl/driver/gl/cogl-buffer-gl-private.h
+++ b/cogl/cogl/driver/gl/cogl-buffer-gl-private.h
@@ -56,7 +56,7 @@ _cogl_buffer_gl_map_range (CoglBuffer *buffer,
void
_cogl_buffer_gl_unmap (CoglBuffer *buffer);
-CoglBool
+gboolean
_cogl_buffer_gl_set_data (CoglBuffer *buffer,
unsigned int offset,
const void *data,
diff --git a/cogl/cogl/driver/gl/cogl-buffer-gl.c b/cogl/cogl/driver/gl/cogl-buffer-gl.c
index 871a6ff84..9d9693344 100644
--- a/cogl/cogl/driver/gl/cogl-buffer-gl.c
+++ b/cogl/cogl/driver/gl/cogl-buffer-gl.c
@@ -133,7 +133,7 @@ convert_bind_target_to_gl_target (CoglBufferBindTarget target)
}
}
-static CoglBool
+static gboolean
recreate_store (CoglBuffer *buffer,
CoglError **error)
{
@@ -241,7 +241,7 @@ _cogl_buffer_gl_map_range (CoglBuffer *buffer,
if (ctx->glMapBufferRange)
{
GLbitfield gl_access = 0;
- CoglBool should_recreate_store = !buffer->store_created;
+ gboolean should_recreate_store = !buffer->store_created;
if ((access & COGL_BUFFER_ACCESS_READ))
gl_access |= GL_MAP_READ_BIT;
@@ -346,7 +346,7 @@ _cogl_buffer_gl_unmap (CoglBuffer *buffer)
_cogl_buffer_gl_unbind (buffer);
}
-CoglBool
+gboolean
_cogl_buffer_gl_set_data (CoglBuffer *buffer,
unsigned int offset,
const void *data,
@@ -356,7 +356,7 @@ _cogl_buffer_gl_set_data (CoglBuffer *buffer,
CoglBufferBindTarget target;
GLenum gl_target;
CoglContext *ctx = buffer->context;
- CoglBool status = TRUE;
+ gboolean status = TRUE;
CoglError *internal_error = NULL;
target = buffer->last_target;
diff --git a/cogl/cogl/driver/gl/cogl-clip-stack-gl.c b/cogl/cogl/driver/gl/cogl-clip-stack-gl.c
index dc7020254..78eddcc9d 100644
--- a/cogl/cogl/driver/gl/cogl-clip-stack-gl.c
+++ b/cogl/cogl/driver/gl/cogl-clip-stack-gl.c
@@ -202,7 +202,7 @@ add_stencil_clip_rectangle (CoglFramebuffer *framebuffer,
float y_1,
float x_2,
float y_2,
- CoglBool first)
+ gboolean first)
{
CoglMatrixStack *projection_stack =
_cogl_framebuffer_get_projection_stack (framebuffer);
@@ -272,8 +272,8 @@ add_stencil_clip_silhouette (CoglFramebuffer *framebuffer,
float bounds_y1,
float bounds_x2,
float bounds_y2,
- CoglBool merge,
- CoglBool need_clear,
+ gboolean merge,
+ gboolean need_clear,
void *user_data)
{
CoglMatrixStack *projection_stack =
@@ -383,8 +383,8 @@ add_stencil_clip_primitive (CoglFramebuffer *framebuffer,
float bounds_y1,
float bounds_x2,
float bounds_y2,
- CoglBool merge,
- CoglBool need_clear)
+ gboolean merge,
+ gboolean need_clear)
{
add_stencil_clip_silhouette (framebuffer,
paint_primitive_silhouette,
@@ -422,8 +422,8 @@ _cogl_clip_stack_gl_flush (CoglClipStack *stack,
{
CoglContext *ctx = framebuffer->context;
int has_clip_planes;
- CoglBool using_clip_planes = FALSE;
- CoglBool using_stencil_buffer = FALSE;
+ gboolean using_clip_planes = FALSE;
+ gboolean using_stencil_buffer = FALSE;
int scissor_x0;
int scissor_y0;
int scissor_x1;
diff --git a/cogl/cogl/driver/gl/cogl-framebuffer-gl-private.h
b/cogl/cogl/driver/gl/cogl-framebuffer-gl-private.h
index 47a1c1c96..214f45f0f 100644
--- a/cogl/cogl/driver/gl/cogl-framebuffer-gl-private.h
+++ b/cogl/cogl/driver/gl/cogl-framebuffer-gl-private.h
@@ -34,7 +34,7 @@
#ifndef __COGL_FRAMEBUFFER_GL_PRIVATE_H__
#define __COGL_FRAMEBUFFER_GL_PRIVATE_H__
-CoglBool
+gboolean
_cogl_offscreen_gl_allocate (CoglOffscreen *offscreen,
CoglError **error);
@@ -89,7 +89,7 @@ _cogl_framebuffer_gl_draw_indexed_attributes (CoglFramebuffer *framebuffer,
int n_attributes,
CoglDrawFlags flags);
-CoglBool
+gboolean
_cogl_framebuffer_gl_read_pixels_into_bitmap (CoglFramebuffer *framebuffer,
int x,
int y,
diff --git a/cogl/cogl/driver/gl/cogl-framebuffer-gl.c b/cogl/cogl/driver/gl/cogl-framebuffer-gl.c
index e6e31a515..c2bf92882 100644
--- a/cogl/cogl/driver/gl/cogl-framebuffer-gl.c
+++ b/cogl/cogl/driver/gl/cogl-framebuffer-gl.c
@@ -649,7 +649,7 @@ delete_renderbuffers (CoglContext *ctx, GList *renderbuffers)
* CoglTexture as the given CoglOffscreen. This function shouldn't
* modify anything in
*/
-static CoglBool
+static gboolean
try_creating_fbo (CoglContext *ctx,
CoglTexture *texture,
int texture_level,
@@ -763,7 +763,7 @@ try_creating_fbo (CoglContext *ctx,
return TRUE;
}
-CoglBool
+gboolean
_cogl_framebuffer_try_creating_gl_fbo (CoglContext *ctx,
CoglTexture *texture,
int texture_level,
@@ -785,7 +785,7 @@ _cogl_framebuffer_try_creating_gl_fbo (CoglContext *ctx,
gl_framebuffer);
}
-CoglBool
+gboolean
_cogl_offscreen_gl_allocate (CoglOffscreen *offscreen,
CoglError **error)
{
@@ -1241,7 +1241,7 @@ _cogl_framebuffer_gl_draw_indexed_attributes (CoglFramebuffer *framebuffer,
_cogl_buffer_gl_unbind (buffer);
}
-CoglBool
+gboolean
_cogl_framebuffer_gl_read_pixels_into_bitmap (CoglFramebuffer *framebuffer,
int x,
int y,
@@ -1258,7 +1258,7 @@ _cogl_framebuffer_gl_read_pixels_into_bitmap (CoglFramebuffer *framebuffer,
GLenum gl_intformat;
GLenum gl_format;
GLenum gl_type;
- CoglBool pack_invert_set;
+ gboolean pack_invert_set;
int status = FALSE;
_cogl_framebuffer_flush_state (framebuffer,
@@ -1316,7 +1316,7 @@ _cogl_framebuffer_gl_read_pixels_into_bitmap (CoglFramebuffer *framebuffer,
CoglPixelFormat read_format;
int bpp, rowstride;
uint8_t *tmp_data;
- CoglBool succeeded;
+ gboolean succeeded;
if (_cogl_has_private_feature
(ctx, COGL_PRIVATE_FEATURE_READ_PIXELS_ANY_FORMAT))
@@ -1373,7 +1373,7 @@ _cogl_framebuffer_gl_read_pixels_into_bitmap (CoglFramebuffer *framebuffer,
CoglBitmap *shared_bmp;
CoglPixelFormat bmp_format;
int bpp, rowstride;
- CoglBool succeeded = FALSE;
+ gboolean succeeded = FALSE;
uint8_t *pixels;
CoglError *internal_error = NULL;
diff --git a/cogl/cogl/driver/gl/cogl-pipeline-fragend-glsl.c
b/cogl/cogl/driver/gl/cogl-pipeline-fragend-glsl.c
index efedc33c5..8f5d50981 100644
--- a/cogl/cogl/driver/gl/cogl-pipeline-fragend-glsl.c
+++ b/cogl/cogl/driver/gl/cogl-pipeline-fragend-glsl.c
@@ -211,7 +211,7 @@ get_layer_fragment_snippets (CoglPipelineLayer *layer)
return &layer->big_state->fragment_snippets;
}
-static CoglBool
+static gboolean
has_replace_hook (CoglPipelineLayer *layer,
CoglSnippetHook hook)
{
@@ -228,7 +228,7 @@ has_replace_hook (CoglPipelineLayer *layer,
return FALSE;
}
-static CoglBool
+static gboolean
add_layer_declaration_cb (CoglPipelineLayer *layer,
void *user_data)
{
@@ -567,7 +567,7 @@ add_arg (CoglPipelineShaderState *shader_state,
if (other_layer == NULL)
{
- static CoglBool warning_seen = FALSE;
+ static gboolean warning_seen = FALSE;
if (!warning_seen)
{
g_warning ("The application is trying to use a texture "
@@ -891,7 +891,7 @@ ensure_layer_generated (CoglPipeline *pipeline,
g_slice_free (LayerData, layer_data);
}
-static CoglBool
+static gboolean
_cogl_pipeline_fragend_glsl_add_layer (CoglPipeline *pipeline,
CoglPipelineLayer *layer,
unsigned long layers_difference)
@@ -989,7 +989,7 @@ add_alpha_test_snippet (CoglPipeline *pipeline,
#endif /* HAVE_COGL_GLES2 */
-static CoglBool
+static gboolean
_cogl_pipeline_fragend_glsl_end (CoglPipeline *pipeline,
unsigned long pipelines_difference)
{
diff --git a/cogl/cogl/driver/gl/cogl-pipeline-opengl-private.h
b/cogl/cogl/driver/gl/cogl-pipeline-opengl-private.h
index 0a374be49..eae42fe16 100644
--- a/cogl/cogl/driver/gl/cogl-pipeline-opengl-private.h
+++ b/cogl/cogl/driver/gl/cogl-pipeline-opengl-private.h
@@ -76,7 +76,7 @@ typedef struct _CoglTextureUnit
* asked to glBindTexture we can't try and optimize a redundant state
* change because we don't know if the original texture name was deleted
* and now we are being asked to bind a recycled name. */
- CoglBool is_foreign;
+ gboolean is_foreign;
/* We have many components in Cogl that need to temporarily bind arbitrary
* textures e.g. to query texture object parameters and since we don't
@@ -89,7 +89,7 @@ typedef struct _CoglTextureUnit
* of always using texture unit 1 for these transient bindings so we
* can assume this is only ever TRUE for unit 1.
*/
- CoglBool dirty_gl_texture;
+ gboolean dirty_gl_texture;
/* A matrix stack giving us the means to associate a texture
* transform matrix with the texture unit. */
@@ -126,7 +126,7 @@ typedef struct _CoglTextureUnit
* too. When we later come to flush some pipeline state then we will
* always check this to potentially force an update of the texture
* state even if the pipeline hasn't changed. */
- CoglBool texture_storage_changed;
+ gboolean texture_storage_changed;
} CoglTextureUnit;
@@ -142,7 +142,7 @@ _cogl_set_active_texture_unit (int unit_index);
void
_cogl_bind_gl_texture_transient (GLenum gl_target,
GLuint gl_texture,
- CoglBool is_foreign);
+ gboolean is_foreign);
void
_cogl_delete_gl_texture (GLuint gl_texture);
@@ -151,8 +151,8 @@ void
_cogl_pipeline_flush_gl_state (CoglContext *context,
CoglPipeline *pipeline,
CoglFramebuffer *framebuffer,
- CoglBool skip_gl_state,
- CoglBool unknown_color_alpha);
+ gboolean skip_gl_state,
+ gboolean unknown_color_alpha);
#endif /* __COGL_PIPELINE_OPENGL_PRIVATE_H */
diff --git a/cogl/cogl/driver/gl/cogl-pipeline-opengl.c b/cogl/cogl/driver/gl/cogl-pipeline-opengl.c
index 1de4b65eb..8492c629b 100644
--- a/cogl/cogl/driver/gl/cogl-pipeline-opengl.c
+++ b/cogl/cogl/driver/gl/cogl-pipeline-opengl.c
@@ -167,7 +167,7 @@ _cogl_set_active_texture_unit (int unit_index)
void
_cogl_bind_gl_texture_transient (GLenum gl_target,
GLuint gl_texture,
- CoglBool is_foreign)
+ gboolean is_foreign)
{
CoglTextureUnit *unit;
@@ -355,7 +355,7 @@ _cogl_use_vertex_program (GLuint gl_program, CoglPipelineProgramType type)
#if defined(HAVE_COGL_GLES2) || defined(HAVE_COGL_GL)
-static CoglBool
+static gboolean
blend_factor_uses_constant (GLenum blend_factor)
{
return (blend_factor == GL_CONSTANT_COLOR ||
@@ -370,7 +370,7 @@ static void
flush_depth_state (CoglContext *ctx,
CoglDepthState *depth_state)
{
- CoglBool depth_writing_enabled = depth_state->write_enabled;
+ gboolean depth_writing_enabled = depth_state->write_enabled;
if (ctx->current_draw_buffer)
depth_writing_enabled &= ctx->current_draw_buffer->depth_writing_enabled;
@@ -453,7 +453,7 @@ static void
_cogl_pipeline_flush_color_blend_alpha_depth_state (
CoglPipeline *pipeline,
unsigned long pipelines_difference,
- CoglBool with_color_attrib)
+ gboolean with_color_attrib)
{
_COGL_GET_CONTEXT (ctx, NO_RETVAL);
@@ -609,7 +609,7 @@ _cogl_pipeline_flush_color_blend_alpha_depth_state (
GE( ctx, glDisable (GL_CULL_FACE) );
else
{
- CoglBool invert_winding;
+ gboolean invert_winding;
GE( ctx, glEnable (GL_CULL_FACE) );
@@ -756,7 +756,7 @@ typedef struct
unsigned long *layer_differences;
} CoglPipelineFlushLayerState;
-static CoglBool
+static gboolean
flush_layers_common_gl_state_cb (CoglPipelineLayer *layer, void *user_data)
{
CoglPipelineFlushLayerState *flush_state = user_data;
@@ -772,7 +772,7 @@ flush_layers_common_gl_state_cb (CoglPipelineLayer *layer, void *user_data)
*/
if (G_UNLIKELY (unit_index >= get_max_activateable_texture_units ()))
{
- static CoglBool shown_warning = FALSE;
+ static gboolean shown_warning = FALSE;
if (!shown_warning)
{
@@ -900,7 +900,7 @@ static void
_cogl_pipeline_flush_common_gl_state (CoglPipeline *pipeline,
unsigned long pipelines_difference,
unsigned long *layer_differences,
- CoglBool with_color_attrib)
+ gboolean with_color_attrib)
{
CoglPipelineFlushLayerState state;
@@ -1015,7 +1015,7 @@ typedef struct
unsigned long *layer_differences;
} CoglPipelineCompareLayersState;
-static CoglBool
+static gboolean
compare_layer_differences_cb (CoglPipelineLayer *layer, void *user_data)
{
CoglPipelineCompareLayersState *state = user_data;
@@ -1056,11 +1056,11 @@ typedef struct
const CoglPipelineFragend *fragend;
CoglPipeline *pipeline;
unsigned long *layer_differences;
- CoglBool error_adding_layer;
- CoglBool added_layer;
+ gboolean error_adding_layer;
+ gboolean added_layer;
} CoglPipelineAddLayerState;
-static CoglBool
+static gboolean
vertend_add_layer_cb (CoglPipelineLayer *layer,
void *user_data)
{
@@ -1085,7 +1085,7 @@ vertend_add_layer_cb (CoglPipelineLayer *layer,
return TRUE;
}
-static CoglBool
+static gboolean
fragend_add_layer_cb (CoglPipelineLayer *layer,
void *user_data)
{
@@ -1163,8 +1163,8 @@ void
_cogl_pipeline_flush_gl_state (CoglContext *ctx,
CoglPipeline *pipeline,
CoglFramebuffer *framebuffer,
- CoglBool with_color_attrib,
- CoglBool unknown_color_alpha)
+ gboolean with_color_attrib,
+ gboolean unknown_color_alpha)
{
CoglPipeline *current_pipeline = ctx->current_pipeline;
unsigned long pipelines_difference;
@@ -1207,7 +1207,7 @@ _cogl_pipeline_flush_gl_state (CoglContext *ctx,
if (pipelines_difference & COGL_PIPELINE_STATE_AFFECTS_BLENDING ||
pipeline->unknown_color_alpha != unknown_color_alpha)
{
- CoglBool save_real_blend_enable = pipeline->real_blend_enable;
+ gboolean save_real_blend_enable = pipeline->real_blend_enable;
_cogl_pipeline_update_real_blend_enable (pipeline,
unknown_color_alpha);
diff --git a/cogl/cogl/driver/gl/cogl-pipeline-progend-glsl.c
b/cogl/cogl/driver/gl/cogl-pipeline-progend-glsl.c
index 241fbae7f..1f9baa9be 100644
--- a/cogl/cogl/driver/gl/cogl-pipeline-progend-glsl.c
+++ b/cogl/cogl/driver/gl/cogl-pipeline-progend-glsl.c
@@ -355,11 +355,11 @@ typedef struct
{
int unit;
GLuint gl_program;
- CoglBool update_all;
+ gboolean update_all;
CoglPipelineProgramState *program_state;
} UpdateUniformsState;
-static CoglBool
+static gboolean
get_uniform_cb (CoglPipeline *pipeline,
int layer_index,
void *user_data)
@@ -413,7 +413,7 @@ get_uniform_cb (CoglPipeline *pipeline,
return TRUE;
}
-static CoglBool
+static gboolean
update_constants_cb (CoglPipeline *pipeline,
int layer_index,
void *user_data)
@@ -486,7 +486,7 @@ typedef struct
int value_index;
} FlushUniformsClosure;
-static CoglBool
+static gboolean
flush_uniform_cb (int uniform_num, void *user_data)
{
FlushUniformsClosure *data = user_data;
@@ -549,7 +549,7 @@ _cogl_pipeline_progend_glsl_flush_uniforms (CoglPipeline *pipeline,
CoglPipelineProgramState *
program_state,
GLuint gl_program,
- CoglBool program_changed)
+ gboolean program_changed)
{
CoglPipelineUniformsState *uniforms_state;
FlushUniformsClosure data;
@@ -637,7 +637,7 @@ _cogl_pipeline_progend_glsl_flush_uniforms (CoglPipeline *pipeline,
_cogl_bitmask_clear_all (&uniforms_state->changed_mask);
}
-static CoglBool
+static gboolean
_cogl_pipeline_progend_glsl_start (CoglPipeline *pipeline)
{
CoglHandle user_program;
@@ -661,7 +661,7 @@ _cogl_pipeline_progend_glsl_end (CoglPipeline *pipeline,
{
CoglPipelineProgramState *program_state;
GLuint gl_program;
- CoglBool program_changed = FALSE;
+ gboolean program_changed = FALSE;
UpdateUniformsState state;
CoglProgram *user_program;
CoglPipelineCacheEntry *cache_entry = NULL;
@@ -925,14 +925,14 @@ static void
_cogl_pipeline_progend_glsl_pre_paint (CoglPipeline *pipeline,
CoglFramebuffer *framebuffer)
{
- CoglBool needs_flip;
+ gboolean needs_flip;
CoglMatrixEntry *projection_entry;
CoglMatrixEntry *modelview_entry;
CoglPipelineProgramState *program_state;
- CoglBool modelview_changed;
- CoglBool projection_changed;
- CoglBool need_modelview;
- CoglBool need_projection;
+ gboolean modelview_changed;
+ gboolean projection_changed;
+ gboolean need_modelview;
+ gboolean need_projection;
CoglMatrix modelview, projection;
_COGL_GET_CONTEXT (ctx, NO_RETVAL);
diff --git a/cogl/cogl/driver/gl/cogl-pipeline-vertend-glsl.c
b/cogl/cogl/driver/gl/cogl-pipeline-vertend-glsl.c
index 2374c77d5..54a8e5a2c 100644
--- a/cogl/cogl/driver/gl/cogl-pipeline-vertend-glsl.c
+++ b/cogl/cogl/driver/gl/cogl-pipeline-vertend-glsl.c
@@ -164,7 +164,7 @@ get_layer_vertex_snippets (CoglPipelineLayer *layer)
return &layer->big_state->vertex_snippets;
}
-static CoglBool
+static gboolean
add_layer_declaration_cb (CoglPipelineLayer *layer,
void *user_data)
{
@@ -332,7 +332,7 @@ _cogl_pipeline_vertend_glsl_start (CoglPipeline *pipeline,
}
}
-static CoglBool
+static gboolean
_cogl_pipeline_vertend_glsl_add_layer (CoglPipeline *pipeline,
CoglPipelineLayer *layer,
unsigned long layers_difference,
@@ -405,7 +405,7 @@ _cogl_pipeline_vertend_glsl_add_layer (CoglPipeline *pipeline,
return TRUE;
}
-static CoglBool
+static gboolean
_cogl_pipeline_vertend_glsl_end (CoglPipeline *pipeline,
unsigned long pipelines_difference)
{
@@ -423,7 +423,7 @@ _cogl_pipeline_vertend_glsl_end (CoglPipeline *pipeline,
GLuint shader;
CoglPipelineSnippetData snippet_data;
CoglPipelineSnippetList *vertex_snippets;
- CoglBool has_per_vertex_point_size =
+ gboolean has_per_vertex_point_size =
cogl_pipeline_get_per_vertex_point_size (pipeline);
COGL_STATIC_COUNTER (vertend_glsl_compile_counter,
diff --git a/cogl/cogl/driver/gl/cogl-texture-2d-gl-private.h
b/cogl/cogl/driver/gl/cogl-texture-2d-gl-private.h
index 9f77bf99f..429f02408 100644
--- a/cogl/cogl/driver/gl/cogl-texture-2d-gl-private.h
+++ b/cogl/cogl/driver/gl/cogl-texture-2d-gl-private.h
@@ -41,7 +41,7 @@
void
_cogl_texture_2d_gl_free (CoglTexture2D *tex_2d);
-CoglBool
+gboolean
_cogl_texture_2d_gl_can_create (CoglContext *ctx,
int width,
int height,
@@ -50,14 +50,14 @@ _cogl_texture_2d_gl_can_create (CoglContext *ctx,
void
_cogl_texture_2d_gl_init (CoglTexture2D *tex_2d);
-CoglBool
+gboolean
_cogl_texture_2d_gl_allocate (CoglTexture *tex,
CoglError **error);
CoglTexture2D *
_cogl_texture_2d_gl_new_from_bitmap (CoglBitmap *bmp,
CoglPixelFormat internal_format,
- CoglBool can_convert_in_place,
+ gboolean can_convert_in_place,
CoglError **error);
#if defined (COGL_HAS_EGL_SUPPORT) && defined (EGL_KHR_image_base)
@@ -98,7 +98,7 @@ _cogl_texture_2d_gl_get_gl_handle (CoglTexture2D *tex_2d);
void
_cogl_texture_2d_gl_generate_mipmap (CoglTexture2D *tex_2d);
-CoglBool
+gboolean
_cogl_texture_2d_gl_copy_from_bitmap (CoglTexture2D *tex_2d,
int src_x,
int src_y,
@@ -110,7 +110,7 @@ _cogl_texture_2d_gl_copy_from_bitmap (CoglTexture2D *tex_2d,
int level,
CoglError **error);
-CoglBool
+gboolean
_cogl_texture_2d_gl_is_get_data_supported (CoglTexture2D *tex_2d);
void
diff --git a/cogl/cogl/driver/gl/cogl-texture-2d-gl.c b/cogl/cogl/driver/gl/cogl-texture-2d-gl.c
index a501be3d1..6692c9403 100644
--- a/cogl/cogl/driver/gl/cogl-texture-2d-gl.c
+++ b/cogl/cogl/driver/gl/cogl-texture-2d-gl.c
@@ -73,7 +73,7 @@ _cogl_texture_2d_gl_free (CoglTexture2D *tex_2d)
#endif
}
-CoglBool
+gboolean
_cogl_texture_2d_gl_can_create (CoglContext *ctx,
int width,
int height,
@@ -126,7 +126,7 @@ _cogl_texture_2d_gl_init (CoglTexture2D *tex_2d)
tex_2d->egl_image_external.destroy = NULL;
}
-static CoglBool
+static gboolean
allocate_with_size (CoglTexture2D *tex_2d,
CoglTextureLoader *loader,
CoglError **error)
@@ -192,7 +192,7 @@ allocate_with_size (CoglTexture2D *tex_2d,
return TRUE;
}
-static CoglBool
+static gboolean
allocate_from_bitmap (CoglTexture2D *tex_2d,
CoglTextureLoader *loader,
CoglError **error)
@@ -203,7 +203,7 @@ allocate_from_bitmap (CoglTexture2D *tex_2d,
CoglPixelFormat internal_format;
int width = cogl_bitmap_get_width (bmp);
int height = cogl_bitmap_get_height (bmp);
- CoglBool can_convert_in_place = loader->src.bitmap.can_convert_in_place;
+ gboolean can_convert_in_place = loader->src.bitmap.can_convert_in_place;
CoglBitmap *upload_bmp;
GLenum gl_intformat;
GLenum gl_format;
@@ -299,7 +299,7 @@ allocate_from_bitmap (CoglTexture2D *tex_2d,
}
#if defined (COGL_HAS_EGL_SUPPORT) && defined (EGL_KHR_image_base)
-static CoglBool
+static gboolean
allocate_from_egl_image (CoglTexture2D *tex_2d,
CoglTextureLoader *loader,
CoglError **error)
@@ -338,7 +338,7 @@ allocate_from_egl_image (CoglTexture2D *tex_2d,
}
#endif
-static CoglBool
+static gboolean
allocate_from_gl_foreign (CoglTexture2D *tex_2d,
CoglTextureLoader *loader,
CoglError **error)
@@ -463,7 +463,7 @@ allocate_from_gl_foreign (CoglTexture2D *tex_2d,
}
#if defined (COGL_HAS_EGL_SUPPORT)
-static CoglBool
+static gboolean
allocate_custom_egl_image_external (CoglTexture2D *tex_2d,
CoglTextureLoader *loader,
CoglError **error)
@@ -557,7 +557,7 @@ cogl_texture_2d_new_from_egl_image_external (CoglContext *ctx,
}
#endif /* defined (COGL_HAS_EGL_SUPPORT) */
-CoglBool
+gboolean
_cogl_texture_2d_gl_allocate (CoglTexture *tex,
CoglError **error)
{
@@ -751,7 +751,7 @@ _cogl_texture_2d_gl_generate_mipmap (CoglTexture2D *tex_2d)
#endif
}
-CoglBool
+gboolean
_cogl_texture_2d_gl_copy_from_bitmap (CoglTexture2D *tex_2d,
int src_x,
int src_y,
@@ -769,7 +769,7 @@ _cogl_texture_2d_gl_copy_from_bitmap (CoglTexture2D *tex_2d,
CoglPixelFormat upload_format;
GLenum gl_format;
GLenum gl_type;
- CoglBool status = TRUE;
+ gboolean status = TRUE;
upload_bmp =
_cogl_bitmap_convert_for_upload (bmp,
@@ -838,7 +838,7 @@ _cogl_texture_2d_gl_copy_from_bitmap (CoglTexture2D *tex_2d,
return status;
}
-CoglBool
+gboolean
_cogl_texture_2d_gl_is_get_data_supported (CoglTexture2D *tex_2d)
{
if (tex_2d->gl_target == GL_TEXTURE_EXTERNAL_OES)
diff --git a/cogl/cogl/driver/gl/cogl-util-gl-private.h b/cogl/cogl/driver/gl/cogl-util-gl-private.h
index 74db6ee05..3dbc96b95 100644
--- a/cogl/cogl/driver/gl/cogl-util-gl-private.h
+++ b/cogl/cogl/driver/gl/cogl-util-gl-private.h
@@ -82,7 +82,7 @@ _cogl_gl_util_get_error (CoglContext *ctx);
void
_cogl_gl_util_clear_gl_errors (CoglContext *ctx);
-CoglBool
+gboolean
_cogl_gl_util_catch_out_of_memory (CoglContext *ctx, CoglError **error);
void
@@ -96,7 +96,7 @@ _cogl_gl_util_get_texture_target_string (CoglTextureType texture_type,
* by the end of the string, a space or a full stop. Anything else
* will be treated as invalid. Returns TRUE and sets major_out and
* minor_out if it is succesfully parsed or FALSE otherwise. */
-CoglBool
+gboolean
_cogl_gl_util_parse_gl_version (const char *version_string,
int *major_out,
int *minor_out);
diff --git a/cogl/cogl/driver/gl/cogl-util-gl.c b/cogl/cogl/driver/gl/cogl-util-gl.c
index 759025b56..45f5130db 100644
--- a/cogl/cogl/driver/gl/cogl-util-gl.c
+++ b/cogl/cogl/driver/gl/cogl-util-gl.c
@@ -95,11 +95,11 @@ _cogl_gl_util_clear_gl_errors (CoglContext *ctx)
;
}
-CoglBool
+gboolean
_cogl_gl_util_catch_out_of_memory (CoglContext *ctx, CoglError **error)
{
GLenum gl_error;
- CoglBool out_of_memory = FALSE;
+ gboolean out_of_memory = FALSE;
while ((gl_error = ctx->glGetError ()) != GL_NO_ERROR && gl_error != GL_CONTEXT_LOST)
{
@@ -170,7 +170,7 @@ _cogl_gl_util_get_texture_target_string (CoglTextureType texture_type,
*swizzle_out = tex_coord_swizzle;
}
-CoglBool
+gboolean
_cogl_gl_util_parse_gl_version (const char *version_string,
int *major_out,
int *minor_out)
diff --git a/cogl/cogl/driver/gl/gl/cogl-driver-gl.c b/cogl/cogl/driver/gl/gl/cogl-driver-gl.c
index 2a0392be8..84252e169 100644
--- a/cogl/cogl/driver/gl/gl/cogl-driver-gl.c
+++ b/cogl/cogl/driver/gl/gl/cogl-driver-gl.c
@@ -44,7 +44,7 @@
#include "driver/gl/cogl-clip-stack-gl-private.h"
#include "driver/gl/cogl-buffer-gl-private.h"
-static CoglBool
+static gboolean
_cogl_driver_pixel_format_from_gl_internal (CoglContext *context,
GLenum gl_int_format,
CoglPixelFormat *out_format)
@@ -311,7 +311,7 @@ _cogl_driver_pixel_format_to_gl (CoglContext *context,
out_gltype);
}
-static CoglBool
+static gboolean
_cogl_get_gl_version (CoglContext *ctx,
int *major_out,
int *minor_out)
@@ -325,7 +325,7 @@ _cogl_get_gl_version (CoglContext *ctx,
return _cogl_gl_util_parse_gl_version (version_string, major_out, minor_out);
}
-static CoglBool
+static gboolean
check_gl_version (CoglContext *ctx,
char **gl_extensions,
CoglError **error)
@@ -372,7 +372,7 @@ check_gl_version (CoglContext *ctx,
return TRUE;
}
-static CoglBool
+static gboolean
_cogl_driver_update_features (CoglContext *ctx,
CoglError **error)
{
diff --git a/cogl/cogl/driver/gl/gl/cogl-texture-driver-gl.c b/cogl/cogl/driver/gl/gl/cogl-texture-driver-gl.c
index dc3c98ba2..96d6a6da3 100644
--- a/cogl/cogl/driver/gl/gl/cogl-texture-driver-gl.c
+++ b/cogl/cogl/driver/gl/gl/cogl-texture-driver-gl.c
@@ -196,10 +196,10 @@ _cogl_texture_driver_prep_gl_for_pixels_download (CoglContext *ctx,
pixels_bpp);
}
-static CoglBool
+static gboolean
_cogl_texture_driver_upload_subregion_to_gl (CoglContext *ctx,
CoglTexture *texture,
- CoglBool is_foreign,
+ gboolean is_foreign,
int src_x,
int src_y,
int dst_x,
@@ -217,7 +217,7 @@ _cogl_texture_driver_upload_subregion_to_gl (CoglContext *ctx,
uint8_t *data;
CoglPixelFormat source_format = cogl_bitmap_get_format (source_bmp);
int bpp = _cogl_pixel_format_get_bytes_per_pixel (source_format);
- CoglBool status = TRUE;
+ gboolean status = TRUE;
CoglError *internal_error = NULL;
int level_width;
int level_height;
@@ -309,11 +309,11 @@ _cogl_texture_driver_upload_subregion_to_gl (CoglContext *ctx,
return status;
}
-static CoglBool
+static gboolean
_cogl_texture_driver_upload_to_gl (CoglContext *ctx,
GLenum gl_target,
GLuint gl_handle,
- CoglBool is_foreign,
+ gboolean is_foreign,
CoglBitmap *source_bmp,
GLint internal_gl_format,
GLuint source_gl_format,
@@ -323,7 +323,7 @@ _cogl_texture_driver_upload_to_gl (CoglContext *ctx,
uint8_t *data;
CoglPixelFormat source_format = cogl_bitmap_get_format (source_bmp);
int bpp = _cogl_pixel_format_get_bytes_per_pixel (source_format);
- CoglBool status = TRUE;
+ gboolean status = TRUE;
CoglError *internal_error = NULL;
data = _cogl_bitmap_gl_bind (source_bmp,
@@ -367,11 +367,11 @@ _cogl_texture_driver_upload_to_gl (CoglContext *ctx,
return status;
}
-static CoglBool
+static gboolean
_cogl_texture_driver_upload_to_gl_3d (CoglContext *ctx,
GLenum gl_target,
GLuint gl_handle,
- CoglBool is_foreign,
+ gboolean is_foreign,
GLint height,
GLint depth,
CoglBitmap *source_bmp,
@@ -383,7 +383,7 @@ _cogl_texture_driver_upload_to_gl_3d (CoglContext *ctx,
uint8_t *data;
CoglPixelFormat source_format = cogl_bitmap_get_format (source_bmp);
int bpp = _cogl_pixel_format_get_bytes_per_pixel (source_format);
- CoglBool status = TRUE;
+ gboolean status = TRUE;
data = _cogl_bitmap_gl_bind (source_bmp, COGL_BUFFER_ACCESS_READ, 0, error);
if (!data)
@@ -420,7 +420,7 @@ _cogl_texture_driver_upload_to_gl_3d (CoglContext *ctx,
return status;
}
-static CoglBool
+static gboolean
_cogl_texture_driver_gl_get_tex_image (CoglContext *ctx,
GLenum gl_target,
GLenum dest_gl_format,
@@ -435,7 +435,7 @@ _cogl_texture_driver_gl_get_tex_image (CoglContext *ctx,
return TRUE;
}
-static CoglBool
+static gboolean
_cogl_texture_driver_size_supported_3d (CoglContext *ctx,
GLenum gl_target,
GLenum gl_format,
@@ -464,7 +464,7 @@ _cogl_texture_driver_size_supported_3d (CoglContext *ctx,
return new_width != 0;
}
-static CoglBool
+static gboolean
_cogl_texture_driver_size_supported (CoglContext *ctx,
GLenum gl_target,
GLenum gl_intformat,
@@ -510,7 +510,7 @@ _cogl_texture_driver_try_setting_gl_border_color
transparent_color) );
}
-static CoglBool
+static gboolean
_cogl_texture_driver_allows_foreign_gl_target (CoglContext *ctx,
GLenum gl_target)
{
diff --git a/cogl/cogl/driver/gl/gles/cogl-driver-gles.c b/cogl/cogl/driver/gl/gles/cogl-driver-gles.c
index 38d2f7b8b..2e75345b1 100644
--- a/cogl/cogl/driver/gl/gles/cogl-driver-gles.c
+++ b/cogl/cogl/driver/gl/gles/cogl-driver-gles.c
@@ -56,7 +56,7 @@
#define GL_RG8 0x822B
#endif
-static CoglBool
+static gboolean
_cogl_driver_pixel_format_from_gl_internal (CoglContext *context,
GLenum gl_int_format,
CoglPixelFormat *out_format)
@@ -232,7 +232,7 @@ _cogl_driver_pixel_format_to_gl (CoglContext *context,
out_gltype);
}
-static CoglBool
+static gboolean
_cogl_get_gl_version (CoglContext *ctx,
int *major_out,
int *minor_out)
@@ -251,7 +251,7 @@ _cogl_get_gl_version (CoglContext *ctx,
minor_out);
}
-static CoglBool
+static gboolean
_cogl_driver_update_features (CoglContext *context,
CoglError **error)
{
diff --git a/cogl/cogl/driver/gl/gles/cogl-texture-driver-gles.c
b/cogl/cogl/driver/gl/gles/cogl-texture-driver-gles.c
index 01fd8c884..9ecfd2b4c 100644
--- a/cogl/cogl/driver/gl/gles/cogl-texture-driver-gles.c
+++ b/cogl/cogl/driver/gl/gles/cogl-texture-driver-gles.c
@@ -176,10 +176,10 @@ prepare_bitmap_alignment_for_upload (CoglContext *ctx,
return _cogl_bitmap_copy (src_bmp, error);
}
-static CoglBool
+static gboolean
_cogl_texture_driver_upload_subregion_to_gl (CoglContext *ctx,
CoglTexture *texture,
- CoglBool is_foreign,
+ gboolean is_foreign,
int src_x,
int src_y,
int dst_x,
@@ -199,7 +199,7 @@ _cogl_texture_driver_upload_subregion_to_gl (CoglContext *ctx,
int bpp = _cogl_pixel_format_get_bytes_per_pixel (source_format);
CoglBitmap *slice_bmp;
int rowstride;
- CoglBool status = TRUE;
+ gboolean status = TRUE;
CoglError *internal_error = NULL;
int level_width;
int level_height;
@@ -326,11 +326,11 @@ _cogl_texture_driver_upload_subregion_to_gl (CoglContext *ctx,
return status;
}
-static CoglBool
+static gboolean
_cogl_texture_driver_upload_to_gl (CoglContext *ctx,
GLenum gl_target,
GLuint gl_handle,
- CoglBool is_foreign,
+ gboolean is_foreign,
CoglBitmap *source_bmp,
GLint internal_gl_format,
GLuint source_gl_format,
@@ -345,7 +345,7 @@ _cogl_texture_driver_upload_to_gl (CoglContext *ctx,
CoglBitmap *bmp;
uint8_t *data;
CoglError *internal_error = NULL;
- CoglBool status = TRUE;
+ gboolean status = TRUE;
bmp = prepare_bitmap_alignment_for_upload (ctx, source_bmp, error);
if (!bmp)
@@ -394,11 +394,11 @@ _cogl_texture_driver_upload_to_gl (CoglContext *ctx,
return status;
}
-static CoglBool
+static gboolean
_cogl_texture_driver_upload_to_gl_3d (CoglContext *ctx,
GLenum gl_target,
GLuint gl_handle,
- CoglBool is_foreign,
+ gboolean is_foreign,
GLint height,
GLint depth,
CoglBitmap *source_bmp,
@@ -543,7 +543,7 @@ _cogl_texture_driver_upload_to_gl_3d (CoglContext *ctx,
/* NB: GLES doesn't support glGetTexImage2D, so cogl-texture will instead
* fallback to a generic render + readpixels approach to downloading
* texture data. (See _cogl_texture_draw_and_read() ) */
-static CoglBool
+static gboolean
_cogl_texture_driver_gl_get_tex_image (CoglContext *ctx,
GLenum gl_target,
GLenum dest_gl_format,
@@ -553,7 +553,7 @@ _cogl_texture_driver_gl_get_tex_image (CoglContext *ctx,
return FALSE;
}
-static CoglBool
+static gboolean
_cogl_texture_driver_size_supported_3d (CoglContext *ctx,
GLenum gl_target,
GLenum gl_format,
@@ -572,7 +572,7 @@ _cogl_texture_driver_size_supported_3d (CoglContext *ctx,
return width <= max_size && height <= max_size && depth <= max_size;
}
-static CoglBool
+static gboolean
_cogl_texture_driver_size_supported (CoglContext *ctx,
GLenum gl_target,
GLenum gl_intformat,
@@ -599,7 +599,7 @@ _cogl_texture_driver_try_setting_gl_border_color
/* FAIL! */
}
-static CoglBool
+static gboolean
_cogl_texture_driver_allows_foreign_gl_target (CoglContext *ctx,
GLenum gl_target)
{
diff --git a/cogl/cogl/driver/nop/cogl-driver-nop.c b/cogl/cogl/driver/nop/cogl-driver-nop.c
index 0421df85b..bedad2b13 100644
--- a/cogl/cogl/driver/nop/cogl-driver-nop.c
+++ b/cogl/cogl/driver/nop/cogl-driver-nop.c
@@ -42,7 +42,7 @@
#include "cogl-attribute-nop-private.h"
#include "cogl-clip-stack-nop-private.h"
-static CoglBool
+static gboolean
_cogl_driver_update_features (CoglContext *ctx,
CoglError **error)
{
diff --git a/cogl/cogl/driver/nop/cogl-framebuffer-nop-private.h
b/cogl/cogl/driver/nop/cogl-framebuffer-nop-private.h
index 1e9630feb..05bbde6b4 100644
--- a/cogl/cogl/driver/nop/cogl-framebuffer-nop-private.h
+++ b/cogl/cogl/driver/nop/cogl-framebuffer-nop-private.h
@@ -37,7 +37,7 @@
#include "cogl-types.h"
#include "cogl-context-private.h"
-CoglBool
+gboolean
_cogl_offscreen_nop_allocate (CoglOffscreen *offscreen,
CoglError **error);
@@ -89,7 +89,7 @@ _cogl_framebuffer_nop_draw_indexed_attributes (CoglFramebuffer *framebuffer,
int n_attributes,
CoglDrawFlags flags);
-CoglBool
+gboolean
_cogl_framebuffer_nop_read_pixels_into_bitmap (CoglFramebuffer *framebuffer,
int x,
int y,
diff --git a/cogl/cogl/driver/nop/cogl-framebuffer-nop.c b/cogl/cogl/driver/nop/cogl-framebuffer-nop.c
index 66550c5cc..643e304ea 100644
--- a/cogl/cogl/driver/nop/cogl-framebuffer-nop.c
+++ b/cogl/cogl/driver/nop/cogl-framebuffer-nop.c
@@ -42,7 +42,7 @@ _cogl_framebuffer_nop_flush_state (CoglFramebuffer *draw_buffer,
{
}
-CoglBool
+gboolean
_cogl_offscreen_nop_allocate (CoglOffscreen *offscreen,
CoglError **error)
{
@@ -107,7 +107,7 @@ _cogl_framebuffer_nop_draw_indexed_attributes (CoglFramebuffer *framebuffer,
{
}
-CoglBool
+gboolean
_cogl_framebuffer_nop_read_pixels_into_bitmap (CoglFramebuffer *framebuffer,
int x,
int y,
diff --git a/cogl/cogl/driver/nop/cogl-texture-2d-nop-private.h
b/cogl/cogl/driver/nop/cogl-texture-2d-nop-private.h
index 51de1e3c1..499c65b1e 100644
--- a/cogl/cogl/driver/nop/cogl-texture-2d-nop-private.h
+++ b/cogl/cogl/driver/nop/cogl-texture-2d-nop-private.h
@@ -41,7 +41,7 @@
void
_cogl_texture_2d_nop_free (CoglTexture2D *tex_2d);
-CoglBool
+gboolean
_cogl_texture_2d_nop_can_create (CoglContext *ctx,
int width,
int height,
@@ -50,7 +50,7 @@ _cogl_texture_2d_nop_can_create (CoglContext *ctx,
void
_cogl_texture_2d_nop_init (CoglTexture2D *tex_2d);
-CoglBool
+gboolean
_cogl_texture_2d_nop_allocate (CoglTexture *tex,
CoglError **error);
@@ -82,7 +82,7 @@ _cogl_texture_2d_nop_get_gl_handle (CoglTexture2D *tex_2d);
void
_cogl_texture_2d_nop_generate_mipmap (CoglTexture2D *tex_2d);
-CoglBool
+gboolean
_cogl_texture_2d_nop_copy_from_bitmap (CoglTexture2D *tex_2d,
int src_x,
int src_y,
diff --git a/cogl/cogl/driver/nop/cogl-texture-2d-nop.c b/cogl/cogl/driver/nop/cogl-texture-2d-nop.c
index 5a37fa1ad..66a02c22a 100644
--- a/cogl/cogl/driver/nop/cogl-texture-2d-nop.c
+++ b/cogl/cogl/driver/nop/cogl-texture-2d-nop.c
@@ -46,7 +46,7 @@ _cogl_texture_2d_nop_free (CoglTexture2D *tex_2d)
{
}
-CoglBool
+gboolean
_cogl_texture_2d_nop_can_create (CoglContext *ctx,
int width,
int height,
@@ -60,7 +60,7 @@ _cogl_texture_2d_nop_init (CoglTexture2D *tex_2d)
{
}
-CoglBool
+gboolean
_cogl_texture_2d_nop_allocate (CoglTexture *tex,
CoglError **error)
{
@@ -106,7 +106,7 @@ _cogl_texture_2d_nop_generate_mipmap (CoglTexture2D *tex_2d)
{
}
-CoglBool
+gboolean
_cogl_texture_2d_nop_copy_from_bitmap (CoglTexture2D *tex_2d,
int src_x,
int src_y,
diff --git a/cogl/cogl/winsys/cogl-texture-pixmap-x11-private.h
b/cogl/cogl/winsys/cogl-texture-pixmap-x11-private.h
index 5da998f89..c1d6d9361 100644
--- a/cogl/cogl/winsys/cogl-texture-pixmap-x11-private.h
+++ b/cogl/cogl/winsys/cogl-texture-pixmap-x11-private.h
@@ -88,7 +88,7 @@ struct _CoglTexturePixmapX11
Damage damage;
CoglTexturePixmapX11ReportLevel damage_report_level;
- CoglBool damage_owned;
+ gboolean damage_owned;
CoglDamageRectangle damage_rect;
void *winsys;
@@ -96,7 +96,7 @@ struct _CoglTexturePixmapX11
/* During the pre_paint method, this will be set to TRUE if we
should use the winsys texture, otherwise we will use the regular
texture */
- CoglBool use_winsys_texture;
+ gboolean use_winsys_texture;
};
diff --git a/cogl/cogl/winsys/cogl-texture-pixmap-x11.c b/cogl/cogl/winsys/cogl-texture-pixmap-x11.c
index 74ed671a8..0d8346cc1 100644
--- a/cogl/cogl/winsys/cogl-texture-pixmap-x11.c
+++ b/cogl/cogl/winsys/cogl-texture-pixmap-x11.c
@@ -110,7 +110,7 @@ cogl_damage_rectangle_union (CoglDamageRectangle *damage_rect,
}
}
-static CoglBool
+static gboolean
cogl_damage_rectangle_is_whole (const CoglDamageRectangle *damage_rect,
unsigned int width,
unsigned int height)
@@ -285,7 +285,7 @@ set_damage_object_internal (CoglContext *ctx,
static CoglTexturePixmapX11 *
_cogl_texture_pixmap_x11_new (CoglContext *ctxt,
uint32_t pixmap,
- CoglBool automatic_updates,
+ gboolean automatic_updates,
CoglTexturePixmapStereoMode stereo_mode,
CoglError **error)
{
@@ -391,7 +391,7 @@ _cogl_texture_pixmap_x11_new (CoglContext *ctxt,
CoglTexturePixmapX11 *
cogl_texture_pixmap_x11_new (CoglContext *ctxt,
uint32_t pixmap,
- CoglBool automatic_updates,
+ gboolean automatic_updates,
CoglError **error)
{
@@ -403,7 +403,7 @@ cogl_texture_pixmap_x11_new (CoglContext *ctxt,
CoglTexturePixmapX11 *
cogl_texture_pixmap_x11_new_left (CoglContext *ctxt,
uint32_t pixmap,
- CoglBool automatic_updates,
+ gboolean automatic_updates,
CoglError **error)
{
return _cogl_texture_pixmap_x11_new (ctxt, pixmap,
@@ -441,7 +441,7 @@ cogl_texture_pixmap_x11_new_right (CoglTexturePixmapX11 *tfp_left)
return _cogl_texture_pixmap_x11_object_new (tfp_right);
}
-static CoglBool
+static gboolean
_cogl_texture_pixmap_x11_allocate (CoglTexture *tex,
CoglError **error)
{
@@ -546,7 +546,7 @@ cogl_texture_pixmap_x11_update_area (CoglTexturePixmapX11 *tex_pixmap,
x, y, width, height);
}
-CoglBool
+gboolean
cogl_texture_pixmap_x11_is_using_tfp_extension (CoglTexturePixmapX11 *tex_pixmap)
{
if (tex_pixmap->stereo_mode == COGL_TEXTURE_PIXMAP_RIGHT)
@@ -762,7 +762,7 @@ _cogl_texture_pixmap_x11_update_image_texture (CoglTexturePixmapX11 *tex_pixmap)
static void
_cogl_texture_pixmap_x11_set_use_winsys_texture (CoglTexturePixmapX11 *tex_pixmap,
- CoglBool new_value)
+ gboolean new_value)
{
if (tex_pixmap->use_winsys_texture != new_value)
{
@@ -777,7 +777,7 @@ _cogl_texture_pixmap_x11_set_use_winsys_texture (CoglTexturePixmapX11 *tex_pixma
static void
_cogl_texture_pixmap_x11_update (CoglTexturePixmapX11 *tex_pixmap,
- CoglBool needs_mipmap)
+ gboolean needs_mipmap)
{
CoglTexturePixmapStereoMode stereo_mode = tex_pixmap->stereo_mode;
if (stereo_mode == COGL_TEXTURE_PIXMAP_RIGHT)
@@ -844,7 +844,7 @@ _cogl_texture_pixmap_x11_get_texture (CoglTexturePixmapX11 *tex_pixmap)
return NULL;
}
-static CoglBool
+static gboolean
_cogl_texture_pixmap_x11_set_region (CoglTexture *tex,
int src_x,
int src_y,
@@ -865,7 +865,7 @@ _cogl_texture_pixmap_x11_set_region (CoglTexture *tex,
return FALSE;
}
-static CoglBool
+static gboolean
_cogl_texture_pixmap_x11_get_data (CoglTexture *tex,
CoglPixelFormat format,
int rowstride,
@@ -971,7 +971,7 @@ _cogl_texture_pixmap_x11_get_max_waste (CoglTexture *tex)
return cogl_texture_get_max_waste (child_tex);
}
-static CoglBool
+static gboolean
_cogl_texture_pixmap_x11_is_sliced (CoglTexture *tex)
{
CoglTexturePixmapX11 *tex_pixmap = COGL_TEXTURE_PIXMAP_X11 (tex);
@@ -980,7 +980,7 @@ _cogl_texture_pixmap_x11_is_sliced (CoglTexture *tex)
return cogl_texture_is_sliced (child_tex);
}
-static CoglBool
+static gboolean
_cogl_texture_pixmap_x11_can_hardware_repeat (CoglTexture *tex)
{
CoglTexturePixmapX11 *tex_pixmap = COGL_TEXTURE_PIXMAP_X11 (tex);
@@ -1012,7 +1012,7 @@ _cogl_texture_pixmap_x11_transform_quad_coords_to_gl (CoglTexture *tex,
return _cogl_texture_transform_quad_coords_to_gl (child_tex, coords);
}
-static CoglBool
+static gboolean
_cogl_texture_pixmap_x11_get_gl_texture (CoglTexture *tex,
GLuint *out_gl_handle,
GLenum *out_gl_target)
diff --git a/cogl/cogl/winsys/cogl-texture-pixmap-x11.h b/cogl/cogl/winsys/cogl-texture-pixmap-x11.h
index de0c99afb..0881c8bdd 100644
--- a/cogl/cogl/winsys/cogl-texture-pixmap-x11.h
+++ b/cogl/cogl/winsys/cogl-texture-pixmap-x11.h
@@ -128,7 +128,7 @@ uint32_t cogl_texture_pixmap_x11_error_quark (void);
CoglTexturePixmapX11 *
cogl_texture_pixmap_x11_new (CoglContext *context,
uint32_t pixmap,
- CoglBool automatic_updates,
+ gboolean automatic_updates,
CoglError **error);
/**
@@ -167,7 +167,7 @@ cogl_texture_pixmap_x11_new (CoglContext *context,
CoglTexturePixmapX11 *
cogl_texture_pixmap_x11_new_left (CoglContext *context,
uint32_t pixmap,
- CoglBool automatic_updates,
+ gboolean automatic_updates,
CoglError **error);
/**
@@ -225,7 +225,7 @@ cogl_texture_pixmap_x11_update_area (CoglTexturePixmapX11 *texture,
* Since: 1.4
* Stability: Unstable
*/
-CoglBool
+gboolean
cogl_texture_pixmap_x11_is_using_tfp_extension (CoglTexturePixmapX11 *texture);
/**
@@ -265,7 +265,7 @@ cogl_texture_pixmap_x11_set_damage_object (CoglTexturePixmapX11 *texture,
* Since: 1.4
* Stability: Unstable
*/
-CoglBool
+gboolean
cogl_is_texture_pixmap_x11 (void *object);
G_END_DECLS
diff --git a/cogl/cogl/winsys/cogl-winsys-egl-private.h b/cogl/cogl/winsys/cogl-winsys-egl-private.h
index d8adfc8d0..b98bffcf8 100644
--- a/cogl/cogl/winsys/cogl-winsys-egl-private.h
+++ b/cogl/cogl/winsys/cogl-winsys-egl-private.h
@@ -60,26 +60,26 @@ struct wl_resource;
typedef struct _CoglWinsysEGLVtable
{
- CoglBool
+ gboolean
(* display_setup) (CoglDisplay *display,
CoglError **error);
void
(* display_destroy) (CoglDisplay *display);
- CoglBool
+ gboolean
(* context_created) (CoglDisplay *display,
CoglError **error);
void
(* cleanup_context) (CoglDisplay *display);
- CoglBool
+ gboolean
(* context_init) (CoglContext *context, CoglError **error);
void
(* context_deinit) (CoglContext *context);
- CoglBool
+ gboolean
(* onscreen_init) (CoglOnscreen *onscreen,
EGLConfig config,
CoglError **error);
@@ -90,7 +90,7 @@ typedef struct _CoglWinsysEGLVtable
(* add_config_attributes) (CoglDisplay *display,
CoglFramebufferConfig *config,
EGLint *attributes);
- CoglBool
+ gboolean
(* choose_config) (CoglDisplay *display,
EGLint *attributes,
EGLConfig *out_config,
@@ -146,7 +146,7 @@ typedef struct _CoglDisplayEGL
EGLSurface egl_surface;
EGLConfig egl_config;
- CoglBool found_egl_config;
+ gboolean found_egl_config;
EGLSurface current_read_surface;
EGLSurface current_draw_surface;
@@ -166,7 +166,7 @@ typedef struct _CoglOnscreenEGL
{
EGLSurface egl_surface;
- CoglBool pending_resize_notify;
+ gboolean pending_resize_notify;
/* Platform specific data */
void *platform;
@@ -197,14 +197,14 @@ _cogl_egl_destroy_image (CoglContext *ctx,
#endif
#ifdef EGL_WL_bind_wayland_display
-CoglBool
+gboolean
_cogl_egl_query_wayland_buffer (CoglContext *ctx,
struct wl_resource *buffer,
int attribute,
int *value);
#endif
-CoglBool
+gboolean
_cogl_winsys_egl_renderer_connect_common (CoglRenderer *renderer,
CoglError **error);
diff --git a/cogl/cogl/winsys/cogl-winsys-egl-x11.c b/cogl/cogl/winsys/cogl-winsys-egl-x11.c
index 803ace524..4f0a12543 100644
--- a/cogl/cogl/winsys/cogl-winsys-egl-x11.c
+++ b/cogl/cogl/winsys/cogl-winsys-egl-x11.c
@@ -61,7 +61,7 @@ typedef struct _CoglDisplayXlib
typedef struct _CoglOnscreenXlib
{
Window xwin;
- CoglBool is_foreign_xwin;
+ gboolean is_foreign_xwin;
} CoglOnscreenXlib;
#ifdef EGL_KHR_image_pixmap
@@ -292,7 +292,7 @@ _cogl_winsys_egl_get_display (void *native)
return eglGetDisplay ((EGLNativeDisplayType) native);
}
-static CoglBool
+static gboolean
_cogl_winsys_renderer_connect (CoglRenderer *renderer,
CoglError **error)
{
@@ -333,7 +333,7 @@ _cogl_winsys_egl_add_config_attributes (CoglDisplay *display,
return i;
}
-static CoglBool
+static gboolean
_cogl_winsys_egl_choose_config (CoglDisplay *display,
EGLint *attributes,
EGLConfig *out_config,
@@ -359,7 +359,7 @@ _cogl_winsys_egl_choose_config (CoglDisplay *display,
return TRUE;
}
-static CoglBool
+static gboolean
_cogl_winsys_egl_display_setup (CoglDisplay *display,
CoglError **error)
{
@@ -380,7 +380,7 @@ _cogl_winsys_egl_display_destroy (CoglDisplay *display)
g_slice_free (CoglDisplayXlib, egl_display->platform);
}
-static CoglBool
+static gboolean
_cogl_winsys_egl_context_init (CoglContext *context,
CoglError **error)
{
@@ -412,7 +412,7 @@ _cogl_winsys_egl_context_deinit (CoglContext *context)
context);
}
-static CoglBool
+static gboolean
_cogl_winsys_egl_onscreen_init (CoglOnscreen *onscreen,
EGLConfig egl_config,
CoglError **error)
@@ -589,7 +589,7 @@ _cogl_winsys_egl_onscreen_deinit (CoglOnscreen *onscreen)
static void
_cogl_winsys_onscreen_set_visibility (CoglOnscreen *onscreen,
- CoglBool visibility)
+ gboolean visibility)
{
CoglContext *context = COGL_FRAMEBUFFER (onscreen)->context;
CoglRenderer *renderer = context->display->renderer;
@@ -606,7 +606,7 @@ _cogl_winsys_onscreen_set_visibility (CoglOnscreen *onscreen,
static void
_cogl_winsys_onscreen_set_resizable (CoglOnscreen *onscreen,
- CoglBool resizable)
+ gboolean resizable)
{
CoglFramebuffer *framebuffer = COGL_FRAMEBUFFER (onscreen);
CoglContext *context = framebuffer->context;
@@ -652,7 +652,7 @@ _cogl_winsys_onscreen_x11_get_window_xid (CoglOnscreen *onscreen)
return xlib_onscreen->xwin;
}
-static CoglBool
+static gboolean
_cogl_winsys_egl_context_created (CoglDisplay *display,
CoglError **error)
{
@@ -758,7 +758,7 @@ _cogl_winsys_egl_cleanup_context (CoglDisplay *display)
#ifdef EGL_KHR_image_pixmap
-static CoglBool
+static gboolean
_cogl_winsys_texture_pixmap_x11_create (CoglTexturePixmapX11 *tex_pixmap)
{
CoglTexture *tex = COGL_TEXTURE (tex_pixmap);
@@ -833,10 +833,10 @@ _cogl_winsys_texture_pixmap_x11_free (CoglTexturePixmapX11 *tex_pixmap)
g_free (egl_tex_pixmap);
}
-static CoglBool
+static gboolean
_cogl_winsys_texture_pixmap_x11_update (CoglTexturePixmapX11 *tex_pixmap,
CoglTexturePixmapStereoMode stereo_mode,
- CoglBool needs_mipmap)
+ gboolean needs_mipmap)
{
if (needs_mipmap)
return FALSE;
@@ -878,7 +878,7 @@ _cogl_winsys_egl_vtable =
const CoglWinsysVtable *
_cogl_winsys_egl_xlib_get_vtable (void)
{
- static CoglBool vtable_inited = FALSE;
+ static gboolean vtable_inited = FALSE;
static CoglWinsysVtable vtable;
if (!vtable_inited)
diff --git a/cogl/cogl/winsys/cogl-winsys-egl.c b/cogl/cogl/winsys/cogl-winsys-egl.c
index 8153f3579..903c6492d 100644
--- a/cogl/cogl/winsys/cogl-winsys-egl.c
+++ b/cogl/cogl/winsys/cogl-winsys-egl.c
@@ -142,7 +142,7 @@ get_error_string (void)
static GCallback
_cogl_winsys_renderer_get_proc_address (CoglRenderer *renderer,
const char *name,
- CoglBool in_core)
+ gboolean in_core)
{
void *ptr = NULL;
@@ -193,7 +193,7 @@ check_egl_extensions (CoglRenderer *renderer)
g_strfreev (split_extensions);
}
-CoglBool
+gboolean
_cogl_winsys_egl_renderer_connect_common (CoglRenderer *renderer,
CoglError **error)
{
@@ -214,7 +214,7 @@ _cogl_winsys_egl_renderer_connect_common (CoglRenderer *renderer,
return TRUE;
}
-static CoglBool
+static gboolean
_cogl_winsys_renderer_connect (CoglRenderer *renderer,
CoglError **error)
{
@@ -338,7 +338,7 @@ cleanup_context (CoglDisplay *display)
egl_renderer->platform_vtable->cleanup_context (display);
}
-static CoglBool
+static gboolean
try_create_context (CoglDisplay *display,
CoglError **error)
{
@@ -452,7 +452,7 @@ _cogl_winsys_display_destroy (CoglDisplay *display)
display->winsys = NULL;
}
-static CoglBool
+static gboolean
_cogl_winsys_display_setup (CoglDisplay *display,
CoglError **error)
{
@@ -493,7 +493,7 @@ error:
return FALSE;
}
-static CoglBool
+static gboolean
_cogl_winsys_context_init (CoglContext *context, CoglError **error)
{
CoglRenderer *renderer = context->display->renderer;
@@ -606,7 +606,7 @@ _cogl_winsys_destroy_gles2_context (CoglGLES2Context *gles2_ctx)
eglDestroyContext (egl_renderer->edpy, egl_context);
}
-static CoglBool
+static gboolean
_cogl_winsys_onscreen_init (CoglOnscreen *onscreen,
CoglError **error)
{
@@ -709,7 +709,7 @@ _cogl_winsys_onscreen_deinit (CoglOnscreen *onscreen)
onscreen->winsys = NULL;
}
-static CoglBool
+static gboolean
bind_onscreen_with_context (CoglOnscreen *onscreen,
EGLContext egl_context)
{
@@ -717,7 +717,7 @@ bind_onscreen_with_context (CoglOnscreen *onscreen,
CoglContext *context = fb->context;
CoglOnscreenEGL *egl_onscreen = onscreen->winsys;
- CoglBool status = _cogl_winsys_egl_make_current (context->display,
+ gboolean status = _cogl_winsys_egl_make_current (context->display,
egl_onscreen->egl_surface,
egl_onscreen->egl_surface,
egl_context);
@@ -732,7 +732,7 @@ bind_onscreen_with_context (CoglOnscreen *onscreen,
return status;
}
-static CoglBool
+static gboolean
bind_onscreen (CoglOnscreen *onscreen)
{
CoglFramebuffer *fb = COGL_FRAMEBUFFER (onscreen);
@@ -863,12 +863,12 @@ _cogl_winsys_save_context (CoglContext *ctx)
egl_context->saved_read_surface = egl_display->current_read_surface;
}
-static CoglBool
+static gboolean
_cogl_winsys_set_gles2_context (CoglGLES2Context *gles2_ctx, CoglError **error)
{
CoglContext *ctx = gles2_ctx->context;
CoglDisplayEGL *egl_display = ctx->display->winsys;
- CoglBool status;
+ gboolean status;
if (gles2_ctx->write_buffer &&
cogl_is_onscreen (gles2_ctx->write_buffer))
@@ -922,7 +922,7 @@ _cogl_winsys_fence_add (CoglContext *context)
return ret;
}
-static CoglBool
+static gboolean
_cogl_winsys_fence_is_complete (CoglContext *context, void *fence)
{
CoglRendererEGL *renderer = context->display->renderer->winsys;
@@ -1046,7 +1046,7 @@ _cogl_egl_destroy_image (CoglContext *ctx,
#endif
#ifdef EGL_WL_bind_wayland_display
-CoglBool
+gboolean
_cogl_egl_query_wayland_buffer (CoglContext *ctx,
struct wl_resource *buffer,
int attribute,
diff --git a/cogl/cogl/winsys/cogl-winsys-glx.c b/cogl/cogl/winsys/cogl-winsys-glx.c
index 012c712bd..2623d02c6 100644
--- a/cogl/cogl/winsys/cogl-winsys-glx.c
+++ b/cogl/cogl/winsys/cogl-winsys-glx.c
@@ -90,7 +90,7 @@ typedef struct _CoglOnscreenXlib
{
Window xwin;
int x, y;
- CoglBool is_foreign_xwin;
+ gboolean is_foreign_xwin;
CoglOutput *output;
} CoglOnscreenXlib;
@@ -99,9 +99,9 @@ typedef struct _CoglOnscreenGLX
CoglOnscreenXlib _parent;
GLXDrawable glxwin;
uint32_t last_swap_vsync_counter;
- CoglBool pending_sync_notify;
- CoglBool pending_complete_notify;
- CoglBool pending_resize_notify;
+ gboolean pending_sync_notify;
+ gboolean pending_complete_notify;
+ gboolean pending_resize_notify;
GThread *swap_wait_thread;
GQueue *swap_wait_queue;
@@ -109,21 +109,21 @@ typedef struct _CoglOnscreenGLX
GMutex swap_wait_mutex;
int swap_wait_pipe[2];
GLXContext swap_wait_context;
- CoglBool closing_down;
+ gboolean closing_down;
} CoglOnscreenGLX;
typedef struct _CoglPixmapTextureEyeGLX
{
CoglTexture *glx_tex;
- CoglBool bind_tex_image_queued;
- CoglBool pixmap_bound;
+ gboolean bind_tex_image_queued;
+ gboolean pixmap_bound;
} CoglPixmapTextureEyeGLX;
typedef struct _CoglTexturePixmapGLX
{
GLXPixmap glx_pixmap;
- CoglBool has_mipmap_space;
- CoglBool can_mipmap;
+ gboolean has_mipmap_space;
+ gboolean can_mipmap;
CoglPixmapTextureEyeGLX left;
CoglPixmapTextureEyeGLX right;
@@ -169,7 +169,7 @@ static const CoglFeatureData winsys_feature_data[] =
static GCallback
_cogl_winsys_renderer_get_proc_address (CoglRenderer *renderer,
const char *name,
- CoglBool in_core)
+ gboolean in_core)
{
CoglGLXRenderer *glx_renderer = renderer->winsys;
@@ -347,8 +347,8 @@ flush_pending_notifications_cb (void *data,
{
CoglOnscreen *onscreen = COGL_ONSCREEN (framebuffer);
CoglOnscreenGLX *glx_onscreen = onscreen->winsys;
- CoglBool pending_sync_notify = glx_onscreen->pending_sync_notify;
- CoglBool pending_complete_notify = glx_onscreen->pending_complete_notify;
+ gboolean pending_sync_notify = glx_onscreen->pending_sync_notify;
+ gboolean pending_complete_notify = glx_onscreen->pending_complete_notify;
/* If swap_region is called then notifying the sync event could
* potentially immediately queue a subsequent pending notify so
@@ -627,7 +627,7 @@ _cogl_winsys_renderer_disconnect (CoglRenderer *renderer)
g_slice_free (CoglGLXRenderer, renderer->winsys);
}
-static CoglBool
+static gboolean
update_all_outputs (CoglRenderer *renderer)
{
GList *l;
@@ -659,7 +659,7 @@ _cogl_winsys_renderer_outputs_changed (CoglRenderer *renderer)
update_all_outputs (renderer);
}
-static CoglBool
+static gboolean
resolve_core_glx_functions (CoglRenderer *renderer,
CoglError **error)
{
@@ -752,7 +752,7 @@ update_base_winsys_features (CoglRenderer *renderer)
TRUE);
}
-static CoglBool
+static gboolean
_cogl_winsys_renderer_connect (CoglRenderer *renderer,
CoglError **error)
{
@@ -825,7 +825,7 @@ error:
return FALSE;
}
-static CoglBool
+static gboolean
update_winsys_features (CoglContext *context, CoglError **error)
{
CoglGLXDisplay *glx_display = context->display->winsys;
@@ -983,7 +983,7 @@ glx_attributes_from_framebuffer_config (CoglDisplay *display,
/* It seems the GLX spec never defined an invalid GLXFBConfig that
* we could overload as an indication of error, so we have to return
* an explicit boolean status. */
-static CoglBool
+static gboolean
find_fbconfig (CoglDisplay *display,
CoglFramebufferConfig *config,
GLXFBConfig *config_ret,
@@ -995,7 +995,7 @@ find_fbconfig (CoglDisplay *display,
GLXFBConfig *configs = NULL;
int n_configs;
static int attributes[MAX_GLX_CONFIG_ATTRIBS];
- CoglBool ret = TRUE;
+ gboolean ret = TRUE;
int xscreen_num = DefaultScreen (xlib_renderer->xdpy);
glx_attributes_from_framebuffer_config (display, config, attributes);
@@ -1122,14 +1122,14 @@ create_gl3_context (CoglDisplay *display,
attrib_list);
}
-static CoglBool
+static gboolean
create_context (CoglDisplay *display, CoglError **error)
{
CoglGLXDisplay *glx_display = display->winsys;
CoglXlibRenderer *xlib_renderer =
_cogl_xlib_renderer_get_data (display->renderer);
CoglGLXRenderer *glx_renderer = display->renderer->winsys;
- CoglBool support_transparent_windows =
+ gboolean support_transparent_windows =
display->onscreen_template->config.swap_chain->has_alpha;
GLXFBConfig config;
CoglError *fbconfig_error = NULL;
@@ -1297,7 +1297,7 @@ _cogl_winsys_display_destroy (CoglDisplay *display)
display->winsys = NULL;
}
-static CoglBool
+static gboolean
_cogl_winsys_display_setup (CoglDisplay *display,
CoglError **error)
{
@@ -1322,7 +1322,7 @@ error:
return FALSE;
}
-static CoglBool
+static gboolean
_cogl_winsys_context_init (CoglContext *context, CoglError **error)
{
context->winsys = g_new0 (CoglContextGLX, 1);
@@ -1342,7 +1342,7 @@ _cogl_winsys_context_deinit (CoglContext *context)
g_free (context->winsys);
}
-static CoglBool
+static gboolean
_cogl_winsys_onscreen_init (CoglOnscreen *onscreen,
CoglError **error)
{
@@ -2019,8 +2019,8 @@ _cogl_winsys_onscreen_swap_region (CoglOnscreen *onscreen,
GLXDrawable drawable =
glx_onscreen->glxwin ? glx_onscreen->glxwin : xlib_onscreen->xwin;
uint32_t end_frame_vsync_counter = 0;
- CoglBool have_counter;
- CoglBool can_wait;
+ gboolean have_counter;
+ gboolean can_wait;
int x_min = 0, x_max = 0, y_min = 0, y_max = 0;
/*
@@ -2029,7 +2029,7 @@ _cogl_winsys_onscreen_swap_region (CoglOnscreen *onscreen,
* case then we still want to use the vblank sync menchanism but
* we only need it to throttle redraws.
*/
- CoglBool blit_sub_buffer_is_synchronized =
+ gboolean blit_sub_buffer_is_synchronized =
_cogl_winsys_has_feature (COGL_WINSYS_FEATURE_SWAP_REGION_SYNCHRONIZED);
int framebuffer_width = cogl_framebuffer_get_width (framebuffer);
@@ -2223,7 +2223,7 @@ _cogl_winsys_onscreen_swap_buffers_with_damage (CoglOnscreen *onscreen,
CoglGLXDisplay *glx_display = context->display->winsys;
CoglOnscreenXlib *xlib_onscreen = onscreen->winsys;
CoglOnscreenGLX *glx_onscreen = onscreen->winsys;
- CoglBool have_counter;
+ gboolean have_counter;
GLXDrawable drawable;
/* XXX: theoretically this shouldn't be necessary but at least with
@@ -2259,7 +2259,7 @@ _cogl_winsys_onscreen_swap_buffers_with_damage (CoglOnscreen *onscreen,
}
else
{
- CoglBool can_wait = have_counter || glx_display->can_vblank_wait;
+ gboolean can_wait = have_counter || glx_display->can_vblank_wait;
uint32_t end_frame_vsync_counter = 0;
@@ -2315,7 +2315,7 @@ _cogl_winsys_onscreen_x11_get_window_xid (CoglOnscreen *onscreen)
static void
_cogl_winsys_onscreen_set_visibility (CoglOnscreen *onscreen,
- CoglBool visibility)
+ gboolean visibility)
{
CoglContext *context = COGL_FRAMEBUFFER (onscreen)->context;
CoglXlibRenderer *xlib_renderer =
@@ -2330,7 +2330,7 @@ _cogl_winsys_onscreen_set_visibility (CoglOnscreen *onscreen,
static void
_cogl_winsys_onscreen_set_resizable (CoglOnscreen *onscreen,
- CoglBool resizable)
+ gboolean resizable)
{
CoglFramebuffer *framebuffer = COGL_FRAMEBUFFER (onscreen);
CoglContext *context = framebuffer->context;
@@ -2366,12 +2366,12 @@ _cogl_winsys_onscreen_set_resizable (CoglOnscreen *onscreen,
XFree (size_hints);
}
-static CoglBool
+static gboolean
get_fbconfig_for_depth (CoglContext *context,
unsigned int depth,
- CoglBool stereo,
+ gboolean stereo,
GLXFBConfig *fbconfig_ret,
- CoglBool *can_mipmap_ret)
+ gboolean *can_mipmap_ret)
{
CoglXlibRenderer *xlib_renderer;
CoglGLXRenderer *glx_renderer;
@@ -2381,7 +2381,7 @@ get_fbconfig_for_depth (CoglContext *context,
int n_elements, i;
int db, stencil, alpha, mipmap, rgba, value;
int spare_cache_slot = 0;
- CoglBool found = FALSE;
+ gboolean found = FALSE;
xlib_renderer = _cogl_xlib_renderer_get_data (context->display->renderer);
glx_renderer = context->display->renderer->winsys;
@@ -2525,7 +2525,7 @@ get_fbconfig_for_depth (CoglContext *context,
return found;
}
-static CoglBool
+static gboolean
should_use_rectangle (CoglContext *context)
{
@@ -2573,10 +2573,10 @@ should_use_rectangle (CoglContext *context)
return context->rectangle_state == COGL_WINSYS_RECTANGLE_STATE_ENABLE;
}
-static CoglBool
+static gboolean
try_create_glx_pixmap (CoglContext *context,
CoglTexturePixmapX11 *tex_pixmap,
- CoglBool mipmap)
+ gboolean mipmap)
{
CoglTexturePixmapGLX *glx_tex_pixmap = tex_pixmap->winsys;
CoglRenderer *renderer;
@@ -2673,7 +2673,7 @@ try_create_glx_pixmap (CoglContext *context,
return TRUE;
}
-static CoglBool
+static gboolean
_cogl_winsys_texture_pixmap_x11_create (CoglTexturePixmapX11 *tex_pixmap)
{
CoglTexturePixmapGLX *glx_tex_pixmap;
@@ -2782,10 +2782,10 @@ _cogl_winsys_texture_pixmap_x11_free (CoglTexturePixmapX11 *tex_pixmap)
g_free (glx_tex_pixmap);
}
-static CoglBool
+static gboolean
_cogl_winsys_texture_pixmap_x11_update (CoglTexturePixmapX11 *tex_pixmap,
CoglTexturePixmapStereoMode stereo_mode,
- CoglBool needs_mipmap)
+ gboolean needs_mipmap)
{
CoglTexture *tex = COGL_TEXTURE (tex_pixmap);
CoglContext *ctx = COGL_TEXTURE (tex_pixmap)->context;
diff --git a/cogl/cogl/winsys/cogl-winsys-private.h b/cogl/cogl/winsys/cogl-winsys-private.h
index 38626dd2b..46e4df347 100644
--- a/cogl/cogl/winsys/cogl-winsys-private.h
+++ b/cogl/cogl/winsys/cogl-winsys-private.h
@@ -82,9 +82,9 @@ typedef struct _CoglWinsysVtable
GCallback
(*renderer_get_proc_address) (CoglRenderer *renderer,
const char *name,
- CoglBool in_core);
+ gboolean in_core);
- CoglBool
+ gboolean
(*renderer_connect) (CoglRenderer *renderer, CoglError **error);
void
@@ -93,13 +93,13 @@ typedef struct _CoglWinsysVtable
void
(*renderer_outputs_changed) (CoglRenderer *renderer);
- CoglBool
+ gboolean
(*display_setup) (CoglDisplay *display, CoglError **error);
void
(*display_destroy) (CoglDisplay *display);
- CoglBool
+ gboolean
(*context_init) (CoglContext *context, CoglError **error);
void
@@ -108,7 +108,7 @@ typedef struct _CoglWinsysVtable
void *
(*context_create_gles2_context) (CoglContext *ctx, CoglError **error);
- CoglBool
+ gboolean
(*onscreen_init) (CoglOnscreen *onscreen, CoglError **error);
void
@@ -124,7 +124,7 @@ typedef struct _CoglWinsysVtable
void
(*onscreen_set_visibility) (CoglOnscreen *onscreen,
- CoglBool visibility);
+ gboolean visibility);
/* Optional functions */
@@ -137,7 +137,7 @@ typedef struct _CoglWinsysVtable
int n_rectangles);
void
- (*onscreen_set_resizable) (CoglOnscreen *onscreen, CoglBool resizable);
+ (*onscreen_set_resizable) (CoglOnscreen *onscreen, gboolean resizable);
int
(*onscreen_get_buffer_age) (CoglOnscreen *onscreen);
@@ -146,15 +146,15 @@ typedef struct _CoglWinsysVtable
(*onscreen_x11_get_window_xid) (CoglOnscreen *onscreen);
#ifdef COGL_HAS_XLIB_SUPPORT
- CoglBool
+ gboolean
(*texture_pixmap_x11_create) (CoglTexturePixmapX11 *tex_pixmap);
void
(*texture_pixmap_x11_free) (CoglTexturePixmapX11 *tex_pixmap);
- CoglBool
+ gboolean
(*texture_pixmap_x11_update) (CoglTexturePixmapX11 *tex_pixmap,
CoglTexturePixmapStereoMode stereo_mode,
- CoglBool needs_mipmap);
+ gboolean needs_mipmap);
void
(*texture_pixmap_x11_damage_notify) (CoglTexturePixmapX11 *tex_pixmap);
@@ -167,7 +167,7 @@ typedef struct _CoglWinsysVtable
void
(*save_context) (CoglContext *ctx);
- CoglBool
+ gboolean
(*set_gles2_context) (CoglGLES2Context *gles2_ctx, CoglError **error);
void
@@ -179,7 +179,7 @@ typedef struct _CoglWinsysVtable
void *
(*fence_add) (CoglContext *ctx);
- CoglBool
+ gboolean
(*fence_is_complete) (CoglContext *ctx, void *fence);
void
@@ -189,7 +189,7 @@ typedef struct _CoglWinsysVtable
typedef const CoglWinsysVtable *(*CoglWinsysVtableGetter) (void);
-CoglBool
+gboolean
_cogl_winsys_has_feature (CoglWinsysFeature feature);
#endif /* __COGL_WINSYS_PRIVATE_H */
diff --git a/cogl/cogl/winsys/cogl-winsys-stub.c b/cogl/cogl/winsys/cogl-winsys-stub.c
index 1349d9687..6edebadcd 100644
--- a/cogl/cogl/winsys/cogl-winsys-stub.c
+++ b/cogl/cogl/winsys/cogl-winsys-stub.c
@@ -52,7 +52,7 @@ static int _cogl_winsys_stub_dummy_ptr;
static GCallback
_cogl_winsys_renderer_get_proc_address (CoglRenderer *renderer,
const char *name,
- CoglBool in_core)
+ gboolean in_core)
{
static GModule *module = NULL;
@@ -78,7 +78,7 @@ _cogl_winsys_renderer_disconnect (CoglRenderer *renderer)
renderer->winsys = NULL;
}
-static CoglBool
+static gboolean
_cogl_winsys_renderer_connect (CoglRenderer *renderer,
CoglError **error)
{
@@ -92,7 +92,7 @@ _cogl_winsys_display_destroy (CoglDisplay *display)
display->winsys = NULL;
}
-static CoglBool
+static gboolean
_cogl_winsys_display_setup (CoglDisplay *display,
CoglError **error)
{
@@ -100,7 +100,7 @@ _cogl_winsys_display_setup (CoglDisplay *display,
return TRUE;
}
-static CoglBool
+static gboolean
_cogl_winsys_context_init (CoglContext *context, CoglError **error)
{
context->winsys = &_cogl_winsys_stub_dummy_ptr;
@@ -119,7 +119,7 @@ _cogl_winsys_context_deinit (CoglContext *context)
context->winsys = NULL;
}
-static CoglBool
+static gboolean
_cogl_winsys_onscreen_init (CoglOnscreen *onscreen,
CoglError **error)
{
@@ -145,14 +145,14 @@ _cogl_winsys_onscreen_swap_buffers_with_damage (CoglOnscreen *onscreen,
static void
_cogl_winsys_onscreen_set_visibility (CoglOnscreen *onscreen,
- CoglBool visibility)
+ gboolean visibility)
{
}
const CoglWinsysVtable *
_cogl_winsys_stub_get_vtable (void)
{
- static CoglBool vtable_inited = FALSE;
+ static gboolean vtable_inited = FALSE;
static CoglWinsysVtable vtable;
/* It would be nice if we could use C99 struct initializers here
diff --git a/cogl/cogl/winsys/cogl-winsys.c b/cogl/cogl/winsys/cogl-winsys.c
index d76c6e3fa..9eacd81c0 100644
--- a/cogl/cogl/winsys/cogl-winsys.c
+++ b/cogl/cogl/winsys/cogl-winsys.c
@@ -41,7 +41,7 @@ _cogl_winsys_error_quark (void)
}
/* FIXME: we should distinguish renderer and context features */
-CoglBool
+gboolean
_cogl_winsys_has_feature (CoglWinsysFeature feature)
{
_COGL_GET_CONTEXT (ctx, FALSE);
diff --git a/cogl/test-fixtures/test-utils.c b/cogl/test-fixtures/test-utils.c
index 02494be42..c1dd44f54 100644
--- a/cogl/test-fixtures/test-utils.c
+++ b/cogl/test-fixtures/test-utils.c
@@ -8,12 +8,12 @@
#define FB_WIDTH 512
#define FB_HEIGHT 512
-static CoglBool cogl_test_is_verbose;
+static gboolean cogl_test_is_verbose;
CoglContext *test_ctx;
CoglFramebuffer *test_fb;
-static CoglBool
+static gboolean
check_flags (TestFlags flags,
CoglRenderer *renderer)
{
@@ -98,11 +98,11 @@ check_flags (TestFlags flags,
return TRUE;
}
-static CoglBool
+static gboolean
is_boolean_env_set (const char *variable)
{
char *val = getenv (variable);
- CoglBool ret;
+ gboolean ret;
if (!val)
return FALSE;
@@ -134,8 +134,8 @@ test_utils_init (TestFlags requirement_flags,
CoglOnscreen *onscreen = NULL;
CoglDisplay *display;
CoglRenderer *renderer;
- CoglBool missing_requirement;
- CoglBool known_failure;
+ gboolean missing_requirement;
+ gboolean known_failure;
if (counter != 0)
g_critical ("We don't support running more than one test at a time\n"
@@ -216,7 +216,7 @@ test_utils_fini (void)
cogl_object_unref (test_ctx);
}
-static CoglBool
+static gboolean
compare_component (int a, int b)
{
return ABS (a - b) <= 1;
@@ -347,7 +347,7 @@ test_utils_create_color_texture (CoglContext *context,
return COGL_TEXTURE (tex_2d);
}
-CoglBool
+gboolean
cogl_test_verbose (void)
{
return cogl_test_is_verbose;
@@ -430,7 +430,7 @@ test_utils_texture_new_with_size (CoglContext *ctx,
CoglTexture *
test_utils_texture_new_from_bitmap (CoglBitmap *bitmap,
TestUtilsTextureFlags flags,
- CoglBool premultiplied)
+ gboolean premultiplied)
{
CoglAtlasTexture *atlas_tex;
CoglTexture *tex;
diff --git a/cogl/test-fixtures/test-utils.h b/cogl/test-fixtures/test-utils.h
index 9c3ced9b3..eace0f6d5 100644
--- a/cogl/test-fixtures/test-utils.h
+++ b/cogl/test-fixtures/test-utils.h
@@ -152,7 +152,7 @@ test_utils_texture_new_from_data (CoglContext *ctx,
CoglTexture *
test_utils_texture_new_from_bitmap (CoglBitmap *bitmap,
TestUtilsTextureFlags flags,
- CoglBool premultiplied);
+ gboolean premultiplied);
/*
* test_utils_check_pixel:
@@ -269,7 +269,7 @@ test_utils_create_color_texture (CoglContext *context,
*
* Queries if the user asked for verbose output or not.
*/
-CoglBool
+gboolean
cogl_test_verbose (void);
/* test_util_is_pot:
@@ -277,7 +277,7 @@ cogl_test_verbose (void);
*
* Returns whether the given integer is a power of two
*/
-static inline CoglBool
+static inline gboolean
test_utils_is_pot (unsigned int number)
{
/* Make sure there is only one bit set */
diff --git a/cogl/tests/conform/test-backface-culling.c b/cogl/tests/conform/test-backface-culling.c
index 7a357627f..bbf9e3643 100644
--- a/cogl/tests/conform/test-backface-culling.c
+++ b/cogl/tests/conform/test-backface-culling.c
@@ -28,7 +28,7 @@ typedef struct _TestState
static void
validate_part (CoglFramebuffer *framebuffer,
- int xnum, int ynum, CoglBool shown)
+ int xnum, int ynum, gboolean shown)
{
test_utils_check_region (framebuffer,
xnum * TEXTURE_RENDER_SIZE + TEST_INSET,
@@ -165,7 +165,7 @@ validate_result (CoglFramebuffer *framebuffer, int y_offset)
for (draw_num = 0; draw_num < 16; draw_num++)
{
- CoglBool cull_front, cull_back;
+ gboolean cull_front, cull_back;
CoglPipelineCullFaceMode cull_mode;
if (USE_LEGACY_STATE (draw_num))
@@ -198,7 +198,7 @@ validate_result (CoglFramebuffer *framebuffer, int y_offset)
if (FRONT_WINDING (draw_num) == COGL_WINDING_CLOCKWISE)
{
- CoglBool tmp = cull_front;
+ gboolean tmp = cull_front;
cull_front = cull_back;
cull_back = tmp;
}
diff --git a/cogl/tests/conform/test-blend-strings.c b/cogl/tests/conform/test-blend-strings.c
index 6a50ad5fe..08537fcaf 100644
--- a/cogl/tests/conform/test-blend-strings.c
+++ b/cogl/tests/conform/test-blend-strings.c
@@ -55,7 +55,7 @@ test_blend_paint (TestState *state,
CoglHandle material;
CoglPipeline *pipeline;
- CoglBool status;
+ gboolean status;
CoglError *error = NULL;
int y_off;
int x_off;
@@ -230,7 +230,7 @@ test_tex_combine (TestState *state,
CoglColor combine_const_color;
CoglHandle material;
- CoglBool status;
+ gboolean status;
CoglError *error = NULL;
int y_off;
int x_off;
diff --git a/cogl/tests/conform/test-depth-test.c b/cogl/tests/conform/test-depth-test.c
index aacedf5fe..c0ed79b57 100644
--- a/cogl/tests/conform/test-depth-test.c
+++ b/cogl/tests/conform/test-depth-test.c
@@ -28,20 +28,20 @@ typedef struct
{
uint32_t color;
float depth;
- CoglBool test_enable;
+ gboolean test_enable;
CoglDepthTestFunction test_function;
- CoglBool write_enable;
- CoglBool fb_write_enable;
+ gboolean write_enable;
+ gboolean fb_write_enable;
float range_near;
float range_far;
} TestDepthState;
-static CoglBool
+static gboolean
draw_rectangle (TestState *state,
int x,
int y,
TestDepthState *rect_state,
- CoglBool legacy_mode)
+ gboolean legacy_mode)
{
uint8_t Cr = MASK_RED (rect_state->color);
uint8_t Cg = MASK_GREEN (rect_state->color);
@@ -107,10 +107,10 @@ test_depth (TestState *state,
TestDepthState *rect0_state,
TestDepthState *rect1_state,
TestDepthState *rect2_state,
- CoglBool legacy_mode,
+ gboolean legacy_mode,
uint32_t expected_result)
{
- CoglBool missing_feature = FALSE;
+ gboolean missing_feature = FALSE;
if (rect0_state)
missing_feature |= !draw_rectangle (state, x, y, rect0_state, legacy_mode);
diff --git a/cogl/tests/conform/test-materials.c b/cogl/tests/conform/test-materials.c
index e260683cb..e058b098a 100644
--- a/cogl/tests/conform/test-materials.c
+++ b/cogl/tests/conform/test-materials.c
@@ -209,7 +209,7 @@ on_paint (ClutterActor *actor, TestState *state)
#endif
}
-static CoglBool
+static gboolean
queue_redraw (void *stage)
{
clutter_actor_queue_redraw (CLUTTER_ACTOR (stage));
diff --git a/cogl/tests/conform/test-multitexture.c b/cogl/tests/conform/test-multitexture.c
index da38766aa..b7abb6e48 100644
--- a/cogl/tests/conform/test-multitexture.c
+++ b/cogl/tests/conform/test-multitexture.c
@@ -103,7 +103,7 @@ on_paint (ClutterActor *actor, TestState *state)
{
CoglHandle tex0, tex1;
CoglHandle material;
- CoglBool status;
+ gboolean status;
CoglError *error = NULL;
float tex_coords[] = {
0, 0, 0.5, 0.5, /* tex0 */
@@ -164,7 +164,7 @@ on_paint (ClutterActor *actor, TestState *state)
#endif
}
-static CoglBool
+static gboolean
queue_redraw (void *stage)
{
clutter_actor_queue_redraw (CLUTTER_ACTOR (stage));
diff --git a/cogl/tests/conform/test-point-size-attribute.c b/cogl/tests/conform/test-point-size-attribute.c
index 5bc605142..b5aeec69b 100644
--- a/cogl/tests/conform/test-point-size-attribute.c
+++ b/cogl/tests/conform/test-point-size-attribute.c
@@ -44,7 +44,7 @@ verify_point_size (CoglFramebuffer *test_fb,
for (y = 0; y < 4; y++)
for (x = 0; x < 4; x++)
{
- CoglBool in_point = x >= 1 && x <= 2 && y >= 1 && y <= 2;
+ gboolean in_point = x >= 1 && x <= 2 && y >= 1 && y <= 2;
uint32_t expected_pixel = in_point ? 0x00ff00ff : 0xff0000ff;
test_utils_check_pixel (test_fb,
diff --git a/cogl/tests/conform/test-point-size.c b/cogl/tests/conform/test-point-size.c
index c25840e9a..92148a0e6 100644
--- a/cogl/tests/conform/test-point-size.c
+++ b/cogl/tests/conform/test-point-size.c
@@ -36,7 +36,7 @@ verify_point_size (CoglFramebuffer *test_fb,
for (y = 0; y < 4; y++)
for (x = 0; x < 4; x++)
{
- CoglBool in_point = x >= 1 && x <= 2 && y >= 1 && y <= 2;
+ gboolean in_point = x >= 1 && x <= 2 && y >= 1 && y <= 2;
uint32_t expected_pixel = in_point ? 0x00ff00ff : 0xff0000ff;
test_utils_check_pixel (test_fb,
diff --git a/cogl/tests/conform/test-point-sprite.c b/cogl/tests/conform/test-point-sprite.c
index 5355c7569..bbf6a21bb 100644
--- a/cogl/tests/conform/test-point-sprite.c
+++ b/cogl/tests/conform/test-point-sprite.c
@@ -20,8 +20,8 @@ tex_data[3 * 2 * 2] =
};
static void
-do_test (CoglBool check_orientation,
- CoglBool use_glsl)
+do_test (gboolean check_orientation,
+ gboolean use_glsl)
{
int fb_width = cogl_framebuffer_get_width (test_fb);
int fb_height = cogl_framebuffer_get_height (test_fb);
@@ -92,7 +92,7 @@ do_test (CoglBool check_orientation,
}
else
{
- CoglBool res =
+ gboolean res =
cogl_pipeline_set_layer_point_sprite_coords_enabled (pipeline,
/* layer_index */
0,
diff --git a/cogl/tests/conform/test-primitive.c b/cogl/tests/conform/test-primitive.c
index 8d738a03a..d013da310 100644
--- a/cogl/tests/conform/test-primitive.c
+++ b/cogl/tests/conform/test-primitive.c
@@ -206,7 +206,7 @@ test_paint (TestState *state)
cogl_object_unref (pipeline);
}
-static CoglBool
+static gboolean
get_attributes_cb (CoglPrimitive *prim,
CoglAttribute *attrib,
void *user_data)
diff --git a/cogl/tests/conform/test-readpixels.c b/cogl/tests/conform/test-readpixels.c
index 131b08b23..a24f3f8f0 100644
--- a/cogl/tests/conform/test-readpixels.c
+++ b/cogl/tests/conform/test-readpixels.c
@@ -138,7 +138,7 @@ on_paint (ClutterActor *actor, void *state)
clutter_main_quit ();
}
-static CoglBool
+static gboolean
queue_redraw (void *stage)
{
clutter_actor_queue_redraw (CLUTTER_ACTOR (stage));
diff --git a/cogl/tests/conform/test-texture-mipmaps.c b/cogl/tests/conform/test-texture-mipmaps.c
index 3118ba86d..20978d478 100644
--- a/cogl/tests/conform/test-texture-mipmaps.c
+++ b/cogl/tests/conform/test-texture-mipmaps.c
@@ -94,7 +94,7 @@ on_paint (ClutterActor *actor, TestState *state)
#endif
}
-static CoglBool
+static gboolean
queue_redraw (void *stage)
{
clutter_actor_queue_redraw (CLUTTER_ACTOR (stage));
diff --git a/cogl/tests/conform/test-texture-pixmap-x11.c b/cogl/tests/conform/test-texture-pixmap-x11.c
index 4e8d55059..b983a5528 100644
--- a/cogl/tests/conform/test-texture-pixmap-x11.c
+++ b/cogl/tests/conform/test-texture-pixmap-x11.c
@@ -83,7 +83,7 @@ update_pixmap (TestState *state)
XFreeGC (state->display, black_gc);
}
-static CoglBool
+static gboolean
check_paint (TestState *state, int x, int y, int scale)
{
uint8_t *data, *p, update_value = 0;
@@ -167,7 +167,7 @@ on_paint (ClutterActor *actor, TestState *state)
if (state->frame_count >= 5)
{
- CoglBool big_updated, small_updated;
+ gboolean big_updated, small_updated;
big_updated = check_paint (state, 0, 0, 1);
small_updated = check_paint (state, 0, PIXMAP_HEIGHT, 4);
@@ -187,7 +187,7 @@ on_paint (ClutterActor *actor, TestState *state)
state->frame_count++;
}
-static CoglBool
+static gboolean
queue_redraw (void *stage)
{
clutter_actor_queue_redraw (CLUTTER_ACTOR (stage));
diff --git a/cogl/tests/conform/test-texture-rectangle.c b/cogl/tests/conform/test-texture-rectangle.c
index 3784cdcfe..4d968bb1e 100644
--- a/cogl/tests/conform/test-texture-rectangle.c
+++ b/cogl/tests/conform/test-texture-rectangle.c
@@ -202,7 +202,7 @@ on_paint (ClutterActor *actor, TestState *state)
validate_result (state);
}
-static CoglBool
+static gboolean
queue_redraw (void *stage)
{
clutter_actor_queue_redraw (CLUTTER_ACTOR (stage));
@@ -210,7 +210,7 @@ queue_redraw (void *stage)
return TRUE;
}
-static CoglBool
+static gboolean
check_rectangle_extension (void)
{
static const char rect_extension[] = "GL_ARB_texture_rectangle";
diff --git a/cogl/tests/conform/test-vertex-buffer-contiguous.c
b/cogl/tests/conform/test-vertex-buffer-contiguous.c
index 1cd7b456b..12f440338 100644
--- a/cogl/tests/conform/test-vertex-buffer-contiguous.c
+++ b/cogl/tests/conform/test-vertex-buffer-contiguous.c
@@ -141,7 +141,7 @@ on_paint (ClutterActor *actor, TestState *state)
validate_result (state);
}
-static CoglBool
+static gboolean
queue_redraw (gpointer stage)
{
clutter_actor_queue_redraw (CLUTTER_ACTOR (stage));
diff --git a/cogl/tests/conform/test-vertex-buffer-interleved.c
b/cogl/tests/conform/test-vertex-buffer-interleved.c
index 2d31e364a..0cefb1c7a 100644
--- a/cogl/tests/conform/test-vertex-buffer-interleved.c
+++ b/cogl/tests/conform/test-vertex-buffer-interleved.c
@@ -74,7 +74,7 @@ on_paint (ClutterActor *actor, TestState *state)
validate_result (state);
}
-static CoglBool
+static gboolean
queue_redraw (gpointer stage)
{
clutter_actor_queue_redraw (CLUTTER_ACTOR (stage));
diff --git a/cogl/tests/conform/test-vertex-buffer-mutability.c
b/cogl/tests/conform/test-vertex-buffer-mutability.c
index 9c8d5da8c..d742eb643 100644
--- a/cogl/tests/conform/test-vertex-buffer-mutability.c
+++ b/cogl/tests/conform/test-vertex-buffer-mutability.c
@@ -117,7 +117,7 @@ on_paint (ClutterActor *actor, TestState *state)
validate_result (state);
}
-static CoglBool
+static gboolean
queue_redraw (gpointer stage)
{
clutter_actor_queue_redraw (CLUTTER_ACTOR (stage));
diff --git a/cogl/tests/conform/test-viewport.c b/cogl/tests/conform/test-viewport.c
index a1937c42a..3127510a8 100644
--- a/cogl/tests/conform/test-viewport.c
+++ b/cogl/tests/conform/test-viewport.c
@@ -376,7 +376,7 @@ on_paint (ClutterActor *actor, void *state)
clutter_main_quit ();
}
-static CoglBool
+static gboolean
queue_redraw (void *stage)
{
clutter_actor_queue_redraw (CLUTTER_ACTOR (stage));
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
