From: Ander Conselvan de Oliveira <conselvan2@gmail.com>
Date: Tue, 26 Jun 2012 14:09:12 +0000 (+0300)
Subject: compositor-drm: Check surface's outputs when assigning overlays
X-Git-Tag: 0.95.0~116
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d450b1901fcec3bb38b11800c2d435f38354344b;p=platform%2Fupstream%2Fweston.git

compositor-drm: Check surface's outputs when assigning overlays

Check if the output passed to drm_output_prepare_overlay_surface() does
actually contain the surface and fail if it doesn't. Also fail if a
surface spans multiple outputs since clearing the damage will cause the
portion that is not in an overlay to not be updated at all.
---

diff --git a/src/compositor-drm.c b/src/compositor-drm.c
index 42d971f..5543462 100644
--- a/src/compositor-drm.c
+++ b/src/compositor-drm.c
@@ -530,6 +530,9 @@ drm_output_prepare_overlay_surface(struct weston_output *output_base,
 	if (c->sprites_are_broken)
 		return -1;
 
+	if (es->output_mask != (1u << output_base->id))
+		return -1;
+
 	if (surface_is_primary(ec, es))
 		return -1;