mirror of
https://github.com/brl/mutter.git
synced 2024-12-24 20:12:06 +00:00
fc5d1a8a68
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 |
||
|---|---|---|
| .. | ||
| cogl-pango-1.0.pc.in | ||
| cogl-pango-2.0-experimental.pc.in | ||
| cogl-pango-display-list.c | ||
| cogl-pango-display-list.h | ||
| cogl-pango-fontmap.c | ||
| cogl-pango-glyph-cache.c | ||
| cogl-pango-glyph-cache.h | ||
| cogl-pango-pipeline-cache.c | ||
| cogl-pango-pipeline-cache.h | ||
| cogl-pango-private.h | ||
| cogl-pango-render.c | ||
| cogl-pango.h | ||
| cogl-pango.pc.in | ||
| cogl-pango.rc.in | ||
| cogl-pango.symbols | ||
| Makefile.am | ||