[PATCH weston v9 52/62] compositor-drm: Rename region variable

Daniel Stone daniels at collabora.com
Fri Mar 3 23:06:03 UTC 2017


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

Signed-off-by: Daniel Stone <daniels at collabora.com>

Differential Revision: https://phabricator.freedesktop.org/D1528

Signed-off-by: Daniel Stone <daniels at collabora.com>
---
 libweston/compositor-drm.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/libweston/compositor-drm.c b/libweston/compositor-drm.c
index 5810ad7..0b71d5b 100644
--- a/libweston/compositor-drm.c
+++ b/libweston/compositor-drm.c
@@ -2828,7 +2828,7 @@ drm_assign_planes(struct weston_output *output_base, void *repaint_data)
 	struct drm_output_state *state;
 	struct drm_plane_state *plane_state;
 	struct weston_view *ev;
-	pixman_region32_t overlap, surface_overlap;
+	pixman_region32_t surface_overlap, renderer_region;
 	struct weston_plane *primary, *next_plane;
 
 	assert(!output->state_last);
@@ -2849,7 +2849,7 @@ drm_assign_planes(struct weston_output *output_base, void *repaint_data)
 	 * the client buffer can be used directly for the sprite surface
 	 * as we do for flipping full screen surfaces.
 	 */
-	pixman_region32_init(&overlap);
+	pixman_region32_init(&renderer_region);
 	primary = &output_base->compositor->primary_plane;
 
 	wl_list_for_each(ev, &output_base->compositor->view_list, link) {
@@ -2873,7 +2873,7 @@ drm_assign_planes(struct weston_output *output_base, void *repaint_data)
 			es->keep_buffer = false;
 
 		pixman_region32_init(&surface_overlap);
-		pixman_region32_intersect(&surface_overlap, &overlap,
+		pixman_region32_intersect(&surface_overlap, &renderer_region,
 					  &ev->transform.boundingbox);
 
 		next_plane = NULL;
@@ -2891,7 +2891,8 @@ drm_assign_planes(struct weston_output *output_base, void *repaint_data)
 		weston_view_move_to_plane(ev, next_plane);
 
 		if (next_plane == primary)
-			pixman_region32_union(&overlap, &overlap,
+			pixman_region32_union(&renderer_region,
+					      &renderer_region,
 					      &ev->transform.boundingbox);
 
 		if (next_plane == primary ||
@@ -2908,7 +2909,7 @@ drm_assign_planes(struct weston_output *output_base, void *repaint_data)
 
 		pixman_region32_fini(&surface_overlap);
 	}
-	pixman_region32_fini(&overlap);
+	pixman_region32_fini(&renderer_region);
 
 	/* We rely on ev->cursor_view being both an accurate reflection of the
 	 * cursor plane's state, but also being maintained across repaints to
-- 
2.9.3



More information about the wayland-devel mailing list