[mutter/bilelmoussaoui/x11-build-guards-2: 9/12] 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: 9/12] wayland: Guard Xwayland code path
- Date: Thu, 22 Sep 2022 15:34:53 +0000 (UTC)
commit 8ad2403e143eb9afb0df3ee4a994bb0c97f5869c
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 | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
---
diff --git a/src/wayland/meta-wayland-actor-surface.c b/src/wayland/meta-wayland-actor-surface.c
index 362785c89c..aeb571ae7b 100644
--- a/src/wayland/meta-wayland-actor-surface.c
+++ b/src/wayland/meta-wayland-actor-surface.c
@@ -31,7 +31,10 @@
 #include "wayland/meta-wayland-buffer.h"
 #include "wayland/meta-wayland-surface.h"
 #include "wayland/meta-window-wayland.h"
+
+#ifdef HAVE_XWAYLAND
 #include "wayland/meta-xwayland-surface.h"
+#endif
 
 typedef struct _MetaWaylandActorSurfacePrivate MetaWaylandActorSurfacePrivate;
 
@@ -223,6 +226,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 +251,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]