isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-21 23:50:41 -05:00
Code Issues Packages Projects Releases Wiki Activity

cogl: Remove unused CoglTextureVable::get_type

Browse Source 
https://gitlab.gnome.org/GNOME/mutter/merge_requests/546
This commit is contained in:
Adam Jackson 2019-03-08 14:48:08 -05:00
parent 2b9cd50e84
commit 862e56f01d
7 changed files with 0 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cogl/cogl/cogl-atlas-texture.c
View File

@ -1013,12 +1013,6 @@ _cogl_atlas_texture_remove_reorganize_callback (CoglContext *ctx,
g_hook_destroy_link (&ctx->atlas_reorganize_callbacks, hook); g_hook_destroy_link (&ctx->atlas_reorganize_callbacks, hook);
} }
static CoglTextureType
_cogl_atlas_texture_get_type (CoglTexture *tex)
{
return COGL_TEXTURE_TYPE_2D;
}
static const CoglTextureVtable static const CoglTextureVtable
cogl_atlas_texture_vtable = cogl_atlas_texture_vtable =
{ {
@ -1040,7 +1034,6 @@ cogl_atlas_texture_vtable =
_cogl_atlas_texture_gl_flush_legacy_texobj_wrap_modes, _cogl_atlas_texture_gl_flush_legacy_texobj_wrap_modes,
_cogl_atlas_texture_get_format, _cogl_atlas_texture_get_format,
_cogl_atlas_texture_get_gl_format, _cogl_atlas_texture_get_gl_format,
_cogl_atlas_texture_get_type,
NULL, /* is_foreign */ NULL, /* is_foreign */
NULL /* set_auto_mipmap */ NULL /* set_auto_mipmap */
}; };

9
cogl/cogl/cogl-sub-texture.c
View File

@ -415,14 +415,6 @@ _cogl_sub_texture_get_gl_format (CoglTexture *tex)
return _cogl_texture_gl_get_format (sub_tex->full_texture); return _cogl_texture_gl_get_format (sub_tex->full_texture);
} }
static CoglTextureType
_cogl_sub_texture_get_type (CoglTexture *tex)
{
CoglSubTexture *sub_tex = COGL_SUB_TEXTURE (tex);
return _cogl_texture_get_type (sub_tex->full_texture);
}
static const CoglTextureVtable static const CoglTextureVtable
cogl_sub_texture_vtable = cogl_sub_texture_vtable =
{ {
@ -444,7 +436,6 @@ cogl_sub_texture_vtable =
_cogl_sub_texture_gl_flush_legacy_texobj_wrap_modes, _cogl_sub_texture_gl_flush_legacy_texobj_wrap_modes,
_cogl_sub_texture_get_format, _cogl_sub_texture_get_format,
_cogl_sub_texture_get_gl_format, _cogl_sub_texture_get_gl_format,
_cogl_sub_texture_get_type,
NULL, /* is_foreign */ NULL, /* is_foreign */
NULL /* set_auto_mipmap */ NULL /* set_auto_mipmap */
}; };

7
cogl/cogl/cogl-texture-2d-sliced.c
View File

@ -1442,12 +1442,6 @@ _cogl_texture_2d_sliced_get_gl_format (CoglTexture *tex)
return _cogl_texture_gl_get_format (COGL_TEXTURE (slice_tex)); return _cogl_texture_gl_get_format (COGL_TEXTURE (slice_tex));
} }
static CoglTextureType
_cogl_texture_2d_sliced_get_type (CoglTexture *tex)
{
return COGL_TEXTURE_TYPE_2D;
}
static const CoglTextureVtable static const CoglTextureVtable
cogl_texture_2d_sliced_vtable = cogl_texture_2d_sliced_vtable =
{ {
@ -1469,7 +1463,6 @@ cogl_texture_2d_sliced_vtable =
_cogl_texture_2d_sliced_gl_flush_legacy_texobj_wrap_modes, _cogl_texture_2d_sliced_gl_flush_legacy_texobj_wrap_modes,
_cogl_texture_2d_sliced_get_format, _cogl_texture_2d_sliced_get_format,
_cogl_texture_2d_sliced_get_gl_format, _cogl_texture_2d_sliced_get_gl_format,
_cogl_texture_2d_sliced_get_type,
_cogl_texture_2d_sliced_is_foreign, _cogl_texture_2d_sliced_is_foreign,
NULL /* set_auto_mipmap */ NULL /* set_auto_mipmap */
}; };

7
cogl/cogl/cogl-texture-2d.c
View File

@ -667,12 +667,6 @@ _cogl_texture_2d_is_foreign (CoglTexture *tex)
return COGL_TEXTURE_2D (tex)->is_foreign; return COGL_TEXTURE_2D (tex)->is_foreign;
} }
static CoglTextureType
_cogl_texture_2d_get_type (CoglTexture *tex)
{
return COGL_TEXTURE_TYPE_2D;
}
static const CoglTextureVtable static const CoglTextureVtable
cogl_texture_2d_vtable = cogl_texture_2d_vtable =
{ {
@ -694,7 +688,6 @@ cogl_texture_2d_vtable =
_cogl_texture_2d_gl_flush_legacy_texobj_wrap_modes, _cogl_texture_2d_gl_flush_legacy_texobj_wrap_modes,
_cogl_texture_2d_get_format, _cogl_texture_2d_get_format,
_cogl_texture_2d_get_gl_format, _cogl_texture_2d_get_gl_format,
_cogl_texture_2d_get_type,
_cogl_texture_2d_is_foreign, _cogl_texture_2d_is_foreign,
_cogl_texture_2d_set_auto_mipmap _cogl_texture_2d_set_auto_mipmap
}; };

14
cogl/cogl/cogl-texture-private.h
View File

@ -146,8 +146,6 @@ struct _CoglTextureVtable
CoglPixelFormat (* get_format) (CoglTexture *tex); CoglPixelFormat (* get_format) (CoglTexture *tex);
GLenum (* get_gl_format) (CoglTexture *tex); GLenum (* get_gl_format) (CoglTexture *tex);
CoglTextureType (* get_type) (CoglTexture *tex);
gboolean (* is_foreign) (CoglTexture *tex); gboolean (* is_foreign) (CoglTexture *tex);
/* Only needs to be implemented if is_primitive == TRUE */ /* Only needs to be implemented if is_primitive == TRUE */
@ -354,18 +352,6 @@ _cogl_texture_spans_foreach_in_region (CoglSpan *x_spans,
CoglMetaTextureCallback callback, CoglMetaTextureCallback callback,
void *user_data); void *user_data);
/*
* _cogl_texture_get_type:
* @texture: a #CoglTexture pointer
*
* Retrieves the texture type of the underlying hardware texture that
* this #CoglTexture will use.
*
* Return value: The type of the hardware texture.
*/
CoglTextureType
_cogl_texture_get_type (CoglTexture *texture);
gboolean gboolean
_cogl_texture_set_region (CoglTexture *texture, _cogl_texture_set_region (CoglTexture *texture,
int width, int width,

6
cogl/cogl/cogl-texture.c
View File

@ -327,12 +327,6 @@ cogl_texture_get_gl_texture (CoglTexture *texture,
out_gl_handle, out_gl_target); out_gl_handle, out_gl_target);
} }
CoglTextureType
_cogl_texture_get_type (CoglTexture *texture)
{
return texture->vtable->get_type (texture);
}
void void
_cogl_texture_pre_paint (CoglTexture *texture, CoglTexturePrePaintFlags flags) _cogl_texture_pre_paint (CoglTexture *texture, CoglTexturePrePaintFlags flags)
{ {

13
cogl/cogl/winsys/cogl-texture-pixmap-x11.c
View File

@ -1032,18 +1032,6 @@ _cogl_texture_pixmap_x11_get_gl_format (CoglTexture *tex)
return _cogl_texture_gl_get_format (child_tex); return _cogl_texture_gl_get_format (child_tex);
} }
static CoglTextureType
_cogl_texture_pixmap_x11_get_type (CoglTexture *tex)
{
CoglTexturePixmapX11 *tex_pixmap = COGL_TEXTURE_PIXMAP_X11 (tex);
CoglTexture *child_tex;
child_tex = _cogl_texture_pixmap_x11_get_texture (tex_pixmap);
/* Forward on to the child texture */
return _cogl_texture_get_type (child_tex);
}
static void static void
_cogl_texture_pixmap_x11_free (CoglTexturePixmapX11 *tex_pixmap) _cogl_texture_pixmap_x11_free (CoglTexturePixmapX11 *tex_pixmap)
{ {
@ -1110,7 +1098,6 @@ cogl_texture_pixmap_x11_vtable =
_cogl_texture_pixmap_x11_gl_flush_legacy_texobj_wrap_modes, _cogl_texture_pixmap_x11_gl_flush_legacy_texobj_wrap_modes,
_cogl_texture_pixmap_x11_get_format, _cogl_texture_pixmap_x11_get_format,
_cogl_texture_pixmap_x11_get_gl_format, _cogl_texture_pixmap_x11_get_gl_format,
_cogl_texture_pixmap_x11_get_type,
NULL, /* is_foreign */ NULL, /* is_foreign */
NULL /* set_auto_mipmap */ NULL /* set_auto_mipmap */
}; };