mirror of
https://github.com/brl/mutter.git
synced 2024-12-24 12:02:04 +00:00
pango: Use CoglMaterial type for materials
Instead of using the CoglHandle type for material variables this updates the pango code to use CoglMaterial * instead. CoglHandle is the old typename which is being phased out of the API.
This commit is contained in:
parent
e673de0b55
commit
47ceb34ba9
@ -309,7 +309,7 @@ emit_vertex_buffer_geometry (CoglPangoDisplayListNode *node)
|
||||
}
|
||||
|
||||
static void
|
||||
_cogl_pango_display_list_render_texture (CoglHandle material,
|
||||
_cogl_pango_display_list_render_texture (CoglMaterial *material,
|
||||
const CoglColor *color,
|
||||
CoglPangoDisplayListNode *node)
|
||||
{
|
||||
@ -336,8 +336,8 @@ _cogl_pango_display_list_render_texture (CoglHandle material,
|
||||
void
|
||||
_cogl_pango_display_list_render (CoglPangoDisplayList *dl,
|
||||
const CoglColor *color,
|
||||
CoglHandle glyph_material,
|
||||
CoglHandle solid_material)
|
||||
CoglMaterial *glyph_material,
|
||||
CoglMaterial *solid_material)
|
||||
{
|
||||
GSList *l;
|
||||
|
||||
|
@ -58,8 +58,8 @@ void _cogl_pango_display_list_add_trapezoid (CoglPangoDisplayList *dl,
|
||||
|
||||
void _cogl_pango_display_list_render (CoglPangoDisplayList *dl,
|
||||
const CoglColor *color,
|
||||
CoglHandle glyph_material,
|
||||
CoglHandle solid_material);
|
||||
CoglMaterial *glyph_material,
|
||||
CoglMaterial *solid_material);
|
||||
|
||||
void _cogl_pango_display_list_clear (CoglPangoDisplayList *dl);
|
||||
|
||||
|
@ -44,9 +44,9 @@ struct _CoglPangoRenderer
|
||||
PangoRenderer parent_instance;
|
||||
|
||||
/* The material used to texture from the glyph cache with */
|
||||
CoglHandle glyph_material;
|
||||
CoglMaterial *glyph_material;
|
||||
/* The material used for solid fills. (boxes, rectangles + trapezoids) */
|
||||
CoglHandle solid_material;
|
||||
CoglMaterial *solid_material;
|
||||
|
||||
/* Caches of glyphs as textures */
|
||||
CoglPangoGlyphCache *glyph_cache;
|
||||
|
Loading…
Reference in New Issue
Block a user