[cairo] [PATCH 29/41] drm/i915: fixed surface backend ops vectors
Enrico Weigelt, metux IT consult
enrico.weigelt at gr13.net
Thu Dec 10 14:17:05 PST 2015
The struct layout has changed, but 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-surface.c | 47 ++++++++++++----------------------------
1 file changed, 14 insertions(+), 33 deletions(-)
diff --git a/src/drm/cairo-drm-i915-surface.c b/src/drm/cairo-drm-i915-surface.c
index b71b73b..7b40278 100644
--- a/src/drm/cairo-drm-i915-surface.c
+++ b/src/drm/cairo-drm-i915-surface.c
@@ -2351,39 +2351,20 @@ i915_surface_fill (void *abstract_dst,
}
static const cairo_surface_backend_t i915_surface_backend = {
- CAIRO_SURFACE_TYPE_DRM,
- _cairo_default_context_create,
-
- i915_surface_create_similar,
- i915_surface_finish,
-
- NULL,
- intel_surface_acquire_source_image,
- intel_surface_release_source_image,
-
- NULL, NULL, NULL,
- NULL, /* composite */
- NULL, /* fill */
- NULL, /* trapezoids */
- NULL, /* span */
- NULL, /* check-span */
-
- NULL, /* copy_page */
- NULL, /* show_page */
- _cairo_drm_surface_get_extents,
- NULL, /* old-glyphs */
- _cairo_drm_surface_get_font_options,
-
- i915_surface_flush,
- NULL, /* mark_dirty */
- intel_scaled_font_fini,
- intel_scaled_glyph_fini,
-
- i915_surface_paint,
- i915_surface_mask,
- i915_surface_stroke,
- i915_surface_fill,
- i915_surface_glyphs,
+ .type = CAIRO_SURFACE_TYPE_DRM,
+ .create_context = _cairo_default_context_create,
+ .create_similar = i915_surface_create_similar,
+ .finish = i915_surface_finish,
+ .acquire_source_image = intel_surface_acquire_source_image,
+ .release_source_image = intel_surface_release_source_image,
+ .get_extents = _cairo_drm_surface_get_extents,
+ .get_font_options = _cairo_drm_surface_get_font_options,
+ .flush = i915_surface_flush,
+ .paint = i915_surface_paint,
+ .mask = i915_surface_mask,
+ .stroke = i915_surface_stroke,
+ .fill = i915_surface_fill,
+ .show_glyphs = i915_surface_glyphs,
};
static void
--
2.6.4.442.g545299f
More information about the cairo
mailing list