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

compositor: refactor code into weston_surface_reset_pending_buffer()

Browse Source 
No functional changes.

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
This commit is contained in:
Pekka Paalanen 2014-03-14 14:38:13 +02:00 committed by Kristian Høgsberg
parent 260ba38fff
commit 3c9b8024fa
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/compositor.c
View File

@ -1312,6 +1312,17 @@ weston_surface_unmap(struct weston_surface *surface)
surface->output = NULL; surface->output = NULL;
} }
static void
weston_surface_reset_pending_buffer(struct weston_surface *surface)
{
if (surface->pending.buffer)
wl_list_remove(&surface->pending.buffer_destroy_listener.link);
surface->pending.buffer = NULL;
surface->pending.sx = 0;
surface->pending.sy = 0;
surface->pending.newly_attached = 0;
}
struct weston_frame_callback { struct weston_frame_callback {
struct wl_resource *resource; struct wl_resource *resource;
struct wl_list link; struct wl_list link;
@ -2021,12 +2032,7 @@ weston_surface_commit(struct weston_surface *surface)
surface->configure(surface, surface->configure(surface,
surface->pending.sx, surface->pending.sy); surface->pending.sx, surface->pending.sy);
if (surface->pending.buffer) weston_surface_reset_pending_buffer(surface);
wl_list_remove(&surface->pending.buffer_destroy_listener.link);
surface->pending.buffer = NULL;
surface->pending.sx = 0;
surface->pending.sy = 0;
surface->pending.newly_attached = 0;
/* wl_surface.damage */ /* wl_surface.damage */
pixman_region32_union(&surface->damage, &surface->damage, pixman_region32_union(&surface->damage, &surface->damage,
@ -2317,12 +2323,7 @@ weston_subsurface_commit_to_cache(struct weston_subsurface *sub)
sub->cached.sx += surface->pending.sx; sub->cached.sx += surface->pending.sx;
sub->cached.sy += surface->pending.sy; sub->cached.sy += surface->pending.sy;
if (surface->pending.buffer) weston_surface_reset_pending_buffer(surface);
wl_list_remove(&surface->pending.buffer_destroy_listener.link);
surface->pending.buffer = NULL;
surface->pending.sx = 0;
surface->pending.sy = 0;
surface->pending.newly_attached = 0;
sub->cached.buffer_viewport = surface->pending.buffer_viewport; sub->cached.buffer_viewport = surface->pending.buffer_viewport;