[PATCH weston v10 16/61] compositor-drm: Rename drm_sprite to drm_plane

[Pekka Paalanen]

On Tue,  4 Apr 2017 17:54:34 +0100
Daniel Stone <daniels at collabora.com> wrote:

> We make the differentiation where planes are an abstract framebuffer
> with a position within a CRTC/output, and sprites are special cases of
> planes that are neither the primary (base/framebuffer) nor cursor plane.
> 
> drm_sprite, OTOH, contains nothing that's actually specific to sprites,
> and we end up duplicating a lot of code to deal with them, especially
> when we come to use an entirely plane-based interface with atomic
> modesetting.
> 
> Rename drm_sprite to drm_plane, to reflect that it's actually generic.
> 
> No functional changes.
> 
> Signed-off-by: Daniel Stone <daniels at collabora.com>
> Reviewed-by: Pekka Paalanen <pekka.paalanen at collabora.co.uk>
> Reviewed-by: Quentin Glidic <sardemff7+git at sardemff7.net>
> 
> Differential Revision: https://phabricator.freedesktop.org/D1408
> 
> Signed-off-by: Daniel Stone <daniels at collabora.com>

Tags. Tags!

> ---
>  libweston/compositor-drm.c | 203 +++++++++++++++++++++++----------------------
>  1 file changed, 106 insertions(+), 97 deletions(-)
> 
> diff --git a/libweston/compositor-drm.c b/libweston/compositor-drm.c
> index 88975007..8a8dd1c2 100644
> --- a/libweston/compositor-drm.c
> +++ b/libweston/compositor-drm.c

> @@ -902,10 +913,8 @@ drm_output_repaint(struct weston_output *output_base,
>  			.request.sequence = 1,
>  		};
>  
> -		/* XXX: Set output much earlier, so we don't attempt to place
> -		 *      planes on entirely the wrong output. */

What a strange commit to remove this comment in.

>  		if ((!s->fb_current && !s->fb_pending) ||
> -		    !drm_sprite_crtc_supported(output, s))
> +		    !drm_plane_crtc_supported(output, s))
>  			continue;
>  
>  		if (s->fb_pending && !backend->sprites_hidden)

I could point out several more renames that were inconsistenly left
undone, but I won't. :-)


Thanks,
pq


Friday. Whee.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 833 bytes
Desc: OpenPGP digital signature
URL: <https://lists.freedesktop.org/archives/wayland-devel/attachments/20170407/27a404ca/attachment.sig>