diff options
author | Neil Roberts <neil@linux.intel.com> | 2012-04-04 15:10:04 +0100 |
---|---|---|
committer | Neil Roberts <neil@linux.intel.com> | 2012-04-05 13:47:32 +0100 |
commit | 6197e3abf3d67cd7459df354af0e69805a625902 (patch) | |
tree | fa1bab73ff65dca7bfa74688e2b64fc88b23f731 /cogl/cogl-texture-rectangle-private.h | |
parent | e7f158263072d03eb549f22007fd63384dd5c7ce (diff) | |
download | cogl-6197e3abf3d67cd7459df354af0e69805a625902.tar.gz |
Add constructors which take a CoglBitmap to all primitive textures
This adds public constructors which take a CoglBitmap to all primitive
texture types. This constructor should be considered the canonical
constructor for initializing the texture with data because it should
be possible to wrap any type of data in a CoglBitmap. Having at least
this single constructor avoids the need to have an explosion of
constructors such as new_from_data, new_from_pixel_buffer and
new_from_file etc.
The already available internal bitmap constructor for CoglTexture2D
has had its flags parameter removed under the assumption that flags do
not make sense for primitive textures. The meta constructor
cogl_texture_new_from_bitmap now just explicitly calls set_auto_mipmap
after constructing the texture depending on the value of the
COGL_TEXTURE_NO_AUTO_MIPMAP flag.
Reviewed-by: Robert Bragg <robert@linux.intel.com>
Diffstat (limited to 'cogl/cogl-texture-rectangle-private.h')
-rw-r--r-- | cogl/cogl-texture-rectangle-private.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/cogl/cogl-texture-rectangle-private.h b/cogl/cogl-texture-rectangle-private.h index 0e951062..cfc7dc7f 100644 --- a/cogl/cogl-texture-rectangle-private.h +++ b/cogl/cogl-texture-rectangle-private.h @@ -49,11 +49,6 @@ struct _CoglTextureRectangle }; CoglTextureRectangle * -_cogl_texture_rectangle_new_from_bitmap (CoglBitmap *bmp, - CoglTextureFlags flags, - CoglPixelFormat internal_format); - -CoglTextureRectangle * _cogl_texture_rectangle_new_from_foreign (GLuint gl_handle, GLuint width, GLuint height, |