cogl-texture: Split out _cogl_texture_prepare_for_upload
authorNeil Roberts <neil@linux.intel.com>
Wed, 3 Feb 2010 22:54:44 +0000 (22:54 +0000)
committerNeil Roberts <neil@linux.intel.com>
Wed, 3 Feb 2010 23:10:52 +0000 (23:10 +0000)
commit59198b8ab8a6a7c1c3dbfa5c72abf36f8d66c543
tree55da5c7324356f87d647b5ca1815c25549a61c76
parent5063f4669c2c94d7288405005f4df14e73a4f578
cogl-texture: Split out _cogl_texture_prepare_for_upload

The Cogl atlas code was using _cogl_texture_prepare_for_upload with a
NULL pointer for the dst_bmp to determine the internal format of the
texture without converting the bitmap. It needs to do this to decide
whether the texture will go in the atlas before wasting time on the
conversion. This use of the function is a little confusing so that
part of it has been split out into a new function called
_cogl_texture_determine_internal_format. The code to decide whether a
premult conversion is needed has also been split out.
clutter/cogl/cogl/cogl-atlas-texture.c
clutter/cogl/cogl/cogl-texture-private.h
clutter/cogl/cogl/cogl-texture.c