summaryrefslogtreecommitdiff
path: root/cogl/cogl-atlas-texture.c
diff options
context:
space:
mode:
authorRobert Bragg <robert@linux.intel.com>2012-04-16 21:56:40 +0100
committerRobert Bragg <robert@linux.intel.com>2012-08-06 14:27:39 +0100
commit54735dec849a0f687d71288f458ab1050b7dd806 (patch)
tree2a856c2b482f121d25b6d9393ae81b79a64b669e /cogl/cogl-atlas-texture.c
parent09642a83b5f036756c7625ade7cf57358396baec (diff)
downloadcogl-54735dec849a0f687d71288f458ab1050b7dd806.tar.gz
Switch use of primitive glib types to c99 equivalents
The coding style has for a long time said to avoid using redundant glib data types such as gint or gchar etc because we feel that they make the code look unnecessarily foreign to developers coming from outside of the Gnome developer community. Note: When we tried to find the historical rationale for the types we just found that they were apparently only added for consistent syntax highlighting which didn't seem that compelling. Up until now we have been continuing to use some of the platform specific type such as gint{8,16,32,64} and gsize but this patch switches us over to using the standard c99 equivalents instead so we can further ensure that our code looks familiar to the widest range of C developers who might potentially contribute to Cogl. So instead of using the gint{8,16,32,64} and guint{8,16,32,64} types this switches all Cogl code to instead use the int{8,16,32,64}_t and uint{8,16,32,64}_t c99 types instead. Instead of gsize we now use size_t For now we are not going to use the c99 _Bool type and instead we have introduced a new CoglBool type to use instead of gboolean. Reviewed-by: Neil Roberts <neil@linux.intel.com> (cherry picked from commit 5967dad2400d32ca6319cef6cb572e81bf2c15f0)
Diffstat (limited to 'cogl/cogl-atlas-texture.c')
-rw-r--r--cogl/cogl-atlas-texture.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/cogl/cogl-atlas-texture.c b/cogl/cogl-atlas-texture.c
index fa27e681..f485893c 100644
--- a/cogl/cogl-atlas-texture.c
+++ b/cogl/cogl-atlas-texture.c
@@ -69,7 +69,7 @@ _cogl_atlas_texture_create_sub_texture (CoglTexture *full_texture,
}
static void
-_cogl_atlas_texture_update_position_cb (gpointer user_data,
+_cogl_atlas_texture_update_position_cb (void *user_data,
CoglTexture *new_texture,
const CoglRectangleMapEntry *rectangle)
{
@@ -294,7 +294,7 @@ _cogl_atlas_texture_get_max_waste (CoglTexture *tex)
return cogl_texture_get_max_waste (atlas_tex->sub_texture);
}
-static gboolean
+static CoglBool
_cogl_atlas_texture_is_sliced (CoglTexture *tex)
{
CoglAtlasTexture *atlas_tex = COGL_ATLAS_TEXTURE (tex);
@@ -303,7 +303,7 @@ _cogl_atlas_texture_is_sliced (CoglTexture *tex)
return cogl_texture_is_sliced (atlas_tex->sub_texture);
}
-static gboolean
+static CoglBool
_cogl_atlas_texture_can_hardware_repeat (CoglTexture *tex)
{
CoglAtlasTexture *atlas_tex = COGL_ATLAS_TEXTURE (tex);
@@ -334,7 +334,7 @@ _cogl_atlas_texture_transform_quad_coords_to_gl (CoglTexture *tex,
coords);
}
-static gboolean
+static CoglBool
_cogl_atlas_texture_get_gl_texture (CoglTexture *tex,
GLuint *out_gl_handle,
GLenum *out_gl_target)
@@ -430,7 +430,7 @@ _cogl_atlas_texture_ensure_non_quad_rendering (CoglTexture *tex)
_cogl_texture_ensure_non_quad_rendering (atlas_tex->sub_texture);
}
-static gboolean
+static CoglBool
_cogl_atlas_texture_set_region_with_border (CoglAtlasTexture *atlas_tex,
int src_x,
int src_y,
@@ -540,7 +540,7 @@ _cogl_atlas_texture_prepare_for_upload (CoglAtlasTexture *atlas_tex,
return override_bmp;
}
-static gboolean
+static CoglBool
_cogl_atlas_texture_set_region (CoglTexture *tex,
int src_x,
int src_y,
@@ -556,7 +556,7 @@ _cogl_atlas_texture_set_region (CoglTexture *tex,
pixels to the border */
if (atlas_tex->atlas)
{
- gboolean ret;
+ CoglBool ret;
bmp = _cogl_atlas_texture_prepare_for_upload (atlas_tex,
bmp);
@@ -619,7 +619,7 @@ _cogl_atlas_texture_get_height (CoglTexture *tex)
return cogl_texture_get_height (atlas_tex->sub_texture);
}
-static gboolean
+static CoglBool
_cogl_atlas_texture_can_use_format (CoglPixelFormat format)
{
/* We don't care about the ordering or the premult status and we can