isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-24 17:10:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

clutter/stage-cogl: Cleanup damage history (un-)scaling a bit

Browse Source 
Reverting the scale and offset applied to the damage history can be done
in one step, using a few less temporary allocations by passing the
offset right away to a new scale_offset_and_clamp_region() function.

https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1113
This commit is contained in:
Jonas Dreßler 2020-05-13 11:04:12 +02:00 committed by Jonas Ådahl
parent 434845dbe5
commit fbfa136bbb
1 changed files with 41 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
clutter/clutter/cogl/clutter-stage-cogl.c
View File

@ -466,6 +466,42 @@ offset_scale_and_clamp_region (const cairo_region_t *region,
return cairo_region_create_rectangles (rects, n_rects); return cairo_region_create_rectangles (rects, n_rects);
} }
static cairo_region_t *
scale_offset_and_clamp_region (const cairo_region_t *region,
float scale,
int offset_x,
int offset_y)
{
int n_rects, i;
cairo_rectangle_int_t *rects;
g_autofree cairo_rectangle_int_t *freeme = NULL;
n_rects = cairo_region_num_rectangles (region);
if (n_rects == 0)
return cairo_region_create ();
if (n_rects < MAX_STACK_RECTS)
rects = g_newa (cairo_rectangle_int_t, n_rects);
else
rects = freeme = g_new (cairo_rectangle_int_t, n_rects);
for (i = 0; i < n_rects; i++)
{
cairo_rectangle_int_t *rect = &rects[i];
graphene_rect_t tmp;
cairo_region_get_rectangle (region, i, rect);
_clutter_util_rect_from_rectangle (rect, &tmp);
graphene_rect_scale (&tmp, scale, scale, &tmp);
graphene_rect_offset (&tmp, offset_x, offset_y);
_clutter_util_rectangle_int_extents (&tmp, rect);
}
return cairo_region_create_rectangles (rects, n_rects);
}
static void static void
paint_stage (ClutterStageCogl *stage_cogl, paint_stage (ClutterStageCogl *stage_cogl,
ClutterStageView *view, ClutterStageView *view,
@ -668,12 +704,12 @@ clutter_stage_cogl_redraw_view (ClutterStageWindow *stage_window,
/* Update the fb clip region with the extra damage. */ /* Update the fb clip region with the extra damage. */
cairo_region_union (fb_clip_region, fb_damage); cairo_region_union (fb_clip_region, fb_damage);
view_damage = offset_scale_and_clamp_region (fb_damage, /* Update the redraw clip with the extra damage done to the view */
0, 0, view_damage = scale_offset_and_clamp_region (fb_damage,
1.0f / fb_scale); 1.0f / fb_scale,
cairo_region_translate (view_damage, view_rect.x, view_rect.y); view_rect.x,
view_rect.y);
/* Update the redraw clip region with the extra damage. */
cairo_region_union (redraw_clip, view_damage); cairo_region_union (redraw_clip, view_damage);
cairo_region_destroy (view_damage); cairo_region_destroy (view_damage);