Skip to content

W
wine-cw
Commit 3aa56661 authored by Henri Verbeet's avatar Henri Verbeet Committed by Alexandre Julliard
Browse files
Options

wined3d: Use the client area dimensions instead of the backbuffer dimensions for…

wined3d: Use the client area dimensions instead of the backbuffer dimensions for the Vulkan swapchain. Often these are the same, and even when not, the minimum/maximum image extents will often end up forcing the swapchain dimensions to be the same as the client area. However, some implementations will allow the swapchain to be created with dimensions different from the client area, but then return VK_SUBOPTIMAL_KHR from vkQueuePresentKHR(). Signed-off-by: 's avatarHenri Verbeet <hverbeet@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent e4721f0c
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 4 deletions
dlls/wined3d/swapchain.c
View file @ 3aa56661
...@@ -884,6 +884,7 @@ static HRESULT wined3d_swapchain_vk_create_vulkan_swapchain(struct wined3d_swapc ...@@ -884,6 +884,7 @@ static HRESULT wined3d_swapchain_vk_create_vulkan_swapchain(struct wined3d_swapc
VkSurfaceKHR vk_surface; VkSurfaceKHR vk_surface;
VkBool32 supported; VkBool32 supported;
VkFormat vk_format; VkFormat vk_format;
RECT client_rect;
VkResult vr; VkResult vr;
adapter_vk = wined3d_adapter_vk(device_vk->d.adapter); adapter_vk = wined3d_adapter_vk(device_vk->d.adapter);
...@@ -931,21 +932,23 @@ static HRESULT wined3d_swapchain_vk_create_vulkan_swapchain(struct wined3d_swapc ...@@ -931,21 +932,23 @@ static HRESULT wined3d_swapchain_vk_create_vulkan_swapchain(struct wined3d_swapc
WARN("Image count %u is not supported (%u-%u).\n", desc->backbuffer_count, WARN("Image count %u is not supported (%u-%u).\n", desc->backbuffer_count,
surface_caps.minImageCount, surface_caps.maxImageCount); surface_caps.minImageCount, surface_caps.maxImageCount);
width = desc->backbuffer_width; GetClientRect(swapchain_vk->s.win_handle, &client_rect);
width = client_rect.right - client_rect.left;
if (width < surface_caps.minImageExtent.width) if (width < surface_caps.minImageExtent.width)
width = surface_caps.minImageExtent.width; width = surface_caps.minImageExtent.width;
else if (width > surface_caps.maxImageExtent.width) else if (width > surface_caps.maxImageExtent.width)
width = surface_caps.maxImageExtent.width; width = surface_caps.maxImageExtent.width;
height = desc->backbuffer_height; height = client_rect.bottom - client_rect.top;
if (height < surface_caps.minImageExtent.height) if (height < surface_caps.minImageExtent.height)
height = surface_caps.minImageExtent.height; height = surface_caps.minImageExtent.height;
else if (height > surface_caps.maxImageExtent.height) else if (height > surface_caps.maxImageExtent.height)
height = surface_caps.maxImageExtent.height; height = surface_caps.maxImageExtent.height;
if (width != desc->backbuffer_width || height != desc->backbuffer_height) if (width != client_rect.right - client_rect.left || height != client_rect.bottom - client_rect.top)
WARN("Swapchain dimensions %ux%u are not supported (%u-%u x %u-%u).\n", WARN("Swapchain dimensions %ux%u are not supported (%u-%u x %u-%u).\n",
desc->backbuffer_width, desc->backbuffer_height, client_rect.right - client_rect.left, client_rect.bottom - client_rect.top,
surface_caps.minImageExtent.width, surface_caps.maxImageExtent.width, surface_caps.minImageExtent.width, surface_caps.maxImageExtent.width,
surface_caps.minImageExtent.height, surface_caps.maxImageExtent.height); surface_caps.minImageExtent.height, surface_caps.maxImageExtent.height);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment