API: backend: add VA display types.

Make it possible to easily find how the VA display was created. This
helps implement multiple backends in VA drivers. e.g. X11, Wayland
while keeping a single generated binary.

Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com>

diff --git a/va/android/va_android.cpp b/va/android/va_android.cpp
index 20aaadd..b731275 100644 (file)
--- a/va/android/va_android.cpp
+++ b/va/android/va_android.cpp
@@ -221,6 +221,7 @@ VADisplay vaGetDisplay (
             pDisplayContext->vadpy_magic = VA_DISPLAY_MAGIC;          
 
             pDriverContext->native_dpy       = (void *)native_dpy;
+            pDriverContext->display_type     = VA_DISPLAY_ANDROID;
             pDisplayContext->pDriverContext  = pDriverContext;
             pDisplayContext->vaIsValid       = va_DisplayContextIsValid;
             pDisplayContext->vaDestroy       = va_DisplayContextDestroy;

diff --git a/va/glx/va_glx.c b/va/glx/va_glx.c
index 1812ef5..e03847e 100644 (file)
--- a/va/glx/va_glx.c
+++ b/va/glx/va_glx.c
@@ -98,6 +98,7 @@ VADisplay vaGetDisplayGLX(Display *native_dpy)
     if (!pDriverContextGLX)
         goto error;
 
+    pDriverContext->display_type  = VA_DISPLAY_GLX;
     pDisplayContextGLX->vaDestroy = pDisplayContext->vaDestroy;
     pDisplayContext->vaDestroy    = va_DisplayContextDestroy;
     pDisplayContext->opaque       = pDisplayContextGLX;

diff --git a/va/va_backend.h b/va/va_backend.h
index 98fcd3c..a6f4047 100644 (file)
--- a/va/va_backend.h
+++ b/va/va_backend.h
@@ -35,6 +35,19 @@
 typedef struct VADriverContext *VADriverContextP;
 typedef struct VADisplayContext *VADisplayContextP;
 
+/** \brief VA display types. */
+enum {
+    /** \brief Mask to major identifier for VA display type. */
+    VA_DISPLAY_MAJOR_MASK = 0xf0,
+
+    /** \brief VA/X11 API is used, through vaGetDisplay() entry-point. */
+    VA_DISPLAY_X11      = 0x10,
+    /** \brief VA/GLX API is used, through vaGetDisplayGLX() entry-point. */
+    VA_DISPLAY_GLX      = (VA_DISPLAY_X11 | (1 << 0)),
+    /** \brief VA/Android API is used, through vaGetDisplay() entry-point. */
+    VA_DISPLAY_ANDROID  = 0x20,
+};
+
 struct VADriverVTable
 {
        VAStatus (*vaTerminate) ( VADriverContextP ctx );
@@ -444,7 +457,10 @@ struct VADriverContext
 
     void *glx;                         /* opaque for GLX code */
 
-    unsigned long reserved[45];         /* reserve for future add-ins, decrease the subscript accordingly */
+    /** \brief VA display type. */
+    unsigned long display_type;
+
+    unsigned long reserved[44];         /* reserve for future add-ins, decrease the subscript accordingly */
 };
 
 #define VA_DISPLAY_MAGIC 0x56414430 /* VAD0 */

diff --git a/va/x11/va_x11.c b/va/x11/va_x11.c
index 05aa697..625ab7e 100644 (file)
--- a/va/x11/va_x11.c
+++ b/va/x11/va_x11.c
@@ -169,6 +169,7 @@ VADisplay vaGetDisplay (
          pDisplayContext->vadpy_magic = VA_DISPLAY_MAGIC;          
 
          pDriverContext->native_dpy       = (void *)native_dpy;
+          pDriverContext->display_type     = VA_DISPLAY_X11;
          pDisplayContext->pDriverContext  = pDriverContext;
          pDisplayContext->vaIsValid       = va_DisplayContextIsValid;
          pDisplayContext->vaDestroy       = va_DisplayContextDestroy;