[cairo] [PATCH v8 32/71] drm: fixed surface backend ops vectors

[Enrico Weigelt, metux IT consult]

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 ++++++++++++--------------------------
 src/drm/cairo-drm-radeon-surface.c | 46 ++++++++++++-------------------------
 2 files changed, 28 insertions(+), 65 deletions(-)

diff --git a/src/drm/cairo-drm-i915-surface.c b/src/drm/cairo-drm-i915-surface.c
index 7c8c358..e886fdc 100644
--- a/src/drm/cairo-drm-i915-surface.c
+++ b/src/drm/cairo-drm-i915-surface.c
@@ -2357,39 +2357,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
diff --git a/src/drm/cairo-drm-radeon-surface.c b/src/drm/cairo-drm-radeon-surface.c
index bbc493a..d213df5 100644
--- a/src/drm/cairo-drm-radeon-surface.c
+++ b/src/drm/cairo-drm-radeon-surface.c
@@ -246,38 +246,20 @@ radeon_surface_glyphs (void			*abstract_surface,
 }
 
 static const cairo_surface_backend_t radeon_surface_backend = {
-    CAIRO_SURFACE_TYPE_DRM,
-    _cairo_default_context_create,
-
-    radeon_surface_create_similar,
-    radeon_surface_finish,
-
-    NULL,
-    radeon_surface_acquire_source_image,
-    radeon_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,
-
-    radeon_surface_flush,
-    NULL, /* mark dirty */
-    NULL, NULL, /* font/glyph fini */
-
-    radeon_surface_paint,
-    radeon_surface_mask,
-    radeon_surface_stroke,
-    radeon_surface_fill,
-    radeon_surface_glyphs,
+    .type			= CAIRO_SURFACE_TYPE_DRM,
+    .create_context		= _cairo_default_context_create,
+    .create_similar		= radeon_surface_create_similar,
+    .finish			= radeon_surface_finish,
+    .acquire_source_image	= radeon_surface_acquire_source_image,
+    .release_source_image	= radeon_surface_release_source_image,
+    .get_extents		= _cairo_drm_surface_get_extents,
+    .get_font_options		= _cairo_drm_surface_get_font_options,
+    .flush			= radeon_surface_flush,
+    .paint			= radeon_surface_paint,
+    .mask			= radeon_surface_mask,
+    .stroke			= radeon_surface_stroke,
+    .fill			= radeon_surface_fill,
+    .show_glyphs		= radeon_surface_glyphs,
 };
 
 static void
-- 
2.6.4.442.g545299f