[cairo] [PATCH v8 34/71] drm: fixed prototypes of surface_backend => show_glyphs() operations
Enrico Weigelt, metux IT consult
enrico.weigelt at gr13.net
Thu Jun 30 15:46:12 UTC 2016
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 +--
src/drm/cairo-drm-radeon-surface.c | 4 +---
3 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/src/drm/cairo-drm-i915-glyphs.c b/src/drm/cairo-drm-i915-glyphs.c
index 1787f96..a8a790e 100644
--- a/src/drm/cairo-drm-i915-glyphs.c
+++ b/src/drm/cairo-drm-i915-glyphs.c
@@ -296,8 +296,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 = _cairo_abstract_surface_cast_i915 (abstract_surface);
i915_surface_t *mask = NULL;
@@ -315,7 +314,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.base,
op, source,
diff --git a/src/drm/cairo-drm-i915-private.h b/src/drm/cairo-drm-i915-private.h
index 0f2ce91..fee7e08 100644
--- a/src/drm/cairo-drm-i915-private.h
+++ b/src/drm/cairo-drm-i915-private.h
@@ -940,8 +940,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)
diff --git a/src/drm/cairo-drm-radeon-surface.c b/src/drm/cairo-drm-radeon-surface.c
index 926b524..6406e53 100644
--- a/src/drm/cairo-drm-radeon-surface.c
+++ b/src/drm/cairo-drm-radeon-surface.c
@@ -233,10 +233,8 @@ radeon_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 (radeon_surface_map_to_image (abstract_surface),
op, source,
NULL, 0,
--
2.6.4.442.g545299f
More information about the cairo
mailing list