From 48557886de7facc03fff1f020a444d3f880c8d9f Mon Sep 17 00:00:00 2001 From: Paul Gofman Date: Wed, 5 Jul 2023 18:14:45 -0600 Subject: [PATCH] [d3d11] Determine shared texture handle type through D3D11_RESOURCE_MISC_SHARED_NTHANDLE --- src/d3d11/d3d11_texture.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/d3d11/d3d11_texture.cpp b/src/d3d11/d3d11_texture.cpp index 875b6165e..d29e59557 100644 --- a/src/d3d11/d3d11_texture.cpp +++ b/src/d3d11/d3d11_texture.cpp @@ -54,9 +54,9 @@ namespace dxvk { imageInfo.shared = true; imageInfo.sharing.mode = hSharedHandle == INVALID_HANDLE_VALUE ? DxvkSharedHandleMode::Export : DxvkSharedHandleMode::Import; - imageInfo.sharing.type = (m_desc.MiscFlags & D3D11_RESOURCE_MISC_SHARED) - ? VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_WIN32_KMT_BIT - : VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_WIN32_BIT; + imageInfo.sharing.type = (m_desc.MiscFlags & D3D11_RESOURCE_MISC_SHARED_NTHANDLE) + ? VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_WIN32_BIT + : VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_WIN32_KMT_BIT; imageInfo.sharing.handle = hSharedHandle; } @@ -696,10 +696,10 @@ namespace dxvk { void D3D11CommonTexture::ExportImageInfo() { HANDLE hSharedHandle; - if (m_desc.MiscFlags & D3D11_RESOURCE_MISC_SHARED) - hSharedHandle = openKmtHandle( m_image->sharedHandle() ); - else + if (m_desc.MiscFlags & D3D11_RESOURCE_MISC_SHARED_NTHANDLE) hSharedHandle = m_image->sharedHandle(); + else + hSharedHandle = openKmtHandle( m_image->sharedHandle() ); DxvkSharedTextureMetadata metadata;