[dxvk] Open the D3DKMT local semaphore handle on creation

Author: rbernon

src/dxvk/dxvk_fence.cpp

@@ -56,6 +56,41 @@ namespace dxvk {
         Logger::warn(str::format("Importing semaphores of type ", info.sharedType, " not supported by device"));
       }
     }
+
+#ifdef _WIN32
+    if (info.sharedType != VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_FLAG_BITS_MAX_ENUM) {
+      VkSemaphoreGetWin32HandleInfoKHR win32HandleInfo = { VK_STRUCTURE_TYPE_SEMAPHORE_GET_WIN32_HANDLE_INFO_KHR };
+      win32HandleInfo.semaphore = m_semaphore;
+      win32HandleInfo.handleType = m_info.sharedType;
+
+      HANDLE sharedHandle = INVALID_HANDLE_VALUE;
+      VkResult vr = m_vkd->vkGetSemaphoreWin32HandleKHR(m_vkd->device(), &win32HandleInfo, &sharedHandle);
+
+      if (vr != VK_SUCCESS) {
+        Logger::err(str::format("Failed to get semaphore handle: ", vr));
+      } else if (m_info.sharedType == VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_WIN32_KMT_BIT) {
+        D3DKMT_OPENSYNCHRONIZATIONOBJECT desc = { };
+        desc.hSharedHandle = (uintptr_t)sharedHandle;
+
+        if (D3DKMTOpenSynchronizationObject(&desc)) {
+          Logger::warn("DxvkFence::DxvkFence: Failed to open shared D3DKMT handle");
+        } else {
+          m_kmtLocal = desc.hSyncObject;
+          m_kmtGlobal = desc.hSharedHandle;
+        }
+      } else {
+        D3DKMT_OPENSYNCOBJECTFROMNTHANDLE desc = { };
+        desc.hNtHandle = sharedHandle;
+
+        if (D3DKMTOpenSyncObjectFromNtHandle(&desc)) {
+          Logger::warn("DxvkFence::DxvkFence: Failed to open shared NT handle");
+        } else {
+          m_kmtLocal = desc.hSyncObject;
+        }
+        CloseHandle(sharedHandle);
+      }
+    }
+#endif
   }
 
 
@@ -68,6 +103,11 @@ namespace dxvk {
       }
       m_thread.join();
     }
+    if (m_kmtLocal) {
+      D3DKMT_DESTROYSYNCHRONIZATIONOBJECT desc = { };
+      desc.hSyncObject = m_kmtLocal;
+      D3DKMTDestroySynchronizationObject(&desc);
+    }
     m_vkd->vkDestroySemaphore(m_vkd->device(), m_semaphore, nullptr);
   }
 

src/dxvk/dxvk_fence.h

@@ -6,6 +6,7 @@
 #include <vector>
 
 #include "dxvk_include.h"
+#include "dxvk_adapter.h"
 
 #include "../util/thread.h"
 
@@ -65,6 +66,24 @@ namespace dxvk {
     VkSemaphore handle() const {
       return m_semaphore;
     }
+    
+    /**
+     * \brief D3DKMT sync object local handle
+     * \returns The sync object D3DKMT local handle
+     * \returns \c 0 if fence is not shared
+     */
+    D3DKMT_HANDLE kmtLocal() const {
+      return m_kmtLocal;
+    }
+
+    /**
+     * \brief D3DKMT sync object global handle
+     * \returns The sync object D3DKMT global handle
+     * \returns \c 0 if sync object is not shared or shared with NT handle
+     */
+    D3DKMT_HANDLE kmtGlobal() const {
+      return m_kmtGlobal;
+    }
 
     /**
      * \brief Retrieves current semaphore value
@@ -118,6 +137,8 @@ namespace dxvk {
     Rc<vk::DeviceFn>                m_vkd;
     DxvkFenceCreateInfo             m_info;
     VkSemaphore                     m_semaphore;
+    D3DKMT_HANDLE                   m_kmtLocal = 0;
+    D3DKMT_HANDLE                   m_kmtGlobal = 0;
 
     std::priority_queue<QueueItem>  m_queue;
     bool                            m_running    = false;

src/util/util_gdi.cpp

@@ -34,6 +34,11 @@ namespace dxvk {
     return -1;
   }
 
+  NTSTATUS WINAPI D3DKMTDestroySynchronizationObject(const D3DKMT_DESTROYSYNCHRONIZATIONOBJECT *desc) {
+    Logger::warn("D3DKMTDestroySynchronizationObject: Not available on this platform.");
+    return -1;
+  }
+
   NTSTATUS D3DKMTOpenAdapterFromLuid(D3DKMT_OPENADAPTERFROMLUID *desc) {
     Logger::warn("D3DKMTOpenAdapterFromLuid: Not available on this platform.");
     return -1;
@@ -48,6 +53,16 @@ namespace dxvk {
     Logger::warn("D3DKMTOpenResourceFromNtHandle: Not available on this platform.");
     return -1;
   }
+
+  NTSTATUS WINAPI D3DKMTOpenSynchronizationObject(D3DKMT_OPENSYNCHRONIZATIONOBJECT *desc) {
+    Logger::warn("D3DKMTOpenSynchronizationObject: Not available on this platform.");
+    return -1;
+  }
+
+  NTSTATUS WINAPI D3DKMTOpenSyncObjectFromNtHandle(D3DKMT_OPENSYNCOBJECTFROMNTHANDLE *desc) {
+    Logger::warn("D3DKMTOpenSyncObjectFromNtHandle: Not available on this platform.");
+    return -1;
+  }
 #endif
 
-}
+}

src/util/util_gdi.h

@@ -109,6 +109,11 @@ namespace dxvk {
       D3DKMT_HANDLE hDevice;
   } D3DKMT_DESTROYDEVICE;
 
+  typedef struct _D3DKMT_DESTROYSYNCHRONIZATIONOBJECT
+  {
+      D3DKMT_HANDLE hSyncObject;
+  } D3DKMT_DESTROYSYNCHRONIZATIONOBJECT;
+
   typedef struct _D3DKMT_OPENADAPTERFROMLUID
   {
       LUID AdapterLuid;
@@ -169,13 +174,29 @@ namespace dxvk {
       D3DKMT_HANDLE hSyncObject;
   } D3DKMT_OPENRESOURCEFROMNTHANDLE;
 
+  typedef struct _D3DKMT_OPENSYNCHRONIZATIONOBJECT
+  {
+      D3DKMT_HANDLE hSharedHandle;
+      D3DKMT_HANDLE hSyncObject;
+      UINT64 Reserved[8];
+  } D3DKMT_OPENSYNCHRONIZATIONOBJECT;
+
+  typedef struct _D3DKMT_OPENSYNCOBJECTFROMNTHANDLE
+  {
+      HANDLE hNtHandle;
+      D3DKMT_HANDLE hSyncObject;
+  } D3DKMT_OPENSYNCOBJECTFROMNTHANDLE;
+
   EXTERN_C WINBASEAPI NTSTATUS WINAPI D3DKMTCloseAdapter(const D3DKMT_CLOSEADAPTER *desc);
   EXTERN_C WINBASEAPI NTSTATUS WINAPI D3DKMTCreateDCFromMemory(D3DKMT_CREATEDCFROMMEMORY *desc);
   EXTERN_C WINBASEAPI NTSTATUS WINAPI D3DKMTCreateDevice(D3DKMT_CREATEDEVICE *desc);
   EXTERN_C WINBASEAPI NTSTATUS WINAPI D3DKMTDestroyAllocation(const D3DKMT_DESTROYALLOCATION *desc);
   EXTERN_C WINBASEAPI NTSTATUS WINAPI D3DKMTDestroyDCFromMemory(const D3DKMT_DESTROYDCFROMMEMORY *desc);
   EXTERN_C WINBASEAPI NTSTATUS WINAPI D3DKMTDestroyDevice(const D3DKMT_DESTROYDEVICE *desc);
+  EXTERN_C WINBASEAPI NTSTATUS WINAPI D3DKMTDestroySynchronizationObject(const D3DKMT_DESTROYSYNCHRONIZATIONOBJECT *desc);
   EXTERN_C WINBASEAPI NTSTATUS WINAPI D3DKMTOpenAdapterFromLuid(D3DKMT_OPENADAPTERFROMLUID *desc);
   EXTERN_C WINBASEAPI NTSTATUS WINAPI D3DKMTOpenResource2(D3DKMT_OPENRESOURCE *desc);
   EXTERN_C WINBASEAPI NTSTATUS WINAPI D3DKMTOpenResourceFromNtHandle(D3DKMT_OPENRESOURCEFROMNTHANDLE *desc);
+  EXTERN_C WINBASEAPI NTSTATUS WINAPI D3DKMTOpenSynchronizationObject(D3DKMT_OPENSYNCHRONIZATIONOBJECT *desc);
+  EXTERN_C WINBASEAPI NTSTATUS WINAPI D3DKMTOpenSyncObjectFromNtHandle(D3DKMT_OPENSYNCOBJECTFROMNTHANDLE *desc);
 }