system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-15 08:20:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

dxgi: Acquire and release the Vulkan queue inside d3d12_swapchain_queue_present().

Browse source
This commit is contained in:
Giovanni Mascellani 2023-07-02 22:10:20 +02:00 committed by Alexandre Julliard
parent 3dad51fba8
commit 23a1642673
1 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
dlls/dxgi/swapchain.c
View file

@ -2068,13 +2068,14 @@ static HRESULT d3d12_swapchain_set_sync_interval(struct d3d12_swapchain *swapcha
return d3d12_swapchain_create_vulkan_resources(swapchain); return d3d12_swapchain_create_vulkan_resources(swapchain);
} }
static VkResult d3d12_swapchain_queue_present(struct d3d12_swapchain *swapchain, VkQueue vk_queue, VkImage vk_src_image) static VkResult d3d12_swapchain_queue_present(struct d3d12_swapchain *swapchain, VkImage vk_src_image)
{ {
const struct dxgi_vk_funcs *vk_funcs = &swapchain->vk_funcs; const struct dxgi_vk_funcs *vk_funcs = &swapchain->vk_funcs;
VkPresentInfoKHR present_info; VkPresentInfoKHR present_info;
VkCommandBuffer vk_cmd_buffer; VkCommandBuffer vk_cmd_buffer;
VkSubmitInfo submit_info; VkSubmitInfo submit_info;
VkImage vk_dst_image; VkImage vk_dst_image;
VkQueue vk_queue;
VkResult vr; VkResult vr;
if (swapchain->vk_image_index == INVALID_VK_IMAGE_INDEX) if (swapchain->vk_image_index == INVALID_VK_IMAGE_INDEX)
@ -2098,6 +2099,8 @@ static VkResult d3d12_swapchain_queue_present(struct d3d12_swapchain *swapchain,
vk_cmd_buffer, vk_dst_image, vk_src_image)) < 0 ) vk_cmd_buffer, vk_dst_image, vk_src_image)) < 0 )
return vr; return vr;
vk_queue = vkd3d_acquire_vk_queue(swapchain->command_queue);
submit_info.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO; submit_info.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO;
submit_info.pNext = NULL; submit_info.pNext = NULL;
submit_info.waitSemaphoreCount = 0; submit_info.waitSemaphoreCount = 0;
@ -2111,6 +2114,7 @@ static VkResult d3d12_swapchain_queue_present(struct d3d12_swapchain *swapchain,
if ((vr = vk_funcs->p_vkQueueSubmit(vk_queue, 1, &submit_info, VK_NULL_HANDLE)) < 0) if ((vr = vk_funcs->p_vkQueueSubmit(vk_queue, 1, &submit_info, VK_NULL_HANDLE)) < 0)
{ {
ERR("Failed to blit swapchain buffer, vr %d.\n", vr); ERR("Failed to blit swapchain buffer, vr %d.\n", vr);
vkd3d_release_vk_queue(swapchain->command_queue);
return vr; return vr;
} }
@ -2128,39 +2132,32 @@ static VkResult d3d12_swapchain_queue_present(struct d3d12_swapchain *swapchain,
if ((vr = vk_funcs->p_vkQueuePresentKHR(vk_queue, &present_info)) >= 0) if ((vr = vk_funcs->p_vkQueuePresentKHR(vk_queue, &present_info)) >= 0)
swapchain->vk_image_index = INVALID_VK_IMAGE_INDEX; swapchain->vk_image_index = INVALID_VK_IMAGE_INDEX;
vkd3d_release_vk_queue(swapchain->command_queue);
return vr; return vr;
} }
static HRESULT d3d12_swapchain_op_present_execute(struct d3d12_swapchain *swapchain, struct d3d12_swapchain_op *op) static HRESULT d3d12_swapchain_op_present_execute(struct d3d12_swapchain *swapchain, struct d3d12_swapchain_op *op)
{ {
VkQueue vk_queue;
VkResult vr; VkResult vr;
HRESULT hr; HRESULT hr;
if (FAILED(hr = d3d12_swapchain_set_sync_interval(swapchain, op->present.sync_interval))) if (FAILED(hr = d3d12_swapchain_set_sync_interval(swapchain, op->present.sync_interval)))
return hr; return hr;
vk_queue = vkd3d_acquire_vk_queue(swapchain->command_queue); vr = d3d12_swapchain_queue_present(swapchain, op->present.vk_image);
vr = d3d12_swapchain_queue_present(swapchain, vk_queue, op->present.vk_image);
if (vr == VK_ERROR_OUT_OF_DATE_KHR) if (vr == VK_ERROR_OUT_OF_DATE_KHR)
{ {
vkd3d_release_vk_queue(swapchain->command_queue);
TRACE("Recreating Vulkan swapchain.\n"); TRACE("Recreating Vulkan swapchain.\n");
d3d12_swapchain_destroy_vulkan_resources(swapchain); d3d12_swapchain_destroy_vulkan_resources(swapchain);
if (FAILED(hr = d3d12_swapchain_create_vulkan_resources(swapchain))) if (FAILED(hr = d3d12_swapchain_create_vulkan_resources(swapchain)))
return hr; return hr;
vk_queue = vkd3d_acquire_vk_queue(swapchain->command_queue); if ((vr = d3d12_swapchain_queue_present(swapchain, op->present.vk_image)) < 0)
if ((vr = d3d12_swapchain_queue_present(swapchain, vk_queue, op->present.vk_image)) < 0)
ERR("Failed to present after recreating swapchain, vr %d.\n", vr); ERR("Failed to present after recreating swapchain, vr %d.\n", vr);
} }
vkd3d_release_vk_queue(swapchain->command_queue);
if (vr < 0) if (vr < 0)
{ {
ERR("Failed to queue present, vr %d.\n", vr); ERR("Failed to queue present, vr %d.\n", vr);