diff options
| author | Robert Bragg <robert@linux.intel.com> | 2013-06-08 01:58:05 +0100 |
|---|---|---|
| committer | Neil Roberts <neil@linux.intel.com> | 2013-07-29 16:38:53 +0100 |
| commit | fc5d1a8a680b9cb78e9ffb18ff0822ac64177142 (patch) | |
| tree | 23ad27a6747f78e84beb30153a134a2037735c5a /doc | |
| parent | 6f480c7530fc1c3f73676d3c3c19b2479d67ffff (diff) | |
Expose CoglAtlasTexture api
This exposes the CoglAtlasTexture api, making the following public:
cogl_atlas_texture_new_with_size
cogl_atlas_texture_new_from_file
cogl_atlas_texture_new_from_data
cogl_atlas_texture_new_from_bitmap
The plan is to remove auto-texture apis like cogl_texture_new_from_file
since they are a bit too magic, but that means we need an explicit way
for users to allocate texture that will go in the atlas.
Although the _new_from_file() api is arguably redundant since you can
use _bitmap_new_from_file() followed by _atlas_texture_new_from_bitmap()
we don't want to loose any of the convenience that
cogl_texture_new_from_file() had.
Reviewed-by: Neil Roberts <neil@linux.intel.com>
(cherry picked from commit fe515e6063ba4c3ddb5cd00d2c8527d9a6336a12)
Conflicts:
cogl/Makefile.am
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/reference/cogl-2.0-experimental/cogl-2.0-experimental-sections.txt | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/doc/reference/cogl-2.0-experimental/cogl-2.0-experimental-sections.txt b/doc/reference/cogl-2.0-experimental/cogl-2.0-experimental-sections.txt index 4cea49dd..b0feae72 100644 --- a/doc/reference/cogl-2.0-experimental/cogl-2.0-experimental-sections.txt +++ b/doc/reference/cogl-2.0-experimental/cogl-2.0-experimental-sections.txt @@ -467,6 +467,17 @@ cogl_is_sub_texture </SECTION> <SECTION> +<FILE>cogl-atlas-texture</FILE> +<TITLE>Atlas Textures</TITLE> +CoglAtlasTexture +cogl_atlas_texture_new_with_size +cogl_atlas_texture_new_from_file +cogl_atlas_texture_new_from_data +cogl_atlas_texture_new_from_bitmap +cogl_is_atlas_texture +</SECTION> + +<SECTION> <FILE>cogl-texture-2d-sliced</FILE> <TITLE>Sliced Textures</TITLE> CoglTexture2DSliced |