dix/devices.c

@@ -2630,6 +2630,7 @@ AttachDevice(ClientPtr client, DeviceIntPtr dev, DeviceIntPtr master)
         screen = miPointerGetScreen(dev);
         screen->DeviceCursorCleanup(dev, screen);
         free(dev->spriteInfo->sprite);
+        dev->spriteInfo->sprite = NULL;
     }
 
     dev->master = master;

glamor/glamor_render.c

@@ -61,7 +61,7 @@ static struct blendinfo composite_op_info[] = {
 
 #define RepeatFix			10
 static GLuint
-glamor_create_composite_fs(struct shader_key *key)
+glamor_create_composite_fs(glamor_screen_private *glamor_priv, struct shader_key *key)
 {
     const char *repeat_define =
         "#define RepeatNone               	      0\n"
@@ -223,6 +223,8 @@ glamor_create_composite_fs(struct shader_key *key)
         "}\n";
     const char *header_ca_dual_blend =
         "#version 130\n";
+    const char *header_ca_dual_blend_gpu_shader4 =
+        "#version 120\n#extension GL_EXT_gpu_shader4 : require\n";
     const char *in_ca_dual_blend_gles2 =
         "void main()\n"
         "{\n"
@@ -301,7 +303,10 @@ glamor_create_composite_fs(struct shader_key *key)
         break;
     case glamor_program_alpha_dual_blend:
         in = in_ca_dual_blend;
-        header = header_ca_dual_blend;
+        if (glamor_priv->glsl_version >= 130)
+           header = header_ca_dual_blend;
+        else
+           header = header_ca_dual_blend_gpu_shader4;
         break;
     case glamor_program_alpha_dual_blend_gles2:
         in = in_ca_dual_blend_gles2;
@@ -379,7 +384,7 @@ glamor_create_composite_shader(ScreenPtr screen, struct shader_key *key,
     vs = glamor_create_composite_vs(key);
     if (vs == 0)
         return;
-    fs = glamor_create_composite_fs(key);
+    fs = glamor_create_composite_fs(glamor_priv, key);
     if (fs == 0)
         return;
 

hw/xwayland/xwayland-input.c

@@ -845,7 +845,6 @@ pointer_handle_axis_discrete(void *data, struct wl_pointer *wl_pointer,
     }
 }
 
-#ifdef XWL_HAS_WL_POINTER_AXIS_V120
 static void
 pointer_handle_axis_v120(void *data, struct wl_pointer *pointer,
                          uint32_t axis, int32_t v120)
@@ -863,7 +862,6 @@ pointer_handle_axis_v120(void *data, struct wl_pointer *pointer,
         break;
     }
 }
-#endif
 
 static const struct wl_pointer_listener pointer_listener = {
     pointer_handle_enter,
@@ -875,9 +873,7 @@ static const struct wl_pointer_listener pointer_listener = {
     pointer_handle_axis_source,
     pointer_handle_axis_stop,
     pointer_handle_axis_discrete,
-#ifdef XWL_HAS_WL_POINTER_AXIS_V120
     pointer_handle_axis_v120,
-#endif
 };
 
 static void
@@ -1854,11 +1850,7 @@ static void
 create_input_device(struct xwl_screen *xwl_screen, uint32_t id, uint32_t version)
 {
     struct xwl_seat *xwl_seat;
-    int seat_version = 5;
-
-#ifdef XWL_HAS_WL_POINTER_AXIS_V120
-    seat_version = 8;
-#endif
+    int seat_version = 8;
 
     xwl_seat = calloc(1, sizeof *xwl_seat);
     if (xwl_seat == NULL) {

hw/xwayland/xwayland-window.c

@@ -179,7 +179,8 @@ damage_report(DamagePtr pDamage, RegionPtr pRegion, void *data)
     }
 #endif
 
-    xorg_list_add(&xwl_window->link_damage, &xwl_screen->damage_window_list);
+    if (xorg_list_is_empty(&xwl_window->link_damage))
+        xorg_list_add(&xwl_window->link_damage, &xwl_screen->damage_window_list);
 }
 
 static void

include/meson.build

@@ -419,7 +419,6 @@ xwayland_data.set('XWL_HAS_GLAMOR', build_glamor and (gbm_dep.found() or build_e
 xwayland_data.set('XWL_HAS_EGLSTREAM', build_eglstream ? '1' : false)
 xwayland_data.set('XWL_HAS_LIBDECOR', have_libdecor ? '1' : false)
 xwayland_data.set('XWL_HAS_XWAYLAND_EXTENSION', xwaylandproto_dep.found() ? '1' : false)
-xwayland_data.set('XWL_HAS_WL_POINTER_AXIS_V120', wayland_client_dep.found() and wayland_client_dep.version().version_compare('>= 1.21.0'))
 
 configure_file(output : 'xwayland-config.h',
                input : 'xwayland-config.h.meson.in',

include/xwayland-config.h.meson.in

@@ -15,6 +15,3 @@
 
 /* Build Xwayland with XWAYLAND extension */
 #mesondefine XWL_HAS_XWAYLAND_EXTENSION
-
-/* libwayland has support for wl_pointer.axis_v120 events */
-#mesondefine XWL_HAS_WL_POINTER_AXIS_V120

meson.build

@@ -63,7 +63,7 @@ add_project_arguments(common_wflags, language : ['c', 'objc'])
 libdrm_req = '>= 2.4.89'
 libselinux_req = '>= 2.0.86'
 xext_req = '>= 1.0.99.4'
-wayland_req = '>= 1.18.0'
+wayland_req = '>= 1.21.0'
 wayland_protocols_req = '>= 1.28'
 gbm_req = '>= 10.2'
 xf86dgaproto_req = '>= 2.0.99.1'
@@ -215,9 +215,8 @@ if (host_machine.system() != 'darwin' and
         xwayland_path = join_paths(get_option('prefix'), get_option('bindir'))
     endif
 
-    wayland_client_dep = dependency('wayland-client', version: wayland_req, required: xwayland_required)
     xwayland_dep = [
-        wayland_client_dep,
+        dependency('wayland-client', version: wayland_req, required: xwayland_required),
         dependency('wayland-protocols', version: wayland_protocols_req, required: xwayland_required),
         dependency('libxcvt', fallback: ['libxcvt', 'libxcvt_dep'], required: xwayland_required),
     ]
@@ -234,8 +233,6 @@ if (host_machine.system() != 'darwin' and
             build_xwayland = false
         endif
     endforeach
-else
-    wayland_client_dep = dependency('', required: false)
 endif
 
 build_xnest = false