wayland: Use new wl_display_disconnect

This replaces the previously used wl_display_destroy.
wl_display_destroy was povided by wayland-client.so and
wayland-server.so, to resolve that conflict its renamed client-side.

diff --git a/src/egl/drivers/dri2/platform_wayland.c b/src/egl/drivers/dri2/platform_wayland.c
index b2981a02cd0125bd29dd2d6fb975eec9afc8d4b5..ad649b141ddca8fe833fd6f4e26a02b4664a1ab2 100644 (file)
--- a/src/egl/drivers/dri2/platform_wayland.c
+++ b/src/egl/drivers/dri2/platform_wayland.c
@@ -731,7 +731,7 @@ dri2_terminate(_EGLDriver *drv, _EGLDisplay *disp)
    free(dri2_dpy->device_name);
    wl_drm_destroy(dri2_dpy->wl_drm);
    if (dri2_dpy->own_device)
-      wl_display_destroy(dri2_dpy->wl_dpy);
+      wl_display_disconnect(dri2_dpy->wl_dpy);
    free(dri2_dpy);
    disp->DriverData = NULL;
 

diff --git a/src/gallium/state_trackers/egl/wayland/native_drm.c b/src/gallium/state_trackers/egl/wayland/native_drm.c
index ad238bee122d2cd6668349035d94826c5e5d3c98..8daf7830dd464a3271944f8e7ff5756ca427a943 100644 (file)
--- a/src/gallium/state_trackers/egl/wayland/native_drm.c
+++ b/src/gallium/state_trackers/egl/wayland/native_drm.c
@@ -80,7 +80,7 @@ wayland_drm_display_destroy(struct native_display *ndpy)
    if (drmdpy->base.configs)
       FREE(drmdpy->base.configs);
    if (drmdpy->base.own_dpy)
-      wl_display_destroy(drmdpy->base.dpy);
+      wl_display_disconnect(drmdpy->base.dpy);
 
    ndpy_uninit(ndpy);
 

diff --git a/src/gallium/state_trackers/egl/wayland/native_shm.c b/src/gallium/state_trackers/egl/wayland/native_shm.c
index 7d83e78fb49e607e97f66ae7efae87c4ef402a0b..c2375788aac0eb3d536221c179824e200732304e 100644 (file)
--- a/src/gallium/state_trackers/egl/wayland/native_shm.c
+++ b/src/gallium/state_trackers/egl/wayland/native_shm.c
@@ -66,7 +66,7 @@ wayland_shm_display_destroy(struct native_display *ndpy)
    if (shmdpy->base.configs)
       FREE(shmdpy->base.configs);
    if (shmdpy->base.own_dpy)
-      wl_display_destroy(shmdpy->base.dpy);
+      wl_display_disconnect(shmdpy->base.dpy);
 
    ndpy_uninit(ndpy);