cogl-atlas-texture: Don't create atlas textures with the premult bit

Previously the atlas textures were being created with whatever format
the first sub texture is in. Only three formats are supported so this
only matters if the first texture is a premultiplied alpha
texture. Instead it now masks out the premultiplied bit so that the
textures are always either RGB_888 or RGBA_8888.
This commit is contained in:
Neil Roberts 2010-01-19 17:06:28 +00:00
parent a78246b403
commit 41a915ec00

View File

@ -1015,7 +1015,8 @@ _cogl_atlas_texture_new_from_bitmap (CoglHandle bmp_handle,
atlas_tex->rectangle.height = upload_data.bitmap.height + 2; atlas_tex->rectangle.height = upload_data.bitmap.height + 2;
/* Try to make some space in the atlas for the texture */ /* Try to make some space in the atlas for the texture */
if (!_cogl_atlas_texture_reserve_space (internal_format, if (!_cogl_atlas_texture_reserve_space (internal_format &
~COGL_PREMULT_BIT,
atlas_ptr, atlas_ptr,
atlas_tex_ptr, atlas_tex_ptr,
atlas_tex, atlas_tex,