fdo-mirrors/cairo
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/cairo/cairo.git synced 2026-05-03 13:38:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

recording: Combine the clip to the recording + target surface extents

Browse source 
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2011-07-24 18:10:43 +01:00
parent 15d5014efd
commit 8dc9139fb2
3 changed files with 28 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
src/cairo-recording-surface.c
View file

@ -833,6 +833,9 @@ _cairo_recording_surface_replay_internal (cairo_surface_t *surface,
{
cairo_recording_surface_t *recording_surface;
cairo_command_t **elements;
cairo_bool_t replay_all =
type == CAIRO_RECORDING_REPLAY &&
region != CAIRO_RECORDING_REGION_ALL;
int i, num_elements;
cairo_int_status_t status;
cairo_surface_wrapper_t wrapper;
@ -850,13 +853,18 @@ _cairo_recording_surface_replay_internal (cairo_surface_t *surface,
return CAIRO_STATUS_SUCCESS;
assert (_cairo_surface_is_recording (surface));
recording_surface = (cairo_recording_surface_t *) surface;
_cairo_surface_wrapper_init (&wrapper, target);
_cairo_surface_wrapper_set_extents (&wrapper, surface_extents);
if (surface_extents)
_cairo_surface_wrapper_intersect_extents (&wrapper,
surface_extents);
if (! recording_surface->unbounded)
_cairo_surface_wrapper_intersect_extents (&wrapper,
&recording_surface->extents);
_cairo_surface_wrapper_set_inverse_transform (&wrapper, surface_transform);
_cairo_surface_wrapper_set_clip (&wrapper, target_clip);
recording_surface = (cairo_recording_surface_t *) surface;
status = CAIRO_STATUS_SUCCESS;
num_elements = recording_surface->commands.num_elements;
@ -864,25 +872,16 @@ _cairo_recording_surface_replay_internal (cairo_surface_t *surface,
for (i = recording_surface->replay_start_idx; i < num_elements; i++) {
cairo_command_t *command = elements[i];
cairo_clip_t *clip = command->header.clip;
if (type == CAIRO_RECORDING_REPLAY &&
region != CAIRO_RECORDING_REGION_ALL) {
if (command->header.region != region)
continue;
}
if (! recording_surface->unbounded)
clip = _cairo_clip_copy_intersect_rectangle (clip, &recording_surface->extents);
if (_cairo_clip_is_all_clipped (clip))
continue;
if (! replay_all && command->header.region != region)
continue;
switch (command->header.type) {
case CAIRO_COMMAND_PAINT:
status = _cairo_surface_wrapper_paint (&wrapper,
command->header.op,
&command->paint.source.base,
clip);
command->header.clip);
break;
case CAIRO_COMMAND_MASK:
@ -890,7 +889,7 @@ _cairo_recording_surface_replay_internal (cairo_surface_t *surface,
command->header.op,
&command->mask.source.base,
&command->mask.mask.base,
clip);
command->header.clip);
break;
case CAIRO_COMMAND_STROKE:
@ -903,7 +902,7 @@ _cairo_recording_surface_replay_internal (cairo_surface_t *surface,
&command->stroke.ctm_inverse,
command->stroke.tolerance,
command->stroke.antialias,
clip);
command->header.clip);
break;
case CAIRO_COMMAND_FILL:
@ -942,7 +941,7 @@ _cairo_recording_surface_replay_internal (cairo_surface_t *surface,
&stroke_command->stroke.ctm_inverse,
stroke_command->stroke.tolerance,
stroke_command->stroke.antialias,
clip);
command->header.clip);
i++;
}
}
@ -954,7 +953,7 @@ _cairo_recording_surface_replay_internal (cairo_surface_t *surface,
command->fill.fill_rule,
command->fill.tolerance,
command->fill.antialias,
clip);
command->header.clip);
}
break;
@ -967,7 +966,7 @@ _cairo_recording_surface_replay_internal (cairo_surface_t *surface,
command->show_text_glyphs.clusters, command->show_text_glyphs.num_clusters,
command->show_text_glyphs.cluster_flags,
command->show_text_glyphs.scaled_font,
clip);
command->header.clip);
break;
default:
@ -985,9 +984,6 @@ _cairo_recording_surface_replay_internal (cairo_surface_t *surface,
}
}
if (clip != command->header.clip)
_cairo_clip_destroy (clip);
if (unlikely (status))
break;
}

6
src/cairo-surface-wrapper-private.h
View file

@ -60,8 +60,8 @@ _cairo_surface_wrapper_init (cairo_surface_wrapper_t *wrapper,
cairo_surface_t *target);
cairo_private void
_cairo_surface_wrapper_set_extents (cairo_surface_wrapper_t *wrapper,
const cairo_rectangle_int_t *extents);
_cairo_surface_wrapper_intersect_extents (cairo_surface_wrapper_t *wrapper,
const cairo_rectangle_int_t *extents);
cairo_private void
_cairo_surface_wrapper_set_inverse_transform (cairo_surface_wrapper_t *wrapper,
@ -123,7 +123,7 @@ _cairo_surface_wrapper_fill_stroke (cairo_surface_wrapper_t *wrapper,
cairo_fill_rule_t fill_rule,
double fill_tolerance,
cairo_antialias_t fill_antialias,
cairo_path_fixed_t *path,
const cairo_path_fixed_t*path,
cairo_operator_t stroke_op,
const cairo_pattern_t *stroke_source,
const cairo_stroke_style_t *stroke_style,

15
src/cairo-surface-wrapper.c
View file

@ -256,7 +256,7 @@ _cairo_surface_wrapper_fill_stroke (cairo_surface_wrapper_t *wrapper,
cairo_fill_rule_t fill_rule,
double fill_tolerance,
cairo_antialias_t fill_antialias,
cairo_path_fixed_t *path,
const cairo_path_fixed_t*path,
cairo_operator_t stroke_op,
const cairo_pattern_t *stroke_source,
const cairo_stroke_style_t *stroke_style,
@ -267,7 +267,7 @@ _cairo_surface_wrapper_fill_stroke (cairo_surface_wrapper_t *wrapper,
const cairo_clip_t *clip)
{
cairo_status_t status;
cairo_path_fixed_t path_copy, *dev_path = path;
cairo_path_fixed_t path_copy, *dev_path = (cairo_path_fixed_t *)path;
cairo_matrix_t dev_ctm = *stroke_ctm;
cairo_matrix_t dev_ctm_inverse = *stroke_ctm_inverse;
cairo_clip_t *dev_clip;
@ -494,15 +494,14 @@ _cairo_surface_wrapper_needs_device_transform (cairo_surface_wrapper_t *wrapper)
}
void
_cairo_surface_wrapper_set_extents (cairo_surface_wrapper_t *wrapper,
const cairo_rectangle_int_t *extents)
_cairo_surface_wrapper_intersect_extents (cairo_surface_wrapper_t *wrapper,
const cairo_rectangle_int_t *extents)
{
if (extents != NULL) {
if (! wrapper->has_extents) {
wrapper->extents = *extents;
wrapper->has_extents = TRUE;
} else {
wrapper->has_extents = FALSE;
}
} else
_cairo_rectangle_intersect (&wrapper->extents, extents);
wrapper->needs_transform =
_cairo_surface_wrapper_needs_device_transform (wrapper);