fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-31 22:50:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

dzn: Hook up win32 semaphore import/export

Browse source 
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22879>
This commit is contained in:
Jesse Natalie 2023-05-05 08:41:45 -07:00 • committed by Marge Bot
parent cd5e372f1c
commit c64f1b6650
2 changed files with 73 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/microsoft/vulkan/dzn_private.h
View file

@ -1267,6 +1267,7 @@ struct dzn_event {
struct dzn_sync {
struct vk_sync vk;
ID3D12Fence *fence;
HANDLE export_handle;
};
extern const struct vk_sync_type dzn_sync_type;

74
src/microsoft/vulkan/dzn_sync.c
View file

@ -43,10 +43,11 @@ dzn_sync_init(struct vk_device *device,
struct dzn_sync *dsync = container_of(sync, struct dzn_sync, vk);
struct dzn_device *ddev = container_of(device, struct dzn_device, vk);
assert(!(sync->flags & VK_SYNC_IS_SHAREABLE));
D3D12_FENCE_FLAGS flags = (sync->flags & VK_SYNC_IS_SHAREABLE) ?
D3D12_FENCE_FLAG_SHARED : D3D12_FENCE_FLAG_NONE;
if (FAILED(ID3D12Device1_CreateFence(ddev->dev, initial_value,
D3D12_FENCE_FLAG_NONE,
flags,
&IID_ID3D12Fence,
(void **)&dsync->fence)))
return vk_error(device, VK_ERROR_OUT_OF_DEVICE_MEMORY);
@ -61,6 +62,11 @@ dzn_sync_finish(struct vk_device *device,
struct dzn_sync *dsync = container_of(sync, struct dzn_sync, vk);
ID3D12Fence_Release(dsync->fence);
#ifdef _WIN32
if (dsync->export_handle)
CloseHandle(dsync->export_handle);
#endif
}
static VkResult
@ -215,6 +221,65 @@ dzn_sync_wait(struct vk_device *device,
return ret;
}
#ifdef _WIN32
static VkResult
dzn_sync_import_win32_handle(struct vk_device *device, struct vk_sync *sync,
HANDLE handle, LPCWSTR name)
{
struct dzn_sync *dsync = container_of(sync, struct dzn_sync, vk);
struct dzn_device *ddev = container_of(device, struct dzn_device, vk);
dzn_sync_finish(device, sync);
HANDLE handle_to_close = NULL;
if (name) {
if (FAILED(ID3D12Device_OpenSharedHandleByName(ddev->dev, name, GENERIC_ALL, &handle_to_close)))
return vk_error(device, VK_ERROR_INVALID_EXTERNAL_HANDLE);
handle = handle_to_close;
}
HRESULT hr = ID3D12Device_OpenSharedHandle(ddev->dev, handle, &IID_ID3D12Fence, (void **)&dsync->fence);
if (handle_to_close)
CloseHandle(handle_to_close);
if (FAILED(hr))
return vk_error(device, VK_ERROR_INVALID_EXTERNAL_HANDLE);
return VK_SUCCESS;
}
static VkResult
dzn_sync_export_win32_handle(struct vk_device *device, struct vk_sync *sync, HANDLE *handle)
{
struct dzn_sync *dsync = container_of(sync, struct dzn_sync, vk);
if (dsync->export_handle) {
if (!DuplicateHandle(GetCurrentProcess(), dsync->export_handle,
GetCurrentProcess(), handle,
0, FALSE, DUPLICATE_SAME_ACCESS))
return vk_error(device, VK_ERROR_OUT_OF_DEVICE_MEMORY);
return VK_SUCCESS;
}
struct dzn_device *ddev = container_of(device, struct dzn_device, vk);
if (FAILED(ID3D12Device_CreateSharedHandle(ddev->dev, (ID3D12DeviceChild *)dsync->fence,
NULL, GENERIC_ALL, NULL, handle)))
return vk_error(device, VK_ERROR_OUT_OF_DEVICE_MEMORY);
return VK_SUCCESS;
}
static VkResult
dzn_sync_prep_win32_export(struct vk_device *device, struct vk_sync *sync,
const void *security_attributes, uint32_t access,
const wchar_t *name)
{
struct dzn_sync *dsync = container_of(sync, struct dzn_sync, vk);
struct dzn_device *ddev = container_of(device, struct dzn_device, vk);
if (FAILED(ID3D12Device_CreateSharedHandle(ddev->dev, (ID3D12DeviceChild *)dsync->fence,
(const LPSECURITY_ATTRIBUTES)security_attributes,
access, name, &dsync->export_handle)))
return vk_error(device, VK_ERROR_OUT_OF_DEVICE_MEMORY);
return VK_SUCCESS;
}
#endif
const struct vk_sync_type dzn_sync_type = {
.size = sizeof(struct dzn_sync),
.features = (enum vk_sync_features)
@ -232,4 +297,9 @@ const struct vk_sync_type dzn_sync_type = {
.reset = dzn_sync_reset,
.move = dzn_sync_move,
.wait_many = dzn_sync_wait,
#ifdef _WIN32
.import_win32_handle = dzn_sync_import_win32_handle,
.export_win32_handle = dzn_sync_export_win32_handle,
.set_win32_export_params = dzn_sync_prep_win32_export,
#endif
};