isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-12-25 04:22:05 +00:00
Code Issues Packages Projects Releases Wiki 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -309,7 +309,7 @@ emit_vertex_buffer_geometry (CoglPangoDisplayListNode *node)
} }
static void static void
_cogl_pango_display_list_render_texture (CoglHandle material, _cogl_pango_display_list_render_texture (CoglMaterial *material,
const CoglColor *color, const CoglColor *color,
CoglPangoDisplayListNode *node) CoglPangoDisplayListNode *node)
{ {
@ -336,8 +336,8 @@ _cogl_pango_display_list_render_texture (CoglHandle material,
void void
_cogl_pango_display_list_render (CoglPangoDisplayList *dl, _cogl_pango_display_list_render (CoglPangoDisplayList *dl,
const CoglColor *color, const CoglColor *color,
CoglHandle glyph_material, CoglMaterial *glyph_material,
CoglHandle solid_material) CoglMaterial *solid_material)
{ {
GSList *l; 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, void _cogl_pango_display_list_render (CoglPangoDisplayList *dl,
const CoglColor *color, const CoglColor *color,
CoglHandle glyph_material, CoglMaterial *glyph_material,
CoglHandle solid_material); CoglMaterial *solid_material);
void _cogl_pango_display_list_clear (CoglPangoDisplayList *dl); 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; PangoRenderer parent_instance;
/* The material used to texture from the glyph cache with */ /* 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) */ /* The material used for solid fills. (boxes, rectangles + trapezoids) */
CoglHandle solid_material; CoglMaterial *solid_material;
/* Caches of glyphs as textures */ /* Caches of glyphs as textures */
CoglPangoGlyphCache *glyph_cache; CoglPangoGlyphCache *glyph_cache;