isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-07-10 04:34:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Expose CoglAtlasTexture api

Browse Source 
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
This commit is contained in:
Robert Bragg
2013-06-08 01:58:05 +01:00
committed by Neil Roberts
parent 6f480c7530
commit fc5d1a8a68
8 changed files with 326 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
cogl-pango/cogl-pango-glyph-cache.c
View File

@ -224,12 +224,11 @@ cogl_pango_glyph_cache_add_to_global_atlas (CoglPangoGlyphCache *cache,
if (cache->use_mipmapping)
return FALSE;
texture = _cogl_atlas_texture_new_with_size (cache->ctx,
value->draw_width,
value->draw_height,
COGL_TEXTURE_NONE,
COGL_PIXEL_FORMAT_RGBA_8888_PRE,
&ignore_error);
texture = cogl_atlas_texture_new_with_size (cache->ctx,
value->draw_width,
value->draw_height,
COGL_PIXEL_FORMAT_RGBA_8888_PRE,
&ignore_error);
if (texture == NULL)
{