fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-03 20:10:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

radv: Use dispatch table for wsi_display.c

Browse source 
Pretty sure this could be moved into WSI.

Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13974>
This commit is contained in:
Bas Nieuwenhuizen 2021-11-28 20:13:39 +01:00 • committed by Marge Bot
parent 40558dbe91
commit 085f99b729
1 changed files with 38 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

72
src/amd/vulkan/radv_wsi_display.c
View file

@ -51,33 +51,35 @@ radv_RegisterDeviceEventEXT(VkDevice _device, const VkDeviceEventInfoEXT *device
VkResult ret;
int fd;
ret = radv_CreateFence(_device,
&(VkFenceCreateInfo){
.sType = VK_STRUCTURE_TYPE_FENCE_CREATE_INFO,
.pNext =
&(VkExportFenceCreateInfo){
.sType = VK_STRUCTURE_TYPE_EXPORT_FENCE_CREATE_INFO,
.handleTypes = VK_EXTERNAL_FENCE_HANDLE_TYPE_OPAQUE_FD_BIT,
},
},
allocator, _fence);
ret = device->vk.dispatch_table.CreateFence(
_device,
&(VkFenceCreateInfo){
.sType = VK_STRUCTURE_TYPE_FENCE_CREATE_INFO,
.pNext =
&(VkExportFenceCreateInfo){
.sType = VK_STRUCTURE_TYPE_EXPORT_FENCE_CREATE_INFO,
.handleTypes = VK_EXTERNAL_FENCE_HANDLE_TYPE_OPAQUE_FD_BIT,
},
},
allocator, _fence);
if (ret != VK_SUCCESS)
return ret;
RADV_FROM_HANDLE(radv_fence, fence, *_fence);
ret = device->vk.dispatch_table.GetFenceFdKHR(
_device,
&(VkFenceGetFdInfoKHR){.sType = VK_STRUCTURE_TYPE_FENCE_GET_FD_INFO_KHR,
.handleType = VK_EXTERNAL_FENCE_HANDLE_TYPE_OPAQUE_FD_BIT,
.fence = *_fence},
&fd);
assert(fence->permanent.kind == RADV_FENCE_SYNCOBJ);
if (device->ws->export_syncobj(device->ws, fence->permanent.syncobj, &fd)) {
ret = VK_ERROR_OUT_OF_HOST_MEMORY;
} else {
if (ret == VK_SUCCESS) {
ret = wsi_register_device_event(_device, &device->physical_device->wsi_device,
device_event_info, allocator, NULL, fd);
close(fd);
}
if (ret != VK_SUCCESS)
radv_DestroyFence(_device, *_fence, allocator);
device->vk.dispatch_table.DestroyFence(_device, *_fence, allocator);
return ret;
}
@ -91,33 +93,35 @@ radv_RegisterDisplayEventEXT(VkDevice _device, VkDisplayKHR display,
VkResult ret;
int fd;
ret = radv_CreateFence(_device,
&(VkFenceCreateInfo){
.sType = VK_STRUCTURE_TYPE_FENCE_CREATE_INFO,
.pNext =
&(VkExportFenceCreateInfo){
.sType = VK_STRUCTURE_TYPE_EXPORT_FENCE_CREATE_INFO,
.handleTypes = VK_EXTERNAL_FENCE_HANDLE_TYPE_OPAQUE_FD_BIT,
},
},
allocator, _fence);
ret = device->vk.dispatch_table.CreateFence(
_device,
&(VkFenceCreateInfo){
.sType = VK_STRUCTURE_TYPE_FENCE_CREATE_INFO,
.pNext =
&(VkExportFenceCreateInfo){
.sType = VK_STRUCTURE_TYPE_EXPORT_FENCE_CREATE_INFO,
.handleTypes = VK_EXTERNAL_FENCE_HANDLE_TYPE_OPAQUE_FD_BIT,
},
},
allocator, _fence);
if (ret != VK_SUCCESS)
return ret;
RADV_FROM_HANDLE(radv_fence, fence, *_fence);
ret = device->vk.dispatch_table.GetFenceFdKHR(
_device,
&(VkFenceGetFdInfoKHR){.sType = VK_STRUCTURE_TYPE_FENCE_GET_FD_INFO_KHR,
.handleType = VK_EXTERNAL_FENCE_HANDLE_TYPE_OPAQUE_FD_BIT,
.fence = *_fence},
&fd);
assert(fence->permanent.kind == RADV_FENCE_SYNCOBJ);
if (device->ws->export_syncobj(device->ws, fence->permanent.syncobj, &fd)) {
ret = VK_ERROR_OUT_OF_HOST_MEMORY;
} else {
if (ret == VK_SUCCESS) {
ret = wsi_register_display_event(_device, &device->physical_device->wsi_device, display,
display_event_info, allocator, NULL, fd);
close(fd);
}
if (ret != VK_SUCCESS)
radv_DestroyFence(_device, *_fence, allocator);
device->vk.dispatch_table.DestroyFence(_device, *_fence, allocator);
return ret;
}