[cairo] [PATCH 25/41] drm/i915: fixed prototype of surface_backend => show_glyphs() operations

Enrico Weigelt, metux IT consult enrico.weigelt at gr13.net
Thu Dec 10 14:17:01 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-i915-glyphs.c  | 4 +---
 src/drm/cairo-drm-i915-private.h | 3 +--
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/drm/cairo-drm-i915-glyphs.c b/src/drm/cairo-drm-i915-glyphs.c
index 5434578..3359b21 100644
--- a/src/drm/cairo-drm-i915-glyphs.c
+++ b/src/drm/cairo-drm-i915-glyphs.c
@@ -280,8 +280,7 @@ i915_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)
 {
     i915_surface_t *surface = abstract_surface;
     i915_surface_t *mask = NULL;
@@ -299,7 +298,6 @@ i915_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.width,
 							  surface->intel.drm.height,
diff --git a/src/drm/cairo-drm-i915-private.h b/src/drm/cairo-drm-i915-private.h
index fc157c6..d9b1935 100644
--- a/src/drm/cairo-drm-i915-private.h
+++ b/src/drm/cairo-drm-i915-private.h
@@ -900,8 +900,7 @@ i915_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);
 
 static inline int cairo_const
 i915_tiling_height (uint32_t tiling, int height)
-- 
2.6.4.442.g545299f



More information about the cairo mailing list