vainfo: Add support for Win32 device enumeration and selection

Author: sivileri

common/meson.build

@@ -17,7 +17,7 @@ if use_wayland
 endif
 
 if use_win32
-  libva_display_src += [ 'va_display_win32.c' ]
+  libva_display_src += [ 'va_display_win32.cpp' ]
   libva_display_deps += win32_deps
 endif
 

common/va_display.c

@@ -60,7 +60,7 @@ static const VADisplayHooks *g_display_hooks_available[] = {
 };
 
 static const char *g_display_name;
-const char *g_drm_device_name;
+const char *g_device_name;
 
 static const char *
 get_display_name(int argc, char *argv[])
@@ -82,7 +82,7 @@ get_display_name(int argc, char *argv[])
 }
 
 static const char *
-get_drm_device_name(int argc, char *argv[])
+get_device_name(int argc, char *argv[])
 {
     const char *device_name = NULL;
     int i;
@@ -136,8 +136,10 @@ va_init_display_args(int *argc, char *argv[])
     }
     g_display_name = display_name;
 
-    if (g_display_name && strcmp(g_display_name, "drm") == 0)
-        g_drm_device_name = get_drm_device_name(*argc, argv);
+    if (g_display_name &&
+        ((strcmp(g_display_name, "drm") == 0)
+        || (strcmp(g_display_name, "win32") == 0)))
+        g_device_name = get_device_name(*argc, argv);
 
     sanitize_args(argc, argv);
 }
@@ -200,5 +202,5 @@ va_print_display_options(FILE *stream)
 {
     fprintf(stream, "Display options:\n");
     fprintf(stream, "\t--display display | help         Show information for the specified display, or the available display list \n");
-    fprintf(stream, "\t--device device                  Set device name, only available under drm display\n");
+    fprintf(stream, "\t--device device                  Set device name, only available under drm and win32 displays\n");
 }

common/va_display_drm.c

@@ -36,7 +36,7 @@
 #include "va_display.h"
 
 static int drm_fd = -1;
-extern const char *g_drm_device_name;
+extern const char *g_device_name;
 
 static VADisplay
 va_open_display_drm(void)
@@ -52,8 +52,8 @@ va_open_display_drm(void)
         NULL
     };
 
-    if (g_drm_device_name) {
-        drm_fd = open(g_drm_device_name, O_RDWR);
+    if (g_device_name) {
+        drm_fd = open(g_device_name, O_RDWR);
         if (drm_fd < 0) {
             printf("Failed to open the given device!\n");
             exit(1);

common/va_display_win32.c

@@ -0,0 +1,170 @@
+/*
+ * Copyright © Microsoft Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+
+#include <stdio.h>
+#include <stdbool.h>
+#include <va/va_win32.h>
+#include "va_display.h"
+#include <directx/dxcore_interface.h>
+
+extern "C" const char *g_device_name;
+
+void dxcore_resolve_adapter(const char *adapter_string, /*out*/ bool* ptr_device_found, /*out*/ LUID* ptr_adapter_luid)
+{
+    int selected_adapter_index = -1;
+    IDXCoreAdapterFactory *factory = nullptr;
+    IDXCoreAdapterList *adapter_list = nullptr;
+    IDXCoreAdapter *adapter = nullptr;
+    typedef HRESULT(WINAPI *PFN_CREATE_DXCORE_ADAPTER_FACTORY)(REFIID riid, void **ppFactory);
+    PFN_CREATE_DXCORE_ADAPTER_FACTORY DXCoreCreateAdapterFactory;
+    HRESULT hr = S_OK;
+
+    memset(ptr_adapter_luid, 0, sizeof(LUID));
+    *ptr_device_found = false;
+
+    HMODULE dxcore_mod = LoadLibrary("DXCore.DLL");
+    if (!dxcore_mod) {
+        fprintf(stderr, "Failed to load DXCore.DLL to enumerate adapters.\n");
+        goto fail;
+    }
+
+    DXCoreCreateAdapterFactory = (PFN_CREATE_DXCORE_ADAPTER_FACTORY)GetProcAddress(dxcore_mod, "DXCoreCreateAdapterFactory");
+    if (!DXCoreCreateAdapterFactory) {
+        fprintf(stderr, "Failed to load DXCoreCreateAdapterFactory from DXCore.DLL.\n");
+        goto fail;
+    }
+
+    hr = DXCoreCreateAdapterFactory(IID_IDXCoreAdapterFactory, (void **)&factory);
+    if (FAILED(hr)) {
+        fprintf(stderr, "DXCoreCreateAdapterFactory failed: %lx\n", hr);
+        goto fail;
+    }
+
+    hr = factory->CreateAdapterList(1, &DXCORE_ADAPTER_ATTRIBUTE_D3D12_GRAPHICS, IID_IDXCoreAdapterList, (void **)&adapter_list);
+    if (FAILED(hr)) {
+        fprintf(stderr, "CreateAdapterList failed: %lx\n", hr);
+        goto fail;
+    }
+
+    if (adapter_string && (sscanf_s(adapter_string, "%d", &selected_adapter_index) != 1)) {
+        fprintf(stderr, "Invalid device index received for -hwaccel_device %s\n", adapter_string ? adapter_string : "");
+    }
+
+    if (!adapter_string) fprintf(stdout, "Available devices for --display win32:\n");
+    for (int i=0; i < adapter_list->GetAdapterCount(); i++) {
+        if (SUCCEEDED(adapter_list->GetAdapter(i, IID_IDXCoreAdapter, (void **)&adapter))) {
+            size_t desc_size = 0;
+            if (FAILED(adapter->GetPropertySize(DXCoreAdapterProperty::DriverDescription, &desc_size))) {
+                adapter->Release();
+                continue;
+            }
+
+            char *adapter_name = (char*)malloc(desc_size);
+            if (!adapter_name) {
+                adapter->Release();
+                continue;
+            }
+
+            if (FAILED(adapter->GetProperty(DXCoreAdapterProperty::DriverDescription, desc_size, adapter_name))) {
+                free(adapter_name);
+                adapter->Release();
+                continue;
+            }
+
+            LUID cur_adapter_luid = { 0, 0 };
+            if (FAILED(adapter->GetProperty(DXCoreAdapterProperty::InstanceLuid, &cur_adapter_luid))) {
+                free(adapter_name);
+                adapter->Release();
+                continue;
+            }
+
+            if (selected_adapter_index == i) {
+                *ptr_adapter_luid = cur_adapter_luid;
+                *ptr_device_found = true;
+            }
+
+            if (!adapter_string) fprintf(stdout, "\tDevice Index: %d Device LUID: %lu %ld - Device Name: %s\n", i, cur_adapter_luid.LowPart, cur_adapter_luid.HighPart, adapter_name);
+            free(adapter_name);
+            adapter->Release();
+        }
+    }
+
+fail:
+    if (adapter_list)
+        adapter_list->Release();
+    if (factory)
+        factory->Release();
+    if (dxcore_mod)
+        FreeLibrary(dxcore_mod);
+}
+
+static VADisplay
+va_open_display_win32(void)
+{
+    LUID adapter_luid = {0, 0};
+    bool device_found = false;
+    if (g_device_name) {
+        bool print_devices = (0 == strcmp(g_device_name, "help"));
+        dxcore_resolve_adapter(print_devices ? NULL : g_device_name, &device_found, &adapter_luid);
+        if (print_devices) {
+            exit(0);
+        } else if (g_device_name && !device_found) {
+            fprintf(stderr, "Could not find device %s for --display win32. Please try --device help for a list of available devices.\n", g_device_name);
+            exit(0);
+        }
+    }
+
+    // Adapter automatic selection supported by sending NULL adapter to vaGetDisplayWin32
+    return vaGetDisplayWin32(device_found ? &adapter_luid : NULL);
+}
+
+static void
+va_close_display_win32(VADisplay va_dpy)
+{
+}
+
+static VAStatus
+va_put_surface_win32(
+    VADisplay          va_dpy,
+    VASurfaceID        surface,
+    const VARectangle *src_rect,
+    const VARectangle *dst_rect
+)
+{
+    return VA_STATUS_ERROR_OPERATION_FAILED;
+}
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern const VADisplayHooks va_display_hooks_win32 = {
+    "win32",
+    va_open_display_win32,
+    va_close_display_win32,
+    va_put_surface_win32,
+};
+
+#ifdef __cplusplus
+}
+#endif

common/va_display_win32.cpp

@@ -87,6 +87,14 @@ if get_option('win32') != 'false'
   use_win32 = dependency('libva-win32', required: require_win32).found()
   if use_win32
     libva_utils_flags = [ '-DHAVE_VA_WIN32=1', '-DNOMINMAX']
+    dep_dxheaders = dependency('directx-headers', required : false)
+    if not dep_dxheaders.found()
+      dep_dxheaders = dependency('DirectX-Headers',
+        version : '>= v1.0.2',
+        fallback : ['DirectX-Headers', 'dep_dxheaders'],
+        required : use_win32
+      )
+    endif
   endif
 endif
 
@@ -95,7 +103,7 @@ add_project_arguments(libva_utils_flags,
 
 if use_win32
   subdir('getopt')
-  win32_deps = [ dependency('libva-win32', required: require_win32), idep_getopt ]
+  win32_deps = [ dependency('libva-win32', required: require_win32), idep_getopt, dep_dxheaders]
 endif
 
 subdir('common') # Uses win32_deps

meson.build

@@ -0,0 +1,5 @@
+[wrap-git]
+directory = DirectX-Headers-1.0
+
+url = https://github.com/microsoft/DirectX-Headers.git
+revision = v1.0.2