GPU (WSL): unifies code with the windows version

Author: CarterLi

CMakeLists.txt

@@ -561,7 +561,7 @@ if(LINUX)
         src/detection/gpu/gpu_linux.c
         src/detection/gpu/gpu_drm.c
         src/detection/gpu/gpu_pci.c
-        src/detection/gpu/gpu_wsl.c
+        src/detection/gpu/gpu_windows.c
         src/detection/gtk_qt/gtk.c
         src/detection/host/host_linux.c
         src/detection/icons/icons_linux.c

src/detection/gpu/d3dkmthk.h

@@ -10,6 +10,7 @@
 #else
 #    include <sys/ioctl.h>
 #    include <uchar.h>
+#    include <errno.h>
 
 typedef struct _LUID {
     uint32_t LowPart;
@@ -330,24 +331,26 @@ EXTERN_C _Check_return_ NTSTATUS APIENTRY D3DKMTQueryStatistics(_In_ CONST D3DKM
 #    define LX_DXCLOSEADAPTER _IOWR(0x47, 0x15, D3DKMT_CLOSEADAPTER)
 #    define LX_DXQUERYSTATISTICS _IOWR(0x47, 0x43, D3DKMT_QUERYSTATISTICS)
 
-static inline NTSTATUS D3DKMTOpenAdapterFromLuid(int dxgfd, const D3DKMT_OPENADAPTERFROMLUID* params) {
-    return ioctl(dxgfd, LX_DXOPENADAPTERFROMLUID, params);
+extern int dxgfd; // File descriptor for /dev/dxg, initialized in gpu_wsl.c
+
+static inline NTSTATUS D3DKMTOpenAdapterFromLuid(const D3DKMT_OPENADAPTERFROMLUID* params) {
+    return ioctl(dxgfd, LX_DXOPENADAPTERFROMLUID, params) < 0 ? -errno : 0;
 }
 
-static inline NTSTATUS D3DKMTQueryAdapterInfo(int dxgfd, const D3DKMT_QUERYADAPTERINFO* params) {
-    return ioctl(dxgfd, LX_DXQUERYADAPTERINFO, params);
+static inline NTSTATUS D3DKMTQueryAdapterInfo(const D3DKMT_QUERYADAPTERINFO* params) {
+    return ioctl(dxgfd, LX_DXQUERYADAPTERINFO, params) < 0 ? -errno : 0;
 }
 
-static inline NTSTATUS D3DKMTCloseAdapter(int dxgfd, const D3DKMT_CLOSEADAPTER* params) {
-    return ioctl(dxgfd, LX_DXCLOSEADAPTER, params);
+static inline NTSTATUS D3DKMTCloseAdapter(const D3DKMT_CLOSEADAPTER* params) {
+    return ioctl(dxgfd, LX_DXCLOSEADAPTER, params) < 0 ? -errno : 0;
 }
 
-static inline NTSTATUS D3DKMTEnumAdapters2(int dxgfd, D3DKMT_ENUMADAPTERS2* params) {
-    return ioctl(dxgfd, LX_DXENUMADAPTERS2, params);
+static inline NTSTATUS D3DKMTEnumAdapters2(D3DKMT_ENUMADAPTERS2* params) {
+    return ioctl(dxgfd, LX_DXENUMADAPTERS2, params) < 0 ? -errno : 0;
 }
 
-static inline NTSTATUS D3DKMTQueryStatistics(int dxgfd, const D3DKMT_QUERYSTATISTICS* params) {
-    return ioctl(dxgfd, LX_DXQUERYSTATISTICS, params);
+static inline NTSTATUS D3DKMTQueryStatistics(const D3DKMT_QUERYSTATISTICS* params) {
+    return ioctl(dxgfd, LX_DXQUERYSTATISTICS, params) < 0 ? -errno : 0;
 }
 
 #endif

src/detection/gpu/gpu_driver_specific.h

@@ -43,36 +43,40 @@ const char* ffDetectIntelGpuInfo(const FFGpuDriverCondition* cond, FFGpuDriverRe
 const char* ffDetectAmdGpuInfo(const FFGpuDriverCondition* cond, FFGpuDriverResult result, const char* soName);
 const char* ffDetectMthreadsGpuInfo(const FFGpuDriverCondition* cond, FFGpuDriverResult result, const char* soName);
 
+#ifndef FF_GPU_DRIVER_DLLNAME_PATH_PREFIX
+#    define FF_GPU_DRIVER_DLLNAME_PATH_PREFIX
+#endif
+
 FF_MAYBE_UNUSED static inline bool getDriverSpecificDetectionFn(const char* vendor, __typeof__(&ffDetectNvidiaGpuInfo)* pDetectFn, const char** pDllName) {
     if (vendor == FF_GPU_VENDOR_NAME_NVIDIA) {
         *pDetectFn = ffDetectNvidiaGpuInfo;
 #ifdef _WIN32
-        *pDllName = "nvml.dll";
+        *pDllName = FF_GPU_DRIVER_DLLNAME_PATH_PREFIX "nvml.dll";
 #else
-        *pDllName = "libnvidia-ml.so";
+        *pDllName = FF_GPU_DRIVER_DLLNAME_PATH_PREFIX "libnvidia-ml.so";
 #endif
     } else if (vendor == FF_GPU_VENDOR_NAME_MTHREADS) {
         *pDetectFn = ffDetectMthreadsGpuInfo;
 #ifdef _WIN32
-        *pDllName = "mtml.dll";
+        *pDllName = FF_GPU_DRIVER_DLLNAME_PATH_PREFIX "mtml.dll";
 #else
-        *pDllName = "libmtml.so";
+        *pDllName = FF_GPU_DRIVER_DLLNAME_PATH_PREFIX "libmtml.so";
 #endif
     }
 #ifdef _WIN32
     else if (vendor == FF_GPU_VENDOR_NAME_INTEL) {
         *pDetectFn = ffDetectIntelGpuInfo;
 #    ifdef _WIN64
-        *pDllName = "ControlLib.dll";
+        *pDllName = FF_GPU_DRIVER_DLLNAME_PATH_PREFIX "ControlLib.dll";
 #    else
-        *pDllName = "ControlLib32.dll";
+        *pDllName = FF_GPU_DRIVER_DLLNAME_PATH_PREFIX "ControlLib32.dll";
 #    endif
     } else if (vendor == FF_GPU_VENDOR_NAME_AMD) {
         *pDetectFn = ffDetectAmdGpuInfo;
 #    ifdef _WIN64
-        *pDllName = "atiadlxx.dll";
+        *pDllName = FF_GPU_DRIVER_DLLNAME_PATH_PREFIX "atiadlxx.dll";
 #    else
-        *pDllName = "atiadlxy.dll";
+        *pDllName = FF_GPU_DRIVER_DLLNAME_PATH_PREFIX "atiadlxy.dll";
 #    endif
     }
 #endif

src/detection/gpu/gpu_windows.c

@@ -1,12 +1,79 @@
 #include "detection/gpu/gpu.h"
+#if __linux__
+#    define FF_GPU_DRIVER_DLLNAME_PATH_PREFIX "/usr/lib/wsl/lib/"
+#endif
 #include "detection/gpu/gpu_driver_specific.h"
-#include "common/windows/unicode.h"
 #include "common/debug.h"
 
 #include <inttypes.h>
 #include "d3dkmthk.h"
 
-const char* ffDetectGPUImpl(const FFGPUOptions* options, FFlist* gpus) {
+#if _WIN32
+#    include "common/windows/unicode.h"
+#else
+#    include <unistd.h>
+#    include <fcntl.h>
+#    include <sys/ioctl.h>
+#    include <uchar.h>
+
+int dxgfd = -2;
+
+static void ffStrbufSetWS(FFstrbuf* strbuf, const char16_t* str) {
+    ffStrbufClear(strbuf);
+
+    mbstate_t state = {};
+    while (*str) {
+        char buf[5];
+        size_t len = c16rtomb(buf, *str, &state);
+        if (len == (size_t) -1) {
+            ffStrbufAppendS(strbuf, "�"); // U+FFFD REPLACEMENT CHARACTER
+        } else if (len > 0) {
+            ffStrbufAppendNS(strbuf, (uint32_t) len, buf);
+        }
+        str++;
+    }
+}
+
+static void closeDxgfd(void) {
+    if (dxgfd >= 0) {
+        close(dxgfd);
+        dxgfd = 0;
+        FF_DEBUG("Closed /dev/dxg file descriptor");
+    }
+}
+
+static inline const char* ffDebugNtStatus(NTSTATUS status) {
+    return status < 0 ? strerror(-status) : "Success";
+}
+#endif
+
+const char*
+#if _WIN32
+ffDetectGPUImpl
+#else
+ffGPUDetectWsl2
+#endif
+    (const FFGPUOptions* options, FFlist* gpus) {
+#if __linux__
+    if (dxgfd == -2) {
+        dxgfd = open("/dev/dxg", O_RDWR); // Windows DXCore/D3DKMT adapter driver for WSL
+        if (dxgfd < 0) {
+            if (errno == ENOENT) {
+                FF_DEBUG("/dev/dxg is not available, WSL DXCore GPU driver not detected");
+                return "No DXCore GPU driver detected (no /dev/dxg)";
+            } else {
+                FF_DEBUG("Failed to open /dev/dxg: %s", strerror(errno));
+                return "Failed to open /dev/dxg";
+            }
+        }
+        FF_DEBUG("Opened /dev/dxg successfully");
+        atexit(closeDxgfd);
+    }
+    if (dxgfd < 0) {
+        return "Failed to open /dev/dxg";
+    }
+#endif
+
     D3DKMT_ADAPTERINFO adapters[64];
     D3DKMT_ENUMADAPTERS2 enumAdapters = {
         .NumAdapters = ARRAY_SIZE(adapters),
@@ -351,6 +418,7 @@ const char* ffDetectGPUImpl(const FFGPUOptions* options, FFlist* gpus) {
             (uint32_t) gpu->type,
             (uint64_t) gpu->deviceId);
 
+    close_adapter:
         status = D3DKMTCloseAdapter(&(D3DKMT_CLOSEADAPTER) { .hAdapter = adapter->hAdapter });
         if (NT_SUCCESS(status)) {
             FF_DEBUG("Closed adapter #%u successfully", i);