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 94abe5c..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;
@@ -98,10 +101,21 @@ drm_handle_authenticated(void *data, struct wl_drm *drm)
     drm_state->auth_type         = VA_DRM_AUTH_CUSTOM;
 }
 
+static void
+drm_handle_capabilities(void *data, struct wl_drm *wl_drm, uint32_t value)
+{
+    VADisplayContextP const pDisplayContext = data;
+    VADriverContextP const ctx = pDisplayContext->pDriverContext;
+    struct VADriverVTableWayland *vtable = ctx->vtable_wayland;
+
+    vtable->has_prime_sharing = !!(value & WL_DRM_CAPABILITY_PRIME);
+}
+
 static const struct wl_drm_listener drm_listener = {
     drm_handle_device,
     drm_handle_format,
-    drm_handle_authenticated
+    drm_handle_authenticated,
+    drm_handle_capabilities,
 };
 
 static VAStatus
@@ -121,6 +135,9 @@ va_wayland_drm_destroy(VADisplayContextP pDisplayContext)
     VADriverContextP const ctx = pDisplayContext->pDriverContext;
     struct va_wayland_drm_context * const wl_drm_ctx = pDisplayContext->opaque;
     struct drm_state * const drm_state = ctx->drm_state;
+    struct VADriverVTableWayland *vtable = ctx->vtable_wayland;
+
+    vtable->has_prime_sharing = 0;
 
     if (wl_drm_ctx->drm) {
         wl_drm_destroy(wl_drm_ctx->drm);
@@ -128,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;
@@ -156,7 +178,7 @@ registry_handle_global(
 
     if (strcmp(interface, "wl_drm") == 0) {
         wl_drm_ctx->drm =
-            wl_registry_bind(wl_drm_ctx->registry, id, wl_drm_ctx->drm_interface, 1);
+            wl_registry_bind(wl_drm_ctx->registry, id, wl_drm_ctx->drm_interface, 2);
     }
 }
 
@@ -171,6 +193,7 @@ va_wayland_drm_create(VADisplayContextP pDisplayContext)
     VADriverContextP const ctx = pDisplayContext->pDriverContext;
     struct va_wayland_drm_context *wl_drm_ctx;
     struct drm_state *drm_state;
+    struct VADriverVTableWayland *vtable = ctx->vtable_wayland;
 
     wl_drm_ctx = malloc(sizeof(*wl_drm_ctx));
     if (!wl_drm_ctx)
@@ -179,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;
@@ -189,10 +213,14 @@ va_wayland_drm_create(VADisplayContextP pDisplayContext)
     drm_state->fd        = -1;
     drm_state->auth_type = 0;
     ctx->drm_state       = drm_state;
+    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");