[d3d11] Use the D3DKMT local handles to allocate shared handles

Author: rbernon

src/d3d11/d3d11_fence.cpp

@@ -69,9 +69,35 @@ namespace dxvk {
           DWORD               dwAccess,
           LPCWSTR             lpName,
           HANDLE*             pHandle) {
+    InitReturnPtr(pHandle);
     if (!(m_flags & D3D11_FENCE_FLAG_SHARED))
       return E_INVALIDARG;
 
+    OBJECT_ATTRIBUTES attr = { };
+    attr.Length = sizeof(attr);
+    attr.SecurityDescriptor = (void *)pAttributes;
+
+    WCHAR buffer[MAX_PATH];
+    UNICODE_STRING name;
+    if (lpName) {
+        DWORD session, len;
+
+        ProcessIdToSessionId(GetCurrentProcessId(), &session);
+        len = swprintf(buffer, ARRAYSIZE(buffer), L"\\Sessions\\%u\\BaseNamedObjects\\%s", session, name);
+        name.MaximumLength = name.Length = len * sizeof(WCHAR);
+        name.MaximumLength += sizeof(WCHAR);
+        name.Buffer = buffer;
+
+        attr.ObjectName = &name;
+        attr.Attributes = OBJ_CASE_INSENSITIVE;
+    }
+
+    D3DKMT_HANDLE local = m_fence->kmtLocal();
+    if (!D3DKMTShareObjects(1, &local, &attr, dwAccess, pHandle))
+      return S_OK;
+
+    /* try legacy Proton shared resource implementation */
+
     if (pAttributes)
       Logger::warn(str::format("CreateSharedHandle: attributes ", pAttributes, " not handled"));
     if (dwAccess)

src/d3d11/d3d11_resource.cpp

@@ -4,6 +4,7 @@
 #include "d3d11_context_imm.h"
 #include "d3d11_device.h"
 
+#include "../util/util_win32_compat.h"
 #include "../util/util_shared_res.h"
 
 namespace dxvk {
@@ -220,6 +221,14 @@ namespace dxvk {
       return S_OK;
     }
 
+    D3DKMT_HANDLE global = texture->GetImage()->storage()->kmtGlobal();
+    if (global) {
+      *pSharedHandle = (HANDLE)(uintptr_t)global;
+      return S_OK;
+    }
+
+    /* try legacy Proton shared resource implementation */
+
     HANDLE kmtHandle = texture->GetImage()->sharedHandle();
 
     if (kmtHandle == INVALID_HANDLE_VALUE)
@@ -281,6 +290,31 @@ namespace dxvk {
         !(texture->Desc()->MiscFlags & D3D11_RESOURCE_MISC_SHARED_NTHANDLE))
       return E_INVALIDARG;
 
+    OBJECT_ATTRIBUTES attr = { };
+    attr.Length = sizeof(attr);
+    attr.SecurityDescriptor = (void *)pAttributes;
+
+    WCHAR buffer[MAX_PATH];
+    UNICODE_STRING name;
+    if (lpName) {
+        DWORD session, len;
+
+        ProcessIdToSessionId(GetCurrentProcessId(), &session);
+        len = swprintf(buffer, ARRAYSIZE(buffer), L"\\Sessions\\%u\\BaseNamedObjects\\%s", session, name);
+        name.MaximumLength = name.Length = len * sizeof(WCHAR);
+        name.MaximumLength += sizeof(WCHAR);
+        name.Buffer = buffer;
+
+        attr.ObjectName = &name;
+        attr.Attributes = OBJ_CASE_INSENSITIVE;
+    }
+
+    D3DKMT_HANDLE local = texture->GetImage()->storage()->kmtLocal();
+    if (!D3DKMTShareObjects(1, &local, &attr, dwAccess, pHandle))
+      return S_OK;
+
+    /* try legacy Proton shared resource implementation */
+
     if (lpName)
       Logger::warn("Naming shared resources not supported");
 

src/util/util_gdi.cpp

@@ -63,6 +63,11 @@ namespace dxvk {
     Logger::warn("D3DKMTOpenSyncObjectFromNtHandle: Not available on this platform.");
     return -1;
   }
+
+  NTSTATUS WINAPI D3DKMTShareObjects(UINT count, const D3DKMT_HANDLE *handles, OBJECT_ATTRIBUTES *attr, UINT access, HANDLE *handle) {
+    Logger::warn("D3DKMTShareObjects: Not available on this platform.");
+    return -1;
+  }
 #endif
 
 }

src/util/util_gdi.h

@@ -187,6 +187,23 @@ namespace dxvk {
       D3DKMT_HANDLE hSyncObject;
   } D3DKMT_OPENSYNCOBJECTFROMNTHANDLE;
 
+  typedef struct _UNICODE_STRING {
+      USHORT Length;        /* bytes */
+      USHORT MaximumLength; /* bytes */
+      WCHAR *Buffer;
+  } UNICODE_STRING;
+
+  typedef struct _OBJECT_ATTRIBUTES {
+      ULONG Length;
+      HANDLE RootDirectory;
+      UNICODE_STRING *ObjectName;
+      ULONG Attributes;
+      void *SecurityDescriptor;
+      void *SecurityQualityOfService;
+  } OBJECT_ATTRIBUTES;
+
+  #define OBJ_CASE_INSENSITIVE 0x00000040
+
   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);
@@ -199,4 +216,5 @@ namespace dxvk {
   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);
+  EXTERN_C WINBASEAPI NTSTATUS WINAPI D3DKMTShareObjects(UINT count, const D3DKMT_HANDLE *handles, OBJECT_ATTRIBUTES *attr, UINT access, HANDLE *handle);
 }