sungmg/mutter-performance-source
1
0
Fork 0
Code Activity

pango: Use CoglMaterial type for materials

Browse source 
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:
Robert Bragg 2010-10-27 12:43:36 +01:00
parent e673de0b55
commit 47ceb34ba9
3 changed files with 7 additions and 7 deletions

6
pango/cogl-pango-display-list.c
View file

@ -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;

4
pango/cogl-pango-display-list.h
View file

@ -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);

4
pango/cogl-pango-render.c
View file

@ -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;