[cogl/cogl-1.16] atlas-texture: use COGL_TEXTURE_DEFINE macro
- From: Robert Bragg <rbragg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [cogl/cogl-1.16] atlas-texture: use COGL_TEXTURE_DEFINE macro
- Date: Fri, 6 Sep 2013 17:39:48 +0000 (UTC)
commit bdcd012f570b57a57ea15770f881e795636abf2e
Author: Robert Bragg <robert linux intel com>
Date: Fri Sep 6 18:18:52 2013 +0100
atlas-texture: use COGL_TEXTURE_DEFINE macro
It was an oversight when making the CoglAtlasTexture api public that we
continued to use the COGL_TEXTURE_INTERNAL_DEFINE macro. This updates
the code to now use COGL_TEXTURE_DEFINE which means the
cogl_is_atlas_texture() function will now be exported in the public api.
Reviewed-by: Neil Roberts <neil linux intel com>
Reviewed-by: Lionel Landwerlin <llandwerlin gmail com>
(cherry picked from commit ecbe209f48be80fe45b48f92b277a2aee08d5704)
cogl/cogl-atlas-texture.c | 2 +-
cogl/cogl-atlas-texture.h | 15 +++++++++++++++
2 files changed, 16 insertions(+), 1 deletions(-)
---
diff --git a/cogl/cogl-atlas-texture.c b/cogl/cogl-atlas-texture.c
index 4542cb3..98d61ca 100644
--- a/cogl/cogl-atlas-texture.c
+++ b/cogl/cogl-atlas-texture.c
@@ -50,7 +50,7 @@
static void _cogl_atlas_texture_free (CoglAtlasTexture *sub_tex);
-COGL_TEXTURE_INTERNAL_DEFINE (AtlasTexture, atlas_texture);
+COGL_TEXTURE_DEFINE (AtlasTexture, atlas_texture);
static const CoglTextureVtable cogl_atlas_texture_vtable;
diff --git a/cogl/cogl-atlas-texture.h b/cogl/cogl-atlas-texture.h
index 5745cca..9860c5d 100644
--- a/cogl/cogl-atlas-texture.h
+++ b/cogl/cogl-atlas-texture.h
@@ -209,6 +209,21 @@ cogl_atlas_texture_new_from_bitmap (CoglBitmap *bmp,
CoglPixelFormat internal_format,
CoglError **error);
+/**
+ * cogl_is_atlas_texture:
+ * @object: a #CoglObject
+ *
+ * Checks whether the given object references a #CoglAtlasTexture
+ *
+ * Return value: %TRUE if the passed object represents an atlas
+ * texture and %FALSE otherwise
+ *
+ * Since: 1.16
+ * Stability: Unstable
+ */
+CoglBool
+cogl_is_atlas_texture (void *object);
+
COGL_END_DECLS
#endif /* _COGL_ATLAS_TEXTURE_H_ */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]