mainnika
/
weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

compositor-drm: Rename region variable

Browse Source 
Make it a bit more clear what the purpose of the variable is.

Signed-off-by: Daniel Stone <daniels@collabora.com>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
dev
Daniel Stone 8 years ago
parent c3fcb5bed5
commit 115ed2c011
1 changed files with 6 additions and 5 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 11
      libweston/compositor-drm.c

11
libweston/compositor-drm.c
Unescape View File

@ -3062,7 +3062,7 @@ drm_assign_planes(struct weston_output *output_base, void *repaint_data)
struct drm_output_state *state; struct drm_output_state *state;
struct drm_plane_state *plane_state; struct drm_plane_state *plane_state;
struct weston_view *ev; struct weston_view *ev;
pixman_region32_t overlap, surface_overlap; pixman_region32_t surface_overlap, renderer_region;
struct weston_plane *primary, *next_plane; struct weston_plane *primary, *next_plane;
bool picked_scanout = false; bool picked_scanout = false;
@ -3084,7 +3084,7 @@ drm_assign_planes(struct weston_output *output_base, void *repaint_data)
* the client buffer can be used directly for the sprite surface * the client buffer can be used directly for the sprite surface
* as we do for flipping full screen surfaces. * as we do for flipping full screen surfaces.
*/ */
pixman_region32_init(&overlap); pixman_region32_init(&renderer_region);
primary = &output_base->compositor->primary_plane; primary = &output_base->compositor->primary_plane;
wl_list_for_each(ev, &output_base->compositor->view_list, link) { wl_list_for_each(ev, &output_base->compositor->view_list, link) {
@ -3108,7 +3108,7 @@ drm_assign_planes(struct weston_output *output_base, void *repaint_data)
es->keep_buffer = false; es->keep_buffer = false;
pixman_region32_init(&surface_overlap); pixman_region32_init(&surface_overlap);
pixman_region32_intersect(&surface_overlap, &overlap, pixman_region32_intersect(&surface_overlap, &renderer_region,
&ev->transform.boundingbox); &ev->transform.boundingbox);
next_plane = NULL; next_plane = NULL;
@ -3135,7 +3135,8 @@ drm_assign_planes(struct weston_output *output_base, void *repaint_data)
weston_view_move_to_plane(ev, next_plane); weston_view_move_to_plane(ev, next_plane);
if (next_plane == primary) if (next_plane == primary)
pixman_region32_union(&overlap, &overlap, pixman_region32_union(&renderer_region,
&renderer_region,
&ev->transform.boundingbox); &ev->transform.boundingbox);
if (next_plane == primary || if (next_plane == primary ||
@ -3152,7 +3153,7 @@ drm_assign_planes(struct weston_output *output_base, void *repaint_data)
pixman_region32_fini(&surface_overlap); pixman_region32_fini(&surface_overlap);
} }
pixman_region32_fini(&overlap); pixman_region32_fini(&renderer_region);
/* We rely on output->cursor_view being both an accurate reflection of /* We rely on output->cursor_view being both an accurate reflection of
* the cursor plane's state, but also being maintained across repaints * the cursor plane's state, but also being maintained across repaints

Write Preview
Loading…
Cancel
Save