wayland: Cleanup wl_registry in va_wayland_drm_destroy

[android-x86/hardware-intel-common-libva.git] / va / wayland / va_wayland_drm.c

diff --git a/va/wayland/va_wayland_drm.c b/va/wayland/va_wayland_drm.c
index 958ea85..fa762b7 100644 (file)
--- a/va/wayland/va_wayland_drm.c
+++ b/va/wayland/va_wayland_drm.c
@@ -38,7 +38,10 @@
 #include "wayland-drm-client-protocol.h"
 
 /* XXX: Wayland/DRM support currently lives in Mesa libEGL.so.* library */
-#define LIBWAYLAND_DRM_NAME "libEGL.so.1"
+/* First try the soname of a glvnd enabled mesa build */
+#define LIBWAYLAND_DRM_NAME "libEGL_mesa.so.0"
+/* Then fallback to plain libEGL.so.1 (which might not be mesa) */
+#define LIBWAYLAND_DRM_NAME_FALLBACK "libEGL.so.1"
 
 typedef struct va_wayland_drm_context {
     struct va_wayland_context   base;
@@ -142,6 +145,11 @@ va_wayland_drm_destroy(VADisplayContextP pDisplayContext)
     }
     wl_drm_ctx->is_authenticated = 0;
 
+    if (wl_drm_ctx->registry) {
+        wl_registry_destroy(wl_drm_ctx->registry);
+        wl_drm_ctx->registry = NULL;
+    }
+
     if (wl_drm_ctx->handle) {
         dlclose(wl_drm_ctx->handle);
         wl_drm_ctx->handle = NULL;
@@ -194,6 +202,7 @@ va_wayland_drm_create(VADisplayContextP pDisplayContext)
     wl_drm_ctx->handle                  = NULL;
     wl_drm_ctx->drm                     = NULL;
     wl_drm_ctx->drm_interface           = NULL;
+    wl_drm_ctx->registry                = NULL;
     wl_drm_ctx->is_authenticated        = 0;
     pDisplayContext->opaque             = wl_drm_ctx;
     pDisplayContext->vaGetDriverName    = va_DisplayContextGetDriverName;
@@ -207,8 +216,11 @@ va_wayland_drm_create(VADisplayContextP pDisplayContext)
     vtable->has_prime_sharing = 0;
 
     wl_drm_ctx->handle = dlopen(LIBWAYLAND_DRM_NAME, RTLD_LAZY|RTLD_LOCAL);
-    if (!wl_drm_ctx->handle)
-        return false;
+    if (!wl_drm_ctx->handle) {
+        wl_drm_ctx->handle = dlopen(LIBWAYLAND_DRM_NAME_FALLBACK, RTLD_LAZY|RTLD_LOCAL);
+        if (!wl_drm_ctx->handle)
+            return false;
+    }
 
     wl_drm_ctx->drm_interface =
         dlsym(wl_drm_ctx->handle, "wl_drm_interface");