isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-06-14 01:09:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

2d-sliced: add _new_from_file/data/bitmap apis

Browse Source 
This adds cogl_texture_2d_sliced_new_from_bitmap/data/file apis in
preparation for removing the cogl_texture_new_from_bitmap/file apis that
are considered a bit too magic, but we don't want to loose the
convenience they have.

Reviewed-by: Neil Roberts <neil@linux.intel.com>

(cherry picked from commit 218da8e1349d7658f45c6933b9736c0d32941b8b)

Conflicts:
	cogl/cogl-auto-texture.c
This commit is contained in:
Robert Bragg
2013-06-08 18:52:20 +01:00
committed by Neil Roberts
parent aa92110f83
commit 061240ef2a
5 changed files with 289 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
doc/reference/cogl-2.0-experimental/cogl-2.0-experimental-sections.txt
View File

@ -483,6 +483,9 @@ cogl_is_atlas_texture
<TITLE>Sliced Textures</TITLE>
CoglTexture2DSliced
cogl_texture_2d_sliced_new_with_size
cogl_texture_2d_sliced_new_from_file
cogl_texture_2d_sliced_new_from_data
cogl_texture_2d_sliced_new_from_bitmap
cogl_is_texture_2d_sliced
</SECTION>