[mutter/bilelmoussaoui/x11-build-guards-2: 10/13] wayland: Guard Xwayland code path
- From: Bilal Elmoussaoui <bilelmoussaoui src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter/bilelmoussaoui/x11-build-guards-2: 10/13] wayland: Guard Xwayland code path
- Date: Tue, 2 Aug 2022 07:46:32 +0000 (UTC)
commit ac385af459a8bc1c4b2ddfd5b9cc81a12165e80c
Author: Bilal Elmoussaoui <belmouss redhat com>
Date: Fri Jun 17 11:04:22 2022 +0200
wayland: Guard Xwayland code path
src/wayland/meta-wayland-actor-surface.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/src/wayland/meta-wayland-actor-surface.c b/src/wayland/meta-wayland-actor-surface.c
index 362785c89c..c2fb6b40ad 100644
--- a/src/wayland/meta-wayland-actor-surface.c
+++ b/src/wayland/meta-wayland-actor-surface.c
@@ -31,8 +31,10 @@
#include "wayland/meta-wayland-buffer.h"
#include "wayland/meta-wayland-surface.h"
#include "wayland/meta-window-wayland.h"
-#include "wayland/meta-xwayland-surface.h"
+#ifdef HAVE_XWAYLAND
+#include "wayland/meta-xwayland-surface.h"
+#endif
typedef struct _MetaWaylandActorSurfacePrivate MetaWaylandActorSurfacePrivate;
struct _MetaWaylandActorSurfacePrivate
@@ -223,6 +225,7 @@ meta_wayland_actor_surface_real_sync_actor_state (MetaWaylandActorSurface *actor
meta_surface_actor_set_input_region (surface_actor, NULL);
}
+#ifdef HAVE_XWAYLAND
if (!META_IS_XWAYLAND_SURFACE (surface_role))
{
if (!meta_shaped_texture_has_alpha (stex))
@@ -247,7 +250,7 @@ meta_wayland_actor_surface_real_sync_actor_state (MetaWaylandActorSurface *actor
meta_surface_actor_set_opaque_region (surface_actor, NULL);
}
}
-
+#endif
meta_shaped_texture_set_transform (stex, surface->buffer_transform);
if (surface->viewport.has_src_rect)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]