rooty/dxvk
1
0
Fork 0
mirror of https://github.com/doitsujin/dxvk.git synced 2025-01-19 05:52:11 +01:00
Code Issues Projects Releases Wiki Activity

[dxvk] Add shared handle access to DxvkFence

Browse Source
This commit is contained in:
Derek Lesho 2022-07-19 22:27:54 -04:00 committed by Philip Rebohle
parent a8e573b9b8
commit a3548f8043
2 changed files with 49 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/dxvk/dxvk_fence.cpp
View File

@ -11,6 +11,12 @@ namespace dxvk {
typeInfo.semaphoreType = VK_SEMAPHORE_TYPE_TIMELINE; typeInfo.semaphoreType = VK_SEMAPHORE_TYPE_TIMELINE;
typeInfo.initialValue = info.initialValue; typeInfo.initialValue = info.initialValue;
VkExportSemaphoreCreateInfo exportInfo = { VK_STRUCTURE_TYPE_EXPORT_SEMAPHORE_CREATE_INFO };
exportInfo.handleTypes = info.sharedType;
if (info.sharedType != VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_FLAG_BITS_MAX_ENUM)
typeInfo.pNext = &exportInfo;
VkSemaphoreCreateInfo semaphoreInfo = { VK_STRUCTURE_TYPE_SEMAPHORE_CREATE_INFO, &typeInfo }; VkSemaphoreCreateInfo semaphoreInfo = { VK_STRUCTURE_TYPE_SEMAPHORE_CREATE_INFO, &typeInfo };
VkResult vr = m_vkd->vkCreateSemaphore(m_vkd->device(), VkResult vr = m_vkd->vkCreateSemaphore(m_vkd->device(),
@ -19,6 +25,17 @@ namespace dxvk {
if (vr != VK_SUCCESS) if (vr != VK_SUCCESS)
throw DxvkError("Failed to create timeline semaphore"); throw DxvkError("Failed to create timeline semaphore");
if (info.sharedHandle != INVALID_HANDLE_VALUE) {
VkImportSemaphoreWin32HandleInfoKHR importInfo = { VK_STRUCTURE_TYPE_IMPORT_SEMAPHORE_WIN32_HANDLE_INFO_KHR };
importInfo.semaphore = m_semaphore;
importInfo.handleType = info.sharedType;
importInfo.handle = info.sharedHandle;
vr = m_vkd->vkImportSemaphoreWin32HandleKHR(m_vkd->device(), &importInfo);
if (vr != VK_SUCCESS)
throw DxvkError("Failed to import timeline semaphore");
}
m_thread = dxvk::thread([this] { run(); }); m_thread = dxvk::thread([this] { run(); });
} }
@ -92,4 +109,20 @@ namespace dxvk {
} }
} }
HANDLE DxvkFence::sharedHandle() const {
if (m_info.sharedType == VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_FLAG_BITS_MAX_ENUM)
return INVALID_HANDLE_VALUE;
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));
return sharedHandle;
}
} }

17
src/dxvk/dxvk_fence.h
View File

@ -21,6 +21,15 @@ namespace dxvk {
*/ */
struct DxvkFenceCreateInfo { struct DxvkFenceCreateInfo {
uint64_t initialValue; uint64_t initialValue;
VkExternalSemaphoreHandleTypeFlagBits sharedType = VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_FLAG_BITS_MAX_ENUM;
union {
#ifdef _WIN32
HANDLE sharedHandle = INVALID_HANDLE_VALUE;
#else
// Placeholder for other handle types, such as FD
void *dummy;
#endif
};
}; };
/** /**
@ -78,6 +87,12 @@ namespace dxvk {
*/ */
void enqueueWait(uint64_t value, DxvkFenceEvent&& event); void enqueueWait(uint64_t value, DxvkFenceEvent&& event);
/**
* \brief Create a new shared handle to timeline semaphore backing the fence
* \returns The shared handle with the type given by DxvkFenceCreateInfo::sharedType
*/
HANDLE sharedHandle() const;
private: private:
struct QueueItem { struct QueueItem {
@ -111,4 +126,4 @@ namespace dxvk {
}; };
} }