Commit: 62bad1239d8ea1bb269ca69d3469aa267f57cdec - hardware-intel-common-libva (git)

hardware/intel/common/libva

Commit MetaInfo

• Revisión: 62bad1239d8ea1bb269ca69d3469aa267f57cdec (tree)
• Tiempo: 2018-12-26 17:08:34
• Autor: Haihao Xiang <haihao.xiang@inte...>
• Commiter: Xiang, Haihao

Log Message

Add pointer to struct wl_interface for driver to use

See https://github.com/intel/intel-vaapi-driver/issues/419 for the
information

Note: don't export the interface symbol in case others may reuse it.

Signed-off-by: Haihao Xiang <[e-mail]>

Cambiar Resumen

• modified: va/wayland/va_backend_wayland.h
• modified: va/wayland/va_wayland_drm.c

Diferencia incremental

--- a/va/wayland/va_backend_wayland.h
+++ b/va/wayland/va_backend_wayland.h
@@ -64,8 +64,16 @@ struct VADriverVTableWayland {
     /** \brief Indicate whether buffer sharing with prime fd is supported. */
     unsigned int has_prime_sharing;
 
+    /**
+     * Pointer to an implementation of struct wl_interface
+     *
+     * It is set by libva-wayland when a context is created, then the backend
+     * driver may reuse it.
+     */
+    const void *wl_interface;
+
     /** \brief Reserved bytes for future use, must be zero */
-    unsigned long reserved[8];
+    unsigned long reserved[7];
 };
 
 #endif /* VA_BACKEND_WAYLAND_H */

--- a/va/wayland/va_wayland_drm.c
+++ b/va/wayland/va_wayland_drm.c
@@ -136,6 +136,7 @@ va_wayland_drm_destroy(VADisplayContextP pDisplayContext)
     struct VADriverVTableWayland *vtable = ctx->vtable_wayland;
 
     vtable->has_prime_sharing = 0;
+    vtable->wl_interface = NULL;
 
     wl_drm_ctx->is_authenticated = 0;
 
@@ -222,6 +223,8 @@ va_wayland_drm_create(VADisplayContextP pDisplayContext)
     struct VADriverVTableWayland *vtable = ctx->vtable_wayland;
     struct wl_display *wrapped_display = NULL;
 
+    vtable->wl_interface = NULL;
+
     wl_drm_ctx = malloc(sizeof(*wl_drm_ctx));
     if (!wl_drm_ctx) {
         va_wayland_error("could not allocate wl_drm_ctx");
@@ -300,6 +303,7 @@ va_wayland_drm_create(VADisplayContextP pDisplayContext)
         goto end;
     }
 
+    vtable->wl_interface = &wl_drm_interface;
     result = true;
 
 end: