mirror of
https://github.com/brl/mutter.git
synced 2024-12-25 20:32:16 +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 |
||
|---|---|---|
| .. | ||
| blend-strings.xml | ||
| cogl_ortho.png | ||
| cogl-2.0-experimental-docs.xml.in | ||
| cogl-2.0-experimental-sections.txt | ||
| fill-rule-even-odd.png | ||
| fill-rule-non-zero.png | ||
| Makefile.am | ||
| quad-indices-order.png | ||
| quad-indices-triangles.png | ||
