[PATCH weston] compositor: Move buffer damage fields from weston_output to gl-renderer

Kristian Høgsberg hoegsberg at gmail.com
Fri Nov 16 16:09:04 PST 2012


On Fri, Nov 16, 2012 at 05:50:38PM +0200, Ander Conselvan de Oliveira wrote:
> On 11/16/2012 05:37 PM, Pekka Paalanen wrote:
> >On Fri, 16 Nov 2012 17:23:52 +0200
> >Ander Conselvan de Oliveira <ander.conselvan.de.oliveira at intel.com>
> >wrote:
> >
> >>Move fields current_buffer and buffer_damage out of weston_output into
> >>gl_output_state, since they are actually specific to the renderer.
> >>
> >>Also bring back the previous_damage field so that the screenshooter
> >>can get the damage for the previous frame in a renderer independent
> >>way.
> >>---
> >>  src/compositor.c    |   13 ++-----------
> >>  src/compositor.h    |    3 +--
> >>  src/gl-renderer.c   |   23 ++++++++++++++++++-----
> >>  src/screenshooter.c |   15 +++------------
> >>  4 files changed, 24 insertions(+), 30 deletions(-)
> >>
> >>diff --git a/src/compositor.c b/src/compositor.c
> >>index 587fded..fef97bb 100644
> >>--- a/src/compositor.c
> >>+++ b/src/compositor.c
> >>@@ -2578,13 +2578,9 @@ WL_EXPORT void
> >>  weston_output_destroy(struct weston_output *output)
> >>  {
> >>  	struct weston_compositor *c = output->compositor;
> >>-	int i;
> >>
> >>  	pixman_region32_fini(&output->region);
> >>-
> >>-	for (i = 0; i < 2; i++)
> >>-		pixman_region32_fini(&output->buffer_damage[i]);
> >>-
> >>+	pixman_region32_init(&output->previous_damage);
> >
> >Shouldn't that be _fini?
> 
> Yes, it should. /o

Committed with that change, thanks.

Kristian


More information about the wayland-devel mailing list