system/wine
system/wine
1
0
Fork 0
mirror of https://github.com/wine-mirror/wine synced 2024-06-29 06:14:34 +00:00
Code Issues Projects Releases Wiki Activity

winevulkan: Return VK_SUBOPTIMAL_KHR from vkQueuePresentKHR after resize.

Browse Source
This commit is contained in:
Rémi Bernon 2023-12-10 11:03:54 +01:00 committed by Alexandre Julliard
parent 551b535cdd
commit 010b497cf6
3 changed files with 36 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dlls/vulkan-1/tests/vulkan.c
View File

@ -762,11 +762,8 @@ static void test_win32_surface_swapchain_hwnd(VkDevice device, VkSwapchainKHR sw
vr = vkQueuePresentKHR(queue, &present_info);
if (expect_suboptimal)
{
todo_wine
ok(vr == VK_SUBOPTIMAL_KHR || broken(vr == VK_ERROR_OUT_OF_DATE_KHR) /* Nvidia */,
"Got unexpected vr %d.\n", vr);
}
else if (IsWindow(hwnd))
ok(vr == VK_SUCCESS, "Got unexpected vr %d.\n", vr);
else

34
dlls/winevulkan/vulkan.c
View File

@ -1624,6 +1624,12 @@ void wine_vkDestroySurfaceKHR(VkInstance handle, VkSurfaceKHR surface,
free(object);
}
static BOOL extents_equals(const VkExtent2D *extents, const RECT *rect)
{
return extents->width == rect->right - rect->left &&
extents->height == rect->bottom - rect->top;
}
VkResult wine_vkCreateSwapchainKHR(VkDevice device_handle, const VkSwapchainCreateInfoKHR *create_info,
const VkAllocationCallbacks *allocator, VkSwapchainKHR *swapchain_handle)
{
@ -1661,6 +1667,9 @@ VkResult wine_vkCreateSwapchainKHR(VkDevice device_handle, const VkSwapchainCrea
return res;
}
object->surface = surface;
object->extents = create_info->imageExtent;
*swapchain_handle = wine_swapchain_to_handle(object);
add_handle_mapping(instance, *swapchain_handle, object->host_swapchain, &object->wrapper_entry);
return VK_SUCCESS;
@ -1704,6 +1713,31 @@ VkResult wine_vkQueuePresentKHR(VkQueue queue_handle, const VkPresentInfoKHR *pr
res = device->funcs.p_vkQueuePresentKHR(queue->host_queue, &present_info_host);
for (i = 0; i < present_info->swapchainCount; i++)
{
struct wine_swapchain *swapchain = wine_swapchain_from_handle(present_info->pSwapchains[i]);
VkResult swapchain_res = present_info->pResults ? present_info->pResults[i] : res;
struct wine_surface *surface = swapchain->surface;
RECT client_rect;
if (swapchain_res < VK_SUCCESS) continue;
if (!NtUserGetClientRect(surface->hwnd, &client_rect))
{
WARN("Swapchain window %p is invalid, returning VK_ERROR_OUT_OF_DATE_KHR\n", surface->hwnd);
if (present_info->pResults) present_info->pResults[i] = VK_ERROR_OUT_OF_DATE_KHR;
if (res >= VK_SUCCESS) res = VK_ERROR_OUT_OF_DATE_KHR;
}
else if (swapchain_res != VK_SUCCESS)
WARN("Present returned status %d for swapchain %p\n", swapchain_res, swapchain);
else if (!extents_equals(&swapchain->extents, &client_rect))
{
WARN("Swapchain size %dx%d does not match client rect %s, returning VK_SUBOPTIMAL_KHR\n",
swapchain->extents.width, swapchain->extents.height, wine_dbgstr_rect(&client_rect));
if (present_info->pResults) present_info->pResults[i] = VK_SUBOPTIMAL_KHR;
if (res == VK_SUCCESS) res = VK_SUBOPTIMAL_KHR;
}
}
if (swapchains != swapchains_buffer) free(swapchains);
if (TRACE_ON(fps))

2
dlls/winevulkan/vulkan_private.h
View File

@ -253,7 +253,9 @@ static inline VkSurfaceKHR wine_surface_to_handle(struct wine_surface *surface)
struct wine_swapchain
{
struct wine_surface *surface; /* parent */
VkSwapchainKHR host_swapchain;
VkExtent2D extents;
struct wrapper_entry wrapper_entry;
};