[cairo] [PATCH 20/51] drm: fixed call to _cairo_composite_rectangles_init_for_*()

[Enrico Weigelt, metux IT consult]

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

diff --git a/src/drm/cairo-drm-i915-glyphs.c b/src/drm/cairo-drm-i915-glyphs.c
index c41e23a..d43e246 100644
--- a/src/drm/cairo-drm-i915-glyphs.c
+++ b/src/drm/cairo-drm-i915-glyphs.c
@@ -301,8 +301,7 @@ i915_surface_glyphs (void			*abstract_surface,
 
     *num_remaining = 0;
     status = _cairo_composite_rectangles_init_for_glyphs (&extents,
-							  surface->intel.drm.width,
-							  surface->intel.drm.height,
+							  &(surface->intel.drm.base),
 							  op, source,
 							  scaled_font,
 							  glyphs, num_glyphs,
diff --git a/src/drm/cairo-drm-i915-surface.c b/src/drm/cairo-drm-i915-surface.c
index c212a59..8319db2 100644
--- a/src/drm/cairo-drm-i915-surface.c
+++ b/src/drm/cairo-drm-i915-surface.c
@@ -1893,10 +1893,12 @@ i915_surface_fill_with_alpha (void			*abstract_dst,
     cairo_int_status_t status;
 
     status = _cairo_composite_rectangles_init_for_fill (&extents,
-							dst->intel.drm.width,
-							dst->intel.drm.height,
-							op, source, path,
+							&(dst->intel.drm.base),
+							op,
+							source,
+							path,
 							clip);
+
     if (unlikely (status))
 	return status;
 
@@ -2009,9 +2011,9 @@ i915_surface_paint_with_alpha (void			*abstract_dst,
     cairo_status_t status;
 
     status = _cairo_composite_rectangles_init_for_paint (&extents,
-							 dst->intel.drm.width,
-							 dst->intel.drm.height,
-							 op, source,
+							 &(dst->intel.drm.base),
+							 op,
+							 source,
 							 clip);
     if (unlikely (status))
 	return status;
@@ -2105,9 +2107,11 @@ i915_surface_mask (void				*abstract_dst,
     }
 
     status = _cairo_composite_rectangles_init_for_mask (&extents,
-							dst->intel.drm.width,
-							dst->intel.drm.height,
-							op, source, mask, clip);
+							&(dst->intel.drm.base),
+							op,
+							source,
+							mask,
+							clip);
     if (unlikely (status))
 	return status;
 
@@ -2247,10 +2251,12 @@ i915_surface_stroke (void			*abstract_dst,
     cairo_int_status_t status;
 
     status = _cairo_composite_rectangles_init_for_stroke (&extents,
-							  dst->intel.drm.width,
-							  dst->intel.drm.height,
-							  op, source,
-							  path, stroke_style, ctm,
+							  &(dst->intel.drm.base),
+							  op,
+							  source,
+							  path,
+							  stroke_style,
+							  ctm,
 							  clip);
     if (unlikely (status))
 	return status;
diff --git a/src/drm/cairo-drm-i965-glyphs.c b/src/drm/cairo-drm-i965-glyphs.c
index 5adef39..106336d 100644
--- a/src/drm/cairo-drm-i965-glyphs.c
+++ b/src/drm/cairo-drm-i965-glyphs.c
@@ -242,8 +242,7 @@ i965_surface_glyphs (void			*abstract_surface,
 
     *num_remaining = 0;
     status = _cairo_composite_rectangles_init_for_glyphs (&extents,
-							  surface->intel.drm.width,
-							  surface->intel.drm.height,
+							  &(surface->intel.drm.base),
 							  op, source,
 							  scaled_font,
 							  g, num_glyphs,
diff --git a/src/drm/cairo-drm-i965-surface.c b/src/drm/cairo-drm-i965-surface.c
index 409c685..75c2157 100644
--- a/src/drm/cairo-drm-i965-surface.c
+++ b/src/drm/cairo-drm-i965-surface.c
@@ -1108,8 +1108,7 @@ i965_surface_paint (void			*abstract_dst,
     /* XXX unsupported operators? use pixel shader blending, eventually */
 
     status = _cairo_composite_rectangles_init_for_paint (&extents,
-							 dst->intel.drm.width,
-							 dst->intel.drm.height,
+							 &(dst->intel.drm.base),
 							 op, source,
 							 clip);
     if (unlikely (status))
@@ -1162,8 +1161,7 @@ i965_surface_mask (void				*abstract_dst,
     cairo_status_t status;
 
     status = _cairo_composite_rectangles_init_for_mask (&extents,
-							dst->intel.drm.width,
-							dst->intel.drm.height,
+							&(dst->intel.drm.base),
 							op, source, mask, clip);
     if (unlikely (status))
 	return status;
@@ -1303,8 +1301,7 @@ i965_surface_stroke (void			*abstract_dst,
     cairo_int_status_t status;
 
     status = _cairo_composite_rectangles_init_for_stroke (&extents,
-							  dst->intel.drm.width,
-							  dst->intel.drm.height,
+							  &(dst->intel.drm.base),
 							  op, source,
 							  path, stroke_style, ctm,
 							  clip);
@@ -1411,9 +1408,10 @@ i965_surface_fill (void			*abstract_dst,
     cairo_int_status_t status;
 
     status = _cairo_composite_rectangles_init_for_fill (&extents,
-							dst->intel.drm.width,
-							dst->intel.drm.height,
-							op, source, path,
+							&(dst->intel.drm.base),
+							op,
+							source,
+							path,
 							clip);
     if (unlikely (status))
 	return status;
-- 
2.6.4.442.g545299f