diff --git a/cogl/cogl/cogl-atlas-texture-private.h b/cogl/cogl/cogl-atlas-texture-private.h index 141224203..9217dfdbf 100644 --- a/cogl/cogl/cogl-atlas-texture-private.h +++ b/cogl/cogl/cogl-atlas-texture-private.h @@ -60,10 +60,6 @@ struct _CoglAtlasTexture CoglTexture *sub_texture; }; -CoglAtlasTexture * -_cogl_atlas_texture_new_from_bitmap (CoglBitmap *bmp, - gboolean can_convert_in_place); - COGL_EXPORT void _cogl_atlas_texture_add_reorganize_callback (CoglContext *ctx, GHookFunc callback, diff --git a/cogl/cogl/cogl-atlas-texture.c b/cogl/cogl/cogl-atlas-texture.c index fbf8ce6fd..5f1f644b4 100644 --- a/cogl/cogl/cogl-atlas-texture.c +++ b/cogl/cogl/cogl-atlas-texture.c @@ -890,8 +890,7 @@ _cogl_atlas_texture_allocate (CoglTexture *tex, } CoglAtlasTexture * -_cogl_atlas_texture_new_from_bitmap (CoglBitmap *bmp, - gboolean can_convert_in_place) +cogl_atlas_texture_new_from_bitmap (CoglBitmap *bmp) { CoglTextureLoader *loader; @@ -900,7 +899,7 @@ _cogl_atlas_texture_new_from_bitmap (CoglBitmap *bmp, loader = _cogl_texture_create_loader (); loader->src_type = COGL_TEXTURE_SOURCE_TYPE_BITMAP; loader->src.bitmap.bitmap = cogl_object_ref (bmp); - loader->src.bitmap.can_convert_in_place = can_convert_in_place; + loader->src.bitmap.can_convert_in_place = FALSE; return _cogl_atlas_texture_create_base (_cogl_bitmap_get_context (bmp), cogl_bitmap_get_width (bmp), @@ -909,12 +908,6 @@ _cogl_atlas_texture_new_from_bitmap (CoglBitmap *bmp, loader); } -CoglAtlasTexture * -cogl_atlas_texture_new_from_bitmap (CoglBitmap *bmp) -{ - return _cogl_atlas_texture_new_from_bitmap (bmp, FALSE); -} - CoglAtlasTexture * cogl_atlas_texture_new_from_data (CoglContext *ctx, int width, diff --git a/cogl/cogl/cogl-texture-2d-private.h b/cogl/cogl/cogl-texture-2d-private.h index ee73c636f..a59a79d0b 100644 --- a/cogl/cogl/cogl-texture-2d-private.h +++ b/cogl/cogl/cogl-texture-2d-private.h @@ -67,10 +67,6 @@ struct _CoglTexture2D } egl_image_external; }; -CoglTexture2D * -_cogl_texture_2d_new_from_bitmap (CoglBitmap *bmp, - gboolean can_convert_in_place); - CoglTexture2D * _cogl_texture_2d_create_base (CoglContext *ctx, int width, diff --git a/cogl/cogl/cogl-texture-2d-sliced-private.h b/cogl/cogl/cogl-texture-2d-sliced-private.h index 0928b9a29..13647a2cd 100644 --- a/cogl/cogl/cogl-texture-2d-sliced-private.h +++ b/cogl/cogl/cogl-texture-2d-sliced-private.h @@ -47,8 +47,3 @@ struct _CoglTexture2DSliced int max_waste; CoglPixelFormat internal_format; }; - -CoglTexture2DSliced * -_cogl_texture_2d_sliced_new_from_bitmap (CoglBitmap *bmp, - int max_waste, - gboolean can_convert_in_place); diff --git a/cogl/cogl/cogl-texture-2d-sliced.c b/cogl/cogl/cogl-texture-2d-sliced.c index bd1436244..d179b8659 100644 --- a/cogl/cogl/cogl-texture-2d-sliced.c +++ b/cogl/cogl/cogl-texture-2d-sliced.c @@ -886,9 +886,8 @@ cogl_texture_2d_sliced_new_with_size (CoglContext *ctx, } CoglTexture2DSliced * -_cogl_texture_2d_sliced_new_from_bitmap (CoglBitmap *bmp, - int max_waste, - gboolean can_convert_in_place) +cogl_texture_2d_sliced_new_from_bitmap (CoglBitmap *bmp, + int max_waste) { CoglTextureLoader *loader; @@ -897,7 +896,7 @@ _cogl_texture_2d_sliced_new_from_bitmap (CoglBitmap *bmp, loader = _cogl_texture_create_loader (); loader->src_type = COGL_TEXTURE_SOURCE_TYPE_BITMAP; loader->src.bitmap.bitmap = cogl_object_ref (bmp); - loader->src.bitmap.can_convert_in_place = can_convert_in_place; + loader->src.bitmap.can_convert_in_place = FALSE; return _cogl_texture_2d_sliced_create_base (_cogl_bitmap_get_context (bmp), cogl_bitmap_get_width (bmp), @@ -907,15 +906,6 @@ _cogl_texture_2d_sliced_new_from_bitmap (CoglBitmap *bmp, loader); } -CoglTexture2DSliced * -cogl_texture_2d_sliced_new_from_bitmap (CoglBitmap *bmp, - int max_waste) -{ - return _cogl_texture_2d_sliced_new_from_bitmap (bmp, - max_waste, - FALSE); -} - CoglTexture2DSliced * cogl_texture_2d_sliced_new_from_data (CoglContext *ctx, int width, diff --git a/cogl/cogl/cogl-texture-2d.c b/cogl/cogl/cogl-texture-2d.c index 20f24bb40..30b6098db 100644 --- a/cogl/cogl/cogl-texture-2d.c +++ b/cogl/cogl/cogl-texture-2d.c @@ -160,8 +160,7 @@ _cogl_texture_2d_allocate (CoglTexture *tex, } CoglTexture2D * -_cogl_texture_2d_new_from_bitmap (CoglBitmap *bmp, - gboolean can_convert_in_place) +cogl_texture_2d_new_from_bitmap (CoglBitmap *bmp) { CoglTextureLoader *loader; @@ -170,7 +169,7 @@ _cogl_texture_2d_new_from_bitmap (CoglBitmap *bmp, loader = _cogl_texture_create_loader (); loader->src_type = COGL_TEXTURE_SOURCE_TYPE_BITMAP; loader->src.bitmap.bitmap = cogl_object_ref (bmp); - loader->src.bitmap.can_convert_in_place = can_convert_in_place; + loader->src.bitmap.can_convert_in_place = FALSE; return _cogl_texture_2d_create_base (_cogl_bitmap_get_context (bmp), cogl_bitmap_get_width (bmp), @@ -179,13 +178,6 @@ _cogl_texture_2d_new_from_bitmap (CoglBitmap *bmp, loader); } -CoglTexture2D * -cogl_texture_2d_new_from_bitmap (CoglBitmap *bmp) -{ - return _cogl_texture_2d_new_from_bitmap (bmp, - FALSE); /* can't convert in place */ -} - CoglTexture2D * cogl_texture_2d_new_from_data (CoglContext *ctx, int width, diff --git a/cogl/cogl/driver/gl/cogl-texture-2d-gl-private.h b/cogl/cogl/driver/gl/cogl-texture-2d-gl-private.h index 077921f9e..0297707ff 100644 --- a/cogl/cogl/driver/gl/cogl-texture-2d-gl-private.h +++ b/cogl/cogl/driver/gl/cogl-texture-2d-gl-private.h @@ -53,12 +53,6 @@ gboolean _cogl_texture_2d_gl_allocate (CoglTexture *tex, GError **error); -CoglTexture2D * -_cogl_texture_2d_gl_new_from_bitmap (CoglBitmap *bmp, - CoglPixelFormat internal_format, - gboolean can_convert_in_place, - GError **error); - #if defined (COGL_HAS_EGL_SUPPORT) gboolean cogl_texture_2d_gl_bind_egl_image (CoglTexture2D *tex_2d,