[cairo] [PATCH 24/41] drm/i915: fixed const constraints
Enrico Weigelt, metux IT consult
enrico.weigelt at gr13.net
Thu Dec 10 14:17:00 PST 2015
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 | 8 ++++----
src/drm/cairo-drm-i915-shader.c | 2 +-
src/drm/cairo-drm-i915-spans.c | 2 +-
src/drm/cairo-drm-i915-surface.c | 28 ++++++++++++++--------------
5 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/src/drm/cairo-drm-i915-glyphs.c b/src/drm/cairo-drm-i915-glyphs.c
index 8bb10eb..5434578 100644
--- a/src/drm/cairo-drm-i915-glyphs.c
+++ b/src/drm/cairo-drm-i915-glyphs.c
@@ -183,7 +183,7 @@ i915_surface_mask_internal (i915_surface_t *dst,
cairo_operator_t op,
const cairo_pattern_t *source,
i915_surface_t *mask,
- cairo_clip_t *clip,
+ const cairo_clip_t *clip,
const cairo_composite_rectangles_t *extents)
{
i915_device_t *device;
@@ -280,7 +280,7 @@ i915_surface_glyphs (void *abstract_surface,
cairo_glyph_t *glyphs,
int num_glyphs,
cairo_scaled_font_t *scaled_font,
- cairo_clip_t *clip,
+ const cairo_clip_t *clip,
int *num_remaining)
{
i915_surface_t *surface = abstract_surface;
diff --git a/src/drm/cairo-drm-i915-private.h b/src/drm/cairo-drm-i915-private.h
index c750cf4..fc157c6 100644
--- a/src/drm/cairo-drm-i915-private.h
+++ b/src/drm/cairo-drm-i915-private.h
@@ -876,7 +876,7 @@ i915_clip_and_composite_spans (i915_surface_t *dst,
i915_spans_func_t draw_func,
void *draw_closure,
const cairo_composite_rectangles_t*extents,
- cairo_clip_t *clip,
+ const cairo_clip_t *clip,
double opacity);
cairo_private cairo_surface_t *
@@ -900,7 +900,7 @@ i915_surface_glyphs (void *abstract_surface,
cairo_glyph_t *glyphs,
int num_glyphs,
cairo_scaled_font_t *scaled_font,
- cairo_clip_t *clip,
+ const cairo_clip_t *clip,
int *num_remaining);
static inline int cairo_const
@@ -1204,7 +1204,7 @@ i915_shader_acquire_pattern (i915_shader_t *shader,
cairo_private void
i915_shader_set_clip (i915_shader_t *shader,
- cairo_clip_t *clip);
+ const cairo_clip_t *clip);
cairo_private int
i915_shader_num_texcoords (const i915_shader_t *shader);
@@ -1226,7 +1226,7 @@ i915_shader_fini (i915_shader_t *shader);
cairo_private cairo_status_t
i915_fixup_unbounded (i915_surface_t *dst,
const cairo_composite_rectangles_t *extents,
- cairo_clip_t *clip);
+ const cairo_clip_t *clip);
static inline cairo_bool_t
i915_surface_needs_tiling (i915_surface_t *dst)
diff --git a/src/drm/cairo-drm-i915-shader.c b/src/drm/cairo-drm-i915-shader.c
index 85aa984..8502ce2 100644
--- a/src/drm/cairo-drm-i915-shader.c
+++ b/src/drm/cairo-drm-i915-shader.c
@@ -2499,7 +2499,7 @@ i915_shader_fini (i915_shader_t *shader)
void
i915_shader_set_clip (i915_shader_t *shader,
- cairo_clip_t *clip)
+ const cairo_clip_t *clip)
{
cairo_surface_t *clip_surface;
int clip_x, clip_y;
diff --git a/src/drm/cairo-drm-i915-spans.c b/src/drm/cairo-drm-i915-spans.c
index b3f4e0a..10f3b32 100644
--- a/src/drm/cairo-drm-i915-spans.c
+++ b/src/drm/cairo-drm-i915-spans.c
@@ -681,7 +681,7 @@ i915_clip_and_composite_spans (i915_surface_t *dst,
i915_spans_func_t draw_func,
void *draw_closure,
const cairo_composite_rectangles_t*extents,
- cairo_clip_t *clip,
+ const cairo_clip_t *clip,
double opacity)
{
i915_spans_t spans;
diff --git a/src/drm/cairo-drm-i915-surface.c b/src/drm/cairo-drm-i915-surface.c
index e1990f6..8b66ca3 100644
--- a/src/drm/cairo-drm-i915-surface.c
+++ b/src/drm/cairo-drm-i915-surface.c
@@ -777,7 +777,7 @@ CLEANUP:
cairo_status_t
i915_fixup_unbounded (i915_surface_t *dst,
const cairo_composite_rectangles_t *extents,
- cairo_clip_t *clip)
+ const cairo_clip_t *clip)
{
i915_shader_t shader;
i915_device_t *device;
@@ -879,7 +879,7 @@ i915_fixup_unbounded (i915_surface_t *dst,
static cairo_status_t
i915_fixup_unbounded_boxes (i915_surface_t *dst,
const cairo_composite_rectangles_t *extents,
- cairo_clip_t *clip,
+ const cairo_clip_t *clip,
cairo_boxes_t *boxes)
{
cairo_boxes_t clear;
@@ -1570,7 +1570,7 @@ _composite_boxes (i915_surface_t *dst,
const cairo_pattern_t *pattern,
cairo_boxes_t *boxes,
cairo_antialias_t antialias,
- cairo_clip_t *clip,
+ const cairo_clip_t *clip,
double opacity,
const cairo_composite_rectangles_t *extents)
{
@@ -1769,7 +1769,7 @@ _clip_and_composite_boxes (i915_surface_t *dst,
cairo_boxes_t *boxes,
cairo_antialias_t antialias,
const cairo_composite_rectangles_t *extents,
- cairo_clip_t *clip,
+ const cairo_clip_t *clip,
double opacity)
{
cairo_int_status_t status;
@@ -1817,7 +1817,7 @@ _clip_and_composite_boxes (i915_surface_t *dst,
}
static cairo_clip_path_t *
-_clip_get_solitary_path (cairo_clip_t *clip)
+_clip_get_solitary_path (const cairo_clip_t *clip)
{
cairo_clip_path_t *iter = clip->path;
cairo_clip_path_t *path = NULL;
@@ -1871,11 +1871,11 @@ static cairo_int_status_t
i915_surface_fill_with_alpha (void *abstract_dst,
cairo_operator_t op,
const cairo_pattern_t *source,
- cairo_path_fixed_t *path,
+ const cairo_path_fixed_t *path,
cairo_fill_rule_t fill_rule,
double tolerance,
cairo_antialias_t antialias,
- cairo_clip_t *clip,
+ const cairo_clip_t *clip,
double opacity)
{
i915_surface_t *dst = abstract_dst;
@@ -1990,7 +1990,7 @@ static cairo_int_status_t
i915_surface_paint_with_alpha (void *abstract_dst,
cairo_operator_t op,
const cairo_pattern_t *source,
- cairo_clip_t *clip,
+ const cairo_clip_t *clip,
double opacity)
{
i915_surface_t *dst = abstract_dst;
@@ -2063,7 +2063,7 @@ static cairo_int_status_t
i915_surface_paint (void *abstract_dst,
cairo_operator_t op,
const cairo_pattern_t *source,
- cairo_clip_t *clip)
+ const cairo_clip_t *clip)
{
i915_surface_t *dst = abstract_dst;
@@ -2082,7 +2082,7 @@ i915_surface_mask (void *abstract_dst,
cairo_operator_t op,
const cairo_pattern_t *source,
const cairo_pattern_t *mask,
- cairo_clip_t *clip)
+ const cairo_clip_t *clip)
{
i915_surface_t *dst = abstract_dst;
i915_device_t *device;
@@ -2224,13 +2224,13 @@ static cairo_int_status_t
i915_surface_stroke (void *abstract_dst,
cairo_operator_t op,
const cairo_pattern_t *source,
- cairo_path_fixed_t *path,
+ const cairo_path_fixed_t *path,
const cairo_stroke_style_t *stroke_style,
const cairo_matrix_t *ctm,
const cairo_matrix_t *ctm_inverse,
double tolerance,
cairo_antialias_t antialias,
- cairo_clip_t *clip)
+ const cairo_clip_t *clip)
{
i915_surface_t *dst = abstract_dst;
cairo_composite_rectangles_t extents;
@@ -2335,11 +2335,11 @@ static cairo_int_status_t
i915_surface_fill (void *abstract_dst,
cairo_operator_t op,
const cairo_pattern_t*source,
- cairo_path_fixed_t *path,
+ const cairo_path_fixed_t *path,
cairo_fill_rule_t fill_rule,
double tolerance,
cairo_antialias_t antialias,
- cairo_clip_t *clip)
+ const cairo_clip_t *clip)
{
return i915_surface_fill_with_alpha (abstract_dst, op, source, path, fill_rule, tolerance, antialias, clip, 1.);
}
--
2.6.4.442.g545299f
More information about the cairo
mailing list