[_cogl_texture_bitmap_prepare] use bitmap format for FORMAT_ANY + no alpha
authorRobert Bragg <robert@linux.intel.com>
Mon, 8 Jun 2009 16:43:34 +0000 (17:43 +0100)
committerRobert Bragg <robert@linux.intel.com>
Thu, 11 Jun 2009 17:49:30 +0000 (18:49 +0100)
commit9d829957737fc016033e80c33593d2cc8daa0f4c
tree58dd2e30790940bbb3588fedc375e1c8fa6216a0
parent6414adbfeb696282c5e5ca0eb47a77caf3309d92
[_cogl_texture_bitmap_prepare] use bitmap format for FORMAT_ANY + no alpha

My patch to choose a premultiplied format when the user gives
COGL_PIXEL_FORMAT_ANY for the internal_format broke the case where the data
in question doesn't have and alpha channel.

This was accidentally missed when merging the premultiplication branch
since I merged a local version of the branch that missed this commit.
clutter/cogl/gl/cogl-texture.c
clutter/cogl/gles/cogl-texture.c