mirror of
https://github.com/brl/mutter.git
synced 2024-12-25 20:32:16 +00:00
cogl: Drop various private constructors
They are only useful for passing a different value for convert_in_place but none of these are used Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3097>
This commit is contained in:
parent
12c85002e9
commit
d492dc7687
@ -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,
|
||||
|
@ -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,
|
||||
|
@ -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,
|
||||
|
@ -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);
|
||||
|
@ -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,
|
||||
|
@ -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,
|
||||
|
@ -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,
|
||||
|
Loading…
Reference in New Issue
Block a user