[cairo] [PATCH 28/72] drm: fixed prototype of surface_backend => show_glyphs() operations

Enrico Weigelt, metux IT consult enrico.weigelt at gr13.net
Tue Dec 29 01:17:06 PST 2015


These operations dont have the num_remaining paramter anymore,
the DRM backend(s) haven't been updated yet.

Signed-off-by: Enrico Weigelt, metux IT consult <enrico.weigelt at gr13.net>
---
 src/drm/cairo-drm-i965-glyphs.c   | 4 +---
 src/drm/cairo-drm-i965-private.h  | 3 +--
 src/drm/cairo-drm-intel-surface.c | 4 +---
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/drm/cairo-drm-i965-glyphs.c b/src/drm/cairo-drm-i965-glyphs.c
index a19cdbe..5d1abb6 100644
--- a/src/drm/cairo-drm-i965-glyphs.c
+++ b/src/drm/cairo-drm-i965-glyphs.c
@@ -222,8 +222,7 @@ i965_surface_glyphs (void			*abstract_surface,
 		     cairo_glyph_t		*g,
 		     int			 num_glyphs,
 		     cairo_scaled_font_t	*scaled_font,
-		     const cairo_clip_t		*clip,
-		     int *num_remaining)
+		     const cairo_clip_t		*clip)
 {
     i965_surface_t *surface = cairo_abstract_surface_cast_i965(abstract_surface);
     i965_surface_t *mask = NULL;
@@ -240,7 +239,6 @@ i965_surface_glyphs (void			*abstract_surface,
     int mask_x = 0, mask_y = 0;
     int i = 0;
 
-    *num_remaining = 0;
     status = _cairo_composite_rectangles_init_for_glyphs (&extents,
 							  &(surface->intel.drm.base),
 							  op, source,
diff --git a/src/drm/cairo-drm-i965-private.h b/src/drm/cairo-drm-i965-private.h
index 6ce39f3..9c562a1 100644
--- a/src/drm/cairo-drm-i965-private.h
+++ b/src/drm/cairo-drm-i965-private.h
@@ -695,8 +695,7 @@ i965_surface_glyphs (void			*abstract_surface,
 		     cairo_glyph_t		*glyphs,
 		     int			 num_glyphs,
 		     cairo_scaled_font_t	*scaled_font,
-		     const cairo_clip_t		*clip,
-		     int *num_remaining);
+		     const cairo_clip_t		*clip);
 
 cairo_private void
 i965_shader_init (i965_shader_t *shader,
diff --git a/src/drm/cairo-drm-intel-surface.c b/src/drm/cairo-drm-intel-surface.c
index 7b6b07c..ca4da31 100644
--- a/src/drm/cairo-drm-intel-surface.c
+++ b/src/drm/cairo-drm-intel-surface.c
@@ -243,10 +243,8 @@ intel_surface_glyphs (void			*abstract_surface,
 		      cairo_glyph_t		*glyphs,
 		      int			 num_glyphs,
 		      cairo_scaled_font_t	*scaled_font,
-		      const cairo_clip_t	*clip,
-		      int *num_remaining)
+		      const cairo_clip_t	*clip)
 {
-    *num_remaining = 0;
     return _cairo_surface_show_text_glyphs (intel_surface_map_to_image (abstract_surface),
 					    op, source,
 					    NULL, 0,
-- 
2.6.4.442.g545299f



More information about the cairo mailing list