diff options
author | Robert Bragg <robert@linux.intel.com> | 2012-04-16 21:56:40 +0100 |
---|---|---|
committer | Robert Bragg <robert@linux.intel.com> | 2012-08-06 14:27:39 +0100 |
commit | 54735dec849a0f687d71288f458ab1050b7dd806 (patch) | |
tree | 2a856c2b482f121d25b6d9393ae81b79a64b669e /cogl/cogl-texture.h | |
parent | 09642a83b5f036756c7625ade7cf57358396baec (diff) | |
download | cogl-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-texture.h')
-rw-r--r-- | cogl/cogl-texture.h | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/cogl/cogl-texture.h b/cogl/cogl-texture.h index 825e83df..d2d42524 100644 --- a/cogl/cogl-texture.h +++ b/cogl/cogl-texture.h @@ -179,7 +179,7 @@ cogl_texture_new_from_data (unsigned int width, CoglPixelFormat format, CoglPixelFormat internal_format, unsigned int rowstride, - const guint8 *data); + const uint8_t *data); /** * cogl_texture_new_from_foreign: @@ -242,7 +242,7 @@ cogl_texture_new_from_bitmap (CoglBitmap *bitmap, * Return value: %TRUE if the @object references a texture, and * %FALSE otherwise */ -gboolean +CoglBool cogl_is_texture (void *object); /** @@ -332,7 +332,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 */ -gboolean +CoglBool cogl_texture_is_sliced (CoglTexture *texture); /** @@ -351,7 +351,7 @@ cogl_texture_is_sliced (CoglTexture *texture); * Return value: %TRUE if the handle was successfully retrieved, %FALSE * if the handle was invalid */ -gboolean +CoglBool cogl_texture_get_gl_texture (CoglTexture *texture, unsigned int *out_gl_handle, unsigned int *out_gl_target); @@ -379,7 +379,7 @@ int cogl_texture_get_data (CoglTexture *texture, CoglPixelFormat format, unsigned int rowstride, - guint8 *data); + uint8_t *data); /** * cogl_texture_set_region: @@ -407,19 +407,19 @@ cogl_texture_get_data (CoglTexture *texture, * Return value: %TRUE if the subregion upload was successful, and * %FALSE otherwise */ -gboolean -cogl_texture_set_region (CoglTexture *texture, - int src_x, - int src_y, - int dst_x, - int dst_y, - unsigned int dst_width, - unsigned int dst_height, - int width, - int height, - CoglPixelFormat format, - unsigned int rowstride, - const guint8 *data); +CoglBool +cogl_texture_set_region (CoglTexture *texture, + int src_x, + int src_y, + int dst_x, + int dst_y, + unsigned int dst_width, + unsigned int dst_height, + int width, + int height, + CoglPixelFormat format, + unsigned int rowstride, + const uint8_t *data); #if defined (COGL_ENABLE_EXPERIMENTAL_API) @@ -450,7 +450,7 @@ cogl_texture_set_region (CoglTexture *texture, * Since: 1.8 * Stability: unstable */ -gboolean +CoglBool cogl_texture_set_region_from_bitmap (CoglTexture *texture, int src_x, int src_y, |