[mutter/wayland] wayland: Enable destroy animations for regular windows
- From: Jasper St. Pierre <jstpierre src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter/wayland] wayland: Enable destroy animations for regular windows
- Date: Fri, 28 Feb 2014 04:48:13 +0000 (UTC)
commit 283546b3790669e7690a1a278c87627117f4b30c
Author: Jasper St. Pierre <jstpierre mecheye net>
Date: Thu Feb 27 23:46:56 2014 -0500
wayland: Enable destroy animations for regular windows
Don't set the surface actor to a new buffer if it's becoming unmapped.
This is also technically wrong since we'll send out the release event,
but oh well.
We should probably decouple MetaWaylandBuffer from the CoglTexture
at some point, so we can send out releases on-demand.
src/wayland/meta-wayland-surface.c | 5 +----
1 files changed, 1 insertions(+), 4 deletions(-)
---
diff --git a/src/wayland/meta-wayland-surface.c b/src/wayland/meta-wayland-surface.c
index a7bf050..0c5c711 100644
--- a/src/wayland/meta-wayland-surface.c
+++ b/src/wayland/meta-wayland-surface.c
@@ -262,9 +262,6 @@ ensure_buffer_texture (MetaWaylandBuffer *buffer)
CoglError *catch_error = NULL;
CoglTexture *texture;
- if (!buffer)
- return;
-
texture = COGL_TEXTURE (cogl_wayland_texture_2d_new_from_buffer (ctx,
buffer->resource,
&catch_error));
@@ -295,7 +292,7 @@ actor_surface_commit (MetaWaylandSurface *surface,
MetaSurfaceActor *surface_actor = surface->surface_actor;
MetaWaylandBuffer *buffer = pending->buffer;
- if (buffer_changed)
+ if (buffer_changed && buffer)
{
ensure_buffer_texture (buffer);
meta_surface_actor_wayland_set_buffer (META_SURFACE_ACTOR_WAYLAND (surface->surface_actor), buffer);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]