February 2019 - Wine-Devel - list.winehq.org

[PATCH 10/10] wined3d: Rename ShaderBackend registry setting to shader_backend.
by Józef Kucia Feb. 28, 2019

Feb. 28, 2019

This appears to be preferred naming convention for new registry keys. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/wined3d_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index fb70b9467708..5ca58ae2403c 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -219,7 +219,7 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) tmpvalue >> 16, tmpvalue & 0xffff); wined3d_settings.max_gl_version = tmpvalue; } - if (!get_config_key(hkey, appkey, "ShaderBackend", buffer, size)) + if (!get_config_key(hkey, appkey, "shader_backend", buffer, size)) { if (!strcasecmp(buffer, "glsl")) { -- 2.19.2

3 2

[PATCH 08/10] dxgi: Recreate Vulkan swapchain only when current buffer index is 0.
by Józef Kucia Feb. 28, 2019

Feb. 28, 2019

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/swapchain.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index fb55820cb88f..3c0951635f69 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -1989,6 +1989,16 @@ static HRESULT d3d12_swapchain_set_sync_interval(struct d3d12_swapchain *swapcha if (swapchain->present_mode == present_mode) return S_OK; + /* + * We recreate the swapchain only when the current buffer index is 0, in order to preserve the + * expected back buffer index sequence. + */ + if (swapchain->current_buffer_index) + { + WARN("Skipping sync interval change, current buffer index %u.\n", swapchain->current_buffer_index); + return S_OK; + } + if (!swapchain->vk_images[swapchain->current_buffer_index]) { FIXME("Cannot recreate swapchain without user images.\n"); -- 2.19.2

3 2

[PATCH 04/10] dxgi: Set Vulkan swapchain size according to VkSurfaceCapabilitiesKHR.
by Józef Kucia Feb. 28, 2019

Feb. 28, 2019

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/swapchain.c | 33 ++++++++++++++++++++++++--------- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 268442f56159..ed7861c679f1 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -890,6 +890,8 @@ struct d3d12_swapchain VkSemaphore vk_semaphores[DXGI_MAX_SWAP_CHAIN_BUFFERS]; ID3D12Resource *buffers[DXGI_MAX_SWAP_CHAIN_BUFFERS]; unsigned int buffer_count; + unsigned int vk_swapchain_width; + unsigned int vk_swapchain_height; uint32_t current_buffer_index; struct dxgi_vk_funcs vk_funcs; @@ -1209,8 +1211,12 @@ static HRESULT d3d12_swapchain_prepare_command_buffers(struct d3d12_swapchain *s blit.srcOffsets[1].y = swapchain->desc.Height; blit.srcOffsets[1].z = 1; blit.dstSubresource = blit.srcSubresource; - blit.dstOffsets[0] = blit.srcOffsets[0]; - blit.dstOffsets[1] = blit.srcOffsets[1]; + blit.dstOffsets[0].x = 0; + blit.dstOffsets[0].y = 0; + blit.dstOffsets[0].z = 0; + blit.dstOffsets[1].x = swapchain->vk_swapchain_width; + blit.dstOffsets[1].y = swapchain->vk_swapchain_height; + blit.dstOffsets[1].z = 1; vk_funcs->p_vkCmdBlitImage(vk_cmd_buffer, swapchain->vk_images[i], VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, @@ -1439,6 +1445,7 @@ static HRESULT d3d12_swapchain_create_vulkan_swapchain(struct d3d12_swapchain *s VkFormat vk_format, vk_swapchain_format; VkSurfaceCapabilitiesKHR surface_caps; VkSwapchainKHR vk_swapchain; + unsigned int width, height; VkImageUsageFlags usage; VkResult vr; HRESULT hr; @@ -1468,17 +1475,23 @@ static HRESULT d3d12_swapchain_create_vulkan_swapchain(struct d3d12_swapchain *s return DXGI_ERROR_UNSUPPORTED; } - if (swapchain->desc.Width > surface_caps.maxImageExtent.width - || swapchain->desc.Width < surface_caps.minImageExtent.width - || swapchain->desc.Height > surface_caps.maxImageExtent.height - || swapchain->desc.Height < surface_caps.minImageExtent.height) + width = swapchain->desc.Width; + height = swapchain->desc.Height; + width = max(width, surface_caps.minImageExtent.width); + width = min(width, surface_caps.maxImageExtent.width); + height = max(height, surface_caps.minImageExtent.height); + height = min(height, surface_caps.maxImageExtent.height); + + if (width != swapchain->desc.Width || height != swapchain->desc.Height) { - FIXME("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", swapchain->desc.Width, swapchain->desc.Height, surface_caps.minImageExtent.width, surface_caps.maxImageExtent.width, surface_caps.minImageExtent.height, surface_caps.maxImageExtent.height); } + TRACE("Vulkan swapchain extent %ux%u.\n", width, height); + if (!(surface_caps.supportedCompositeAlpha & VK_COMPOSITE_ALPHA_OPAQUE_BIT_KHR)) { FIXME("Unsupported alpha mode.\n"); @@ -1498,8 +1511,8 @@ static HRESULT d3d12_swapchain_create_vulkan_swapchain(struct d3d12_swapchain *s vk_swapchain_desc.minImageCount = swapchain->desc.BufferCount; vk_swapchain_desc.imageFormat = vk_swapchain_format; vk_swapchain_desc.imageColorSpace = VK_COLOR_SPACE_SRGB_NONLINEAR_KHR; - vk_swapchain_desc.imageExtent.width = swapchain->desc.Width; - vk_swapchain_desc.imageExtent.height = swapchain->desc.Height; + vk_swapchain_desc.imageExtent.width = width; + vk_swapchain_desc.imageExtent.height = height; vk_swapchain_desc.imageArrayLayers = 1; vk_swapchain_desc.imageUsage = usage; vk_swapchain_desc.imageSharingMode = VK_SHARING_MODE_EXCLUSIVE; @@ -1520,6 +1533,8 @@ static HRESULT d3d12_swapchain_create_vulkan_swapchain(struct d3d12_swapchain *s vk_funcs->p_vkDestroySwapchainKHR(swapchain->vk_device, swapchain->vk_swapchain, NULL); swapchain->vk_swapchain = vk_swapchain; + swapchain->vk_swapchain_width = width; + swapchain->vk_swapchain_height = height; if (FAILED(hr = d3d12_swapchain_create_buffers(swapchain, vk_swapchain_format, vk_format))) return hr; -- 2.19.2

3 2

[PATCH 07/10] dxgi: Implement 0 sync interval for D3D12 swapchains.
by Józef Kucia Feb. 28, 2019

Feb. 28, 2019

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/swapchain.c | 101 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 98 insertions(+), 3 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 06fb7ef89a29..fb55820cb88f 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -892,6 +892,7 @@ struct d3d12_swapchain unsigned int buffer_count; unsigned int vk_swapchain_width; unsigned int vk_swapchain_height; + VkPresentModeKHR present_mode; uint32_t current_buffer_index; struct dxgi_vk_funcs vk_funcs; @@ -1021,6 +1022,51 @@ static HRESULT vk_select_memory_type(const struct dxgi_vk_funcs *vk_funcs, return E_FAIL; } +static BOOL d3d12_swapchain_is_present_mode_supported(struct d3d12_swapchain *swapchain, + VkPresentModeKHR present_mode) +{ + VkPhysicalDevice vk_physical_device = swapchain->vk_physical_device; + const struct dxgi_vk_funcs *vk_funcs = &swapchain->vk_funcs; + VkPresentModeKHR *modes; + uint32_t count, i; + BOOL supported; + VkResult vr; + + if (present_mode == VK_PRESENT_MODE_FIFO_KHR) + return TRUE; + + if ((vr = vk_funcs->p_vkGetPhysicalDeviceSurfacePresentModesKHR(vk_physical_device, + swapchain->vk_surface, &count, NULL)) < 0) + { + WARN("Failed to get count of available present modes, vr %d.\n", vr); + return FALSE; + } + + supported = FALSE; + + if (!(modes = heap_calloc(count, sizeof(*modes)))) + return FALSE; + if ((vr = vk_funcs->p_vkGetPhysicalDeviceSurfacePresentModesKHR(vk_physical_device, + swapchain->vk_surface, &count, modes)) >= 0) + { + for (i = 0; i < count; ++i) + { + if (modes[i] == present_mode) + { + supported = TRUE; + break; + } + } + } + else + { + WARN("Failed to get available present modes, vr %d.\n", vr); + } + heap_free(modes); + + return supported; +} + static HRESULT d3d12_swapchain_create_user_buffers(struct d3d12_swapchain *swapchain, VkFormat vk_format) { const struct dxgi_vk_funcs *vk_funcs = &swapchain->vk_funcs; @@ -1527,7 +1573,7 @@ static HRESULT d3d12_swapchain_create_vulkan_swapchain(struct d3d12_swapchain *s vk_swapchain_desc.pQueueFamilyIndices = NULL; vk_swapchain_desc.preTransform = surface_caps.currentTransform; vk_swapchain_desc.compositeAlpha = VK_COMPOSITE_ALPHA_OPAQUE_BIT_KHR; - vk_swapchain_desc.presentMode = VK_PRESENT_MODE_FIFO_KHR; + vk_swapchain_desc.presentMode = swapchain->present_mode; vk_swapchain_desc.clipped = VK_TRUE; vk_swapchain_desc.oldSwapchain = swapchain->vk_swapchain; if ((vr = vk_funcs->p_vkCreateSwapchainKHR(vk_device, &vk_swapchain_desc, NULL, &vk_swapchain)) < 0) @@ -1922,6 +1968,52 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_GetCoreWindow(IDXGISwapChain3 * return DXGI_ERROR_INVALID_CALL; } +static HRESULT d3d12_swapchain_set_sync_interval(struct d3d12_swapchain *swapchain, + unsigned int sync_interval) +{ + VkPresentModeKHR present_mode; + HRESULT hr; + + switch (sync_interval) + { + case 0: + present_mode = VK_PRESENT_MODE_IMMEDIATE_KHR; + break; + default: + FIXME("Unsupported sync interval %u.\n", sync_interval); + case 1: + present_mode = VK_PRESENT_MODE_FIFO_KHR; + break; + } + + if (swapchain->present_mode == present_mode) + return S_OK; + + if (!swapchain->vk_images[swapchain->current_buffer_index]) + { + FIXME("Cannot recreate swapchain without user images.\n"); + return S_OK; + } + + if (!d3d12_swapchain_is_present_mode_supported(swapchain, present_mode)) + { + FIXME("Vulkan present mode %#x is not supported.\n", present_mode); + return S_OK; + } + + d3d12_swapchain_destroy_buffers(swapchain, FALSE); + + swapchain->present_mode = present_mode; + + if (FAILED(hr = d3d12_swapchain_create_vulkan_swapchain(swapchain))) + { + ERR("Failed to recreate Vulkan swapchain, hr %#x.\n", hr); + return hr; + } + + return d3d12_swapchain_acquire_next_image(swapchain); +} + static VkResult d3d12_swapchain_blit_buffer(struct d3d12_swapchain *swapchain, VkQueue vk_queue) { const struct dxgi_vk_funcs *vk_funcs = &swapchain->vk_funcs; @@ -1989,8 +2081,6 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_Present1(IDXGISwapChain3 *iface WARN("Invalid sync interval %u.\n", sync_interval); return DXGI_ERROR_INVALID_CALL; } - if (sync_interval != 1) - FIXME("Ignoring sync interval %u.\n", sync_interval); if (flags & ~DXGI_PRESENT_TEST) FIXME("Unimplemented flags %#x.\n", flags); @@ -2003,6 +2093,9 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_Present1(IDXGISwapChain3 *iface if (present_parameters) FIXME("Ignored present parameters %p.\n", present_parameters); + if (FAILED(hr = d3d12_swapchain_set_sync_interval(swapchain, sync_interval))) + return hr; + if (!(vk_queue = vkd3d_acquire_vk_queue(swapchain->command_queue))) { ERR("Failed to acquire Vulkan queue.\n"); @@ -2391,6 +2484,8 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI swapchain->desc = *swapchain_desc; swapchain->fullscreen_desc = *fullscreen_desc; + swapchain->present_mode = VK_PRESENT_MODE_FIFO_KHR; + switch (swapchain_desc->SwapEffect) { case DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL: -- 2.19.2

3 2

[PATCH 05/10] dxgi: Use VK_FILTER_LINEAR for swapchain blits if dimensions don't match.
by Józef Kucia Feb. 28, 2019

Feb. 28, 2019

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/swapchain.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index ed7861c679f1..06fb7ef89a29 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -1150,6 +1150,7 @@ static HRESULT d3d12_swapchain_prepare_command_buffers(struct d3d12_swapchain *s VkCommandBufferBeginInfo begin_info; VkCommandPoolCreateInfo pool_info; VkImageBlit blit; + VkFilter filter; unsigned int i; VkResult vr; @@ -1179,6 +1180,12 @@ static HRESULT d3d12_swapchain_prepare_command_buffers(struct d3d12_swapchain *s return hresult_from_vk_result(vr); } + if (swapchain->desc.Width != swapchain->vk_swapchain_width + || swapchain->desc.Height != swapchain->vk_swapchain_height) + filter = VK_FILTER_LINEAR; + else + filter = VK_FILTER_NEAREST; + for (i = 0; i < swapchain->buffer_count; ++i) { VkCommandBuffer vk_cmd_buffer = swapchain->vk_cmd_buffers[i]; @@ -1221,7 +1228,7 @@ static HRESULT d3d12_swapchain_prepare_command_buffers(struct d3d12_swapchain *s vk_funcs->p_vkCmdBlitImage(vk_cmd_buffer, swapchain->vk_images[i], VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, vk_swapchain_images[i], VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, - 1, &blit, VK_FILTER_NEAREST); + 1, &blit, filter); vk_cmd_image_barrier(vk_funcs, vk_cmd_buffer, VK_PIPELINE_STAGE_TRANSFER_BIT, VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT, -- 2.19.2

3 2

[PATCH 03/10] dxgi: Re-create swapchain on VK_ERROR_OUT_OF_DATE_KHR.
by Józef Kucia Feb. 28, 2019

Feb. 28, 2019

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/swapchain.c | 88 ++++++++++++++++++++++++++++++++----------- 1 file changed, 66 insertions(+), 22 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 89bcf5d95638..268442f56159 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -1033,6 +1033,9 @@ static HRESULT d3d12_swapchain_create_user_buffers(struct d3d12_swapchain *swapc VkResult vr; HRESULT hr; + if (swapchain->vk_images[0]) + return S_OK; + memset(&image_info, 0, sizeof(image_info)); image_info.sType = VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO; image_info.flags = VK_IMAGE_CREATE_MUTABLE_FORMAT_BIT; @@ -1315,6 +1318,9 @@ static HRESULT d3d12_swapchain_create_buffers(struct d3d12_swapchain *swapchain, return hr; } + if (swapchain->buffers[0]) + return S_OK; + for (i = 0; i < swapchain->buffer_count; ++i) { if (swapchain->vk_images[i]) @@ -1369,9 +1375,10 @@ static HRESULT d3d12_swapchain_acquire_next_image(struct d3d12_swapchain *swapch return S_OK; } -static void d3d12_swapchain_destroy_buffers(struct d3d12_swapchain *swapchain) +static void d3d12_swapchain_destroy_buffers(struct d3d12_swapchain *swapchain, BOOL destroy_user_buffers) { const struct dxgi_vk_funcs *vk_funcs = &swapchain->vk_funcs; + BOOL have_user_images; VkQueue vk_queue; unsigned int i; @@ -1389,9 +1396,11 @@ static void d3d12_swapchain_destroy_buffers(struct d3d12_swapchain *swapchain) } } + have_user_images = swapchain->vk_images[0]; + for (i = 0; i < swapchain->buffer_count; ++i) { - if (swapchain->buffers[i]) + if (swapchain->buffers[i] && (destroy_user_buffers || !have_user_images)) { vkd3d_resource_decref(swapchain->buffers[i]); swapchain->buffers[i] = NULL; @@ -1399,8 +1408,11 @@ static void d3d12_swapchain_destroy_buffers(struct d3d12_swapchain *swapchain) if (swapchain->vk_device) { - vk_funcs->p_vkDestroyImage(swapchain->vk_device, swapchain->vk_images[i], NULL); - swapchain->vk_images[i] = VK_NULL_HANDLE; + if (destroy_user_buffers) + { + vk_funcs->p_vkDestroyImage(swapchain->vk_device, swapchain->vk_images[i], NULL); + swapchain->vk_images[i] = VK_NULL_HANDLE; + } vk_funcs->p_vkDestroySemaphore(swapchain->vk_device, swapchain->vk_semaphores[i], NULL); swapchain->vk_semaphores[i] = VK_NULL_HANDLE; } @@ -1408,8 +1420,11 @@ static void d3d12_swapchain_destroy_buffers(struct d3d12_swapchain *swapchain) if (swapchain->vk_device) { - vk_funcs->p_vkFreeMemory(swapchain->vk_device, swapchain->vk_memory, NULL); - swapchain->vk_memory = VK_NULL_HANDLE; + if (destroy_user_buffers) + { + vk_funcs->p_vkFreeMemory(swapchain->vk_device, swapchain->vk_memory, NULL); + swapchain->vk_memory = VK_NULL_HANDLE; + } vk_funcs->p_vkDestroyCommandPool(swapchain->vk_device, swapchain->vk_cmd_pool, NULL); swapchain->vk_cmd_pool = VK_NULL_HANDLE; } @@ -1556,7 +1571,7 @@ static void d3d12_swapchain_destroy(struct d3d12_swapchain *swapchain) { const struct dxgi_vk_funcs *vk_funcs = &swapchain->vk_funcs; - d3d12_swapchain_destroy_buffers(swapchain); + d3d12_swapchain_destroy_buffers(swapchain, TRUE); if (swapchain->command_queue) ID3D12CommandQueue_Release(swapchain->command_queue); @@ -1780,7 +1795,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_ResizeBuffers(IDXGISwapChain3 * && desc->Format == new_desc.Format && desc->BufferCount == new_desc.BufferCount) return S_OK; - d3d12_swapchain_destroy_buffers(swapchain); + d3d12_swapchain_destroy_buffers(swapchain, TRUE); swapchain->desc = new_desc; if (FAILED(hr = d3d12_swapchain_create_vulkan_swapchain(swapchain))) { @@ -1885,7 +1900,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_GetCoreWindow(IDXGISwapChain3 * return DXGI_ERROR_INVALID_CALL; } -static HRESULT d3d12_swapchain_blit_buffer(struct d3d12_swapchain *swapchain, VkQueue vk_queue) +static VkResult d3d12_swapchain_blit_buffer(struct d3d12_swapchain *swapchain, VkQueue vk_queue) { const struct dxgi_vk_funcs *vk_funcs = &swapchain->vk_funcs; VkSubmitInfo submit_info; @@ -1903,15 +1918,21 @@ static HRESULT d3d12_swapchain_blit_buffer(struct d3d12_swapchain *swapchain, Vk 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); - return hresult_from_vk_result(vr); + return vr; } -static HRESULT d3d12_swapchain_queue_present(struct d3d12_swapchain *swapchain, VkQueue vk_queue) +static VkResult d3d12_swapchain_queue_present(struct d3d12_swapchain *swapchain, VkQueue vk_queue) { const struct dxgi_vk_funcs *vk_funcs = &swapchain->vk_funcs; VkPresentInfoKHR present_info; VkResult vr; + if (swapchain->vk_images[swapchain->current_buffer_index]) + { + if ((vr = d3d12_swapchain_blit_buffer(swapchain, vk_queue)) < 0) + return vr; + } + present_info.sType = VK_STRUCTURE_TYPE_PRESENT_INFO_KHR; present_info.pNext = NULL; present_info.waitSemaphoreCount = 0; @@ -1927,9 +1948,7 @@ static HRESULT d3d12_swapchain_queue_present(struct d3d12_swapchain *swapchain, present_info.pWaitSemaphores = &swapchain->vk_semaphores[swapchain->current_buffer_index]; } - if ((vr = vk_funcs->p_vkQueuePresentKHR(vk_queue, &present_info)) < 0) - ERR("Failed to queue present, vr %d.\n", vr); - return hresult_from_vk_result(vr); + return vk_funcs->p_vkQueuePresentKHR(vk_queue, &present_info); } static HRESULT STDMETHODCALLTYPE d3d12_swapchain_Present1(IDXGISwapChain3 *iface, @@ -1937,6 +1956,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_Present1(IDXGISwapChain3 *iface { struct d3d12_swapchain *swapchain = d3d12_swapchain_from_IDXGISwapChain3(iface); VkQueue vk_queue; + VkResult vr; HRESULT hr; TRACE("iface %p, sync_interval %u, flags %#x, present_parameters %p.\n", @@ -1967,23 +1987,47 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_Present1(IDXGISwapChain3 *iface return E_FAIL; } - if (swapchain->vk_images[swapchain->current_buffer_index]) + vr = d3d12_swapchain_queue_present(swapchain, vk_queue); + if (vr == VK_ERROR_OUT_OF_DATE_KHR) { - if (FAILED(hr = d3d12_swapchain_blit_buffer(swapchain, vk_queue))) + vkd3d_release_vk_queue(swapchain->command_queue); + + if (!swapchain->vk_images[swapchain->current_buffer_index]) { - vkd3d_release_vk_queue(swapchain->command_queue); + FIXME("Cannot recreate swapchain without user images.\n"); + return DXGI_STATUS_MODE_CHANGED; + } + + TRACE("Recreating Vulkan swapchain.\n"); + + d3d12_swapchain_destroy_buffers(swapchain, FALSE); + if (FAILED(hr = d3d12_swapchain_create_vulkan_swapchain(swapchain))) + { + ERR("Failed to recreate Vulkan swapchain, hr %#x.\n", hr); return hr; } - } - if (FAILED(hr = d3d12_swapchain_queue_present(swapchain, vk_queue))) - { - vkd3d_release_vk_queue(swapchain->command_queue); - return hr; + if (FAILED(hr = d3d12_swapchain_acquire_next_image(swapchain))) + return hr; + + if (!(vk_queue = vkd3d_acquire_vk_queue(swapchain->command_queue))) + { + ERR("Failed to acquire Vulkan queue.\n"); + return E_FAIL; + } + + if ((vr = d3d12_swapchain_queue_present(swapchain, vk_queue)) < 0) + ERR("Failed to present after recreating swapchain, vr %d.\n", vr); } vkd3d_release_vk_queue(swapchain->command_queue); + if (vr < 0) + { + ERR("Failed to queue present, vr %d.\n", vr); + return hresult_from_vk_result(vr); + } + return d3d12_swapchain_acquire_next_image(swapchain); } -- 2.19.2

3 2

[PATCH 02/10] dxgi: Always use user images instead of using Vulkan swapchain directly.
by Józef Kucia Feb. 28, 2019

Feb. 28, 2019

Some Vulkan drivers require that swapchain dimensions and window dimensions match exactly. Additionally, we want to have ability to change the presentation mode, and the only way to change the presentation mode in Vulkan is to recreate the swapchain. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/swapchain.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 07438f3e0376..89bcf5d95638 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -1293,18 +1293,19 @@ static HRESULT d3d12_swapchain_create_buffers(struct d3d12_swapchain *swapchain, resource_info.desc.Flags = D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET; resource_info.flags = VKD3D_RESOURCE_INITIAL_STATE_TRANSITION | VKD3D_RESOURCE_PRESENT_STATE_TRANSITION; - if (vk_swapchain_format != vk_format) + queue_desc = ID3D12CommandQueue_GetDesc(queue); + if (queue_desc.Type != D3D12_COMMAND_LIST_TYPE_DIRECT) { - queue_desc = ID3D12CommandQueue_GetDesc(queue); - if (queue_desc.Type != D3D12_COMMAND_LIST_TYPE_DIRECT) - { - /* vkCmdBlitImage() is only supported for Graphics queues. */ - FIXME("Format conversion not implemented for command queue type %#x.\n", queue_desc.Type); + /* vkCmdBlitImage() is only supported for graphics queues. */ + FIXME("Swapchain blit not implemented for command queue type %#x.\n", queue_desc.Type); + if (vk_swapchain_format != vk_format) return E_NOTIMPL; - } - queue_family_index = vkd3d_get_vk_queue_family_index(queue); + } + queue_family_index = vkd3d_get_vk_queue_family_index(queue); - TRACE("Creating user swapchain buffers for format conversion.\n"); + if (queue_desc.Type == D3D12_COMMAND_LIST_TYPE_DIRECT) + { + TRACE("Creating user swapchain buffers.\n"); if (FAILED(hr = d3d12_swapchain_create_user_buffers(swapchain, vk_format))) return hr; -- 2.19.2

3 2

[PATCH 01/10] dxgi/tests: Run test_swapchain_present() on D3D12.
by Józef Kucia Feb. 28, 2019

Feb. 28, 2019

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/tests/dxgi.c | 31 +++++++++---------------------- 1 file changed, 9 insertions(+), 22 deletions(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 02cf744be358..e630a4977288 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -3910,28 +3910,16 @@ static void test_swapchain_parameters(void) DestroyWindow(window); } -static void test_swapchain_present(void) +static void test_swapchain_present(IUnknown *device, BOOL is_d3d12) { DXGI_SWAP_CHAIN_DESC swapchain_desc; IDXGISwapChain *swapchain; - IDXGIAdapter *adapter; IDXGIFactory *factory; - IDXGIDevice *device; unsigned int i; ULONG refcount; HRESULT hr; - if (!(device = create_device(0))) - { - skip("Failed to create device.\n"); - return; - } - - hr = IDXGIDevice_GetAdapter(device, &adapter); - ok(SUCCEEDED(hr), "Failed to get adapter, hr %#x.\n", hr); - hr = IDXGIAdapter_GetParent(adapter, &IID_IDXGIFactory, (void **)&factory); - ok(SUCCEEDED(hr), "Failed to get parent, hr %#x.\n", hr); - IDXGIAdapter_Release(adapter); + get_factory(device, is_d3d12, &factory); swapchain_desc.BufferDesc.Width = 800; swapchain_desc.BufferDesc.Height = 600; @@ -3943,14 +3931,14 @@ static void test_swapchain_present(void) swapchain_desc.SampleDesc.Count = 1; swapchain_desc.SampleDesc.Quality = 0; swapchain_desc.BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT; - swapchain_desc.BufferCount = 1; + swapchain_desc.BufferCount = is_d3d12 ? 2 : 1; swapchain_desc.OutputWindow = CreateWindowA("static", "dxgi_test", 0, 0, 0, 400, 200, 0, 0, 0, 0); swapchain_desc.Windowed = TRUE; - swapchain_desc.SwapEffect = DXGI_SWAP_EFFECT_DISCARD; + swapchain_desc.SwapEffect = is_d3d12 ? DXGI_SWAP_EFFECT_FLIP_DISCARD : DXGI_SWAP_EFFECT_DISCARD; swapchain_desc.Flags = 0; - hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &swapchain_desc, &swapchain); - ok(SUCCEEDED(hr), "Failed to create swapchain, hr %#x.\n", hr); + hr = IDXGIFactory_CreateSwapChain(factory, device, &swapchain_desc, &swapchain); + ok(hr == S_OK, "Failed to create swapchain, hr %#x.\n", hr); for (i = 0; i < 10; ++i) { @@ -3962,11 +3950,9 @@ static void test_swapchain_present(void) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); IDXGISwapChain_Release(swapchain); - refcount = IDXGIDevice_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); DestroyWindow(swapchain_desc.OutputWindow); refcount = IDXGIFactory_Release(factory); - ok(!refcount, "Factory has %u references left.\n", refcount); + ok(refcount == !is_d3d12, "Got unexpected refcount %u.\n", refcount); } static void test_swapchain_backbuffer_index(IUnknown *device, BOOL is_d3d12) @@ -5028,7 +5014,6 @@ START_TEST(dxgi) queue_test(test_resize_target_wndproc); queue_test(test_create_factory); queue_test(test_private_data); - queue_test(test_swapchain_present); queue_test(test_maximum_frame_latency); queue_test(test_output_desc); queue_test(test_object_wrapping); @@ -5046,6 +5031,7 @@ START_TEST(dxgi) test_swapchain_window_messages(); test_swapchain_window_styles(); run_on_d3d10(test_swapchain_resize); + run_on_d3d10(test_swapchain_present); run_on_d3d10(test_swapchain_backbuffer_index); run_on_d3d10(test_swapchain_formats); @@ -5065,6 +5051,7 @@ START_TEST(dxgi) } run_on_d3d12(test_swapchain_resize); + run_on_d3d12(test_swapchain_present); run_on_d3d12(test_swapchain_backbuffer_index); run_on_d3d12(test_swapchain_formats); -- 2.19.2

3 2

[PATCH 06/10] d3d12/tests: Add test for swapchain and window sizes mismatch.
by Józef Kucia Feb. 28, 2019

Feb. 28, 2019

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d12/tests/d3d12.c | 102 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 102 insertions(+) diff --git a/dlls/d3d12/tests/d3d12.c b/dlls/d3d12/tests/d3d12.c index 7b610c0c85a9..67e72405d89f 100644 --- a/dlls/d3d12/tests/d3d12.c +++ b/dlls/d3d12/tests/d3d12.c @@ -908,6 +908,107 @@ static void test_swapchain_draw(void) destroy_test_context(&context); } +static void test_swapchain_size_mismatch(void) +{ + static const float green[] = {0.0f, 1.0f, 0.0f, 1.0f}; + ID3D12GraphicsCommandList *command_list; + ID3D12Resource *backbuffers[2]; + struct test_context_desc desc; + struct test_context context; + ID3D12Resource *backbuffer; + IDXGISwapChain3 *swapchain; + ID3D12CommandQueue *queue; + unsigned int index, i; + ID3D12Device *device; + ULONG refcount; + HWND window; + HRESULT hr; + RECT rect; + BOOL ret; + + desc.no_pipeline = TRUE; + if (!init_test_context(&context, &desc)) + return; + device = context.device; + command_list = context.list; + queue = context.queue; + + window = CreateWindowA("static", "d3d12_test", WS_VISIBLE, 0, 0, 200, 200, NULL, NULL, NULL, NULL); + swapchain = create_swapchain(queue, window, DXGI_FORMAT_B8G8R8A8_UNORM, 400, 400); + index = IDXGISwapChain3_GetCurrentBackBufferIndex(swapchain); + hr = IDXGISwapChain3_GetBuffer(swapchain, index, &IID_ID3D12Resource, (void **)&backbuffer); + ok(hr == S_OK, "Failed to get swapchain buffer %u, hr %#x.\n", index, hr); + ID3D12Device_CreateRenderTargetView(device, backbuffer, NULL, context.rtv); + + transition_sub_resource_state(command_list, backbuffer, 0, + D3D12_RESOURCE_STATE_PRESENT, D3D12_RESOURCE_STATE_RENDER_TARGET); + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, green, 0, NULL); + transition_sub_resource_state(command_list, backbuffer, 0, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + check_sub_resource_uint(backbuffer, 0, queue, command_list, 0xff00ff00, 0); + + reset_command_list(command_list, context.allocator); + transition_sub_resource_state(command_list, backbuffer, 0, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_PRESENT); + hr = ID3D12GraphicsCommandList_Close(command_list); + ok(hr == S_OK, "Failed to close command list, hr %#x.\n", hr); + exec_command_list(queue, command_list); + + hr = IDXGISwapChain3_Present(swapchain, 1, 0); + ok(hr == S_OK, "Failed to present, hr %#x.\n", hr); + + wait_queue_idle(device, queue); + reset_command_list(command_list, context.allocator); + + refcount = ID3D12Resource_Release(backbuffer); + ok(!refcount, "Backbuffer has %u references left.\n", refcount); + refcount = IDXGISwapChain3_Release(swapchain); + ok(!refcount, "Swapchain has %u references left.\n", refcount); + DestroyWindow(window); + + window = create_window(WS_VISIBLE); + ret = GetClientRect(window, &rect); + ok(ret, "Failed to get client rect.\n"); + swapchain = create_swapchain(queue, window, DXGI_FORMAT_B8G8R8A8_UNORM, rect.right, rect.bottom); + + for (i = 0; i < ARRAY_SIZE(backbuffers); ++i) + { + hr = IDXGISwapChain3_GetBuffer(swapchain, i, &IID_ID3D12Resource, (void **)&backbuffers[i]); + ok(hr == S_OK, "Failed to get swapchain buffer %u, hr %#x.\n", i, hr); + } + + for (i = 0; i < 20; ++i) + { + index = IDXGISwapChain3_GetCurrentBackBufferIndex(swapchain); + ID3D12Device_CreateRenderTargetView(device, backbuffers[index], NULL, context.rtv); + + transition_sub_resource_state(command_list, backbuffers[index], 0, + D3D12_RESOURCE_STATE_PRESENT, D3D12_RESOURCE_STATE_RENDER_TARGET); + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, green, 0, NULL); + transition_sub_resource_state(command_list, backbuffers[index], 0, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_PRESENT); + hr = ID3D12GraphicsCommandList_Close(command_list); + ok(hr == S_OK, "Failed to close command list, hr %#x.\n", hr); + exec_command_list(queue, command_list); + + hr = IDXGISwapChain3_Present(swapchain, 1, 0); + ok(hr == S_OK, "Failed to present, hr %#x.\n", hr); + + wait_queue_idle(device, queue); + reset_command_list(command_list, context.allocator); + + if (i == 6) + MoveWindow(window, 0, 0, 100, 100, TRUE); + } + + for (i = 0; i < ARRAY_SIZE(backbuffers); ++i) + ID3D12Resource_Release(backbuffers[i]); + refcount = IDXGISwapChain3_Release(swapchain); + ok(!refcount, "Swapchain has %u references left.\n", refcount); + DestroyWindow(window); + destroy_test_context(&context); +} + START_TEST(d3d12) { BOOL enable_debug_layer = FALSE; @@ -937,4 +1038,5 @@ START_TEST(d3d12) test_interfaces(); test_draw(); test_swapchain_draw(); + test_swapchain_size_mismatch(); } -- 2.19.2

3 2

[PATCH] ieframe: add implementation for WebBrowser_get_LocationName
by Vijay Kiran Kamuju Feb. 28, 2019

Feb. 28, 2019

Based on patch from Andrey Turkin Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=12456 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/ieframe/tests/webbrowser.c | 24 +++++++++++++++++++++--- dlls/ieframe/webbrowser.c | 21 +++++++++++++++++++-- 2 files changed, 40 insertions(+), 5 deletions(-) diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index 706d5071a9cf..c78af1f78777 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -166,7 +166,7 @@ static HWND container_hwnd, shell_embedding_hwnd; static BOOL is_downloading, do_download, is_first_load, use_container_olecmd, test_close, is_http, use_container_dochostui; static HRESULT hr_dochost_TranslateAccelerator = E_NOTIMPL; static HRESULT hr_site_TranslateAccelerator = E_NOTIMPL; -static const char *current_url; +static const char *current_url, *current_title; static int wb_version, expect_update_commands_enable, set_update_commands_enable; static BOOL nav_back_todo, nav_forward_todo; /* FIXME */ @@ -267,6 +267,22 @@ static void _test_LocationURL(unsigned line, IWebBrowser2 *wb, const char *exurl } } +#define test_LocationName(a,b) _test_LocationName(__LINE__,a,b) +static void _test_LocationName(unsigned line, IUnknown *unk, const char *exname) +{ + BSTR name = (void*)0xdeadbeef; + static const char wine_title[] = "WineHQ - Run Windows applications on Linux, BSD, Solaris and Mac OS X"; + HRESULT hres; + + hres = IWebBrowser2_get_LocationName(wb, &name); + ok_(__FILE__,line) (hres == (*exname ? S_OK : S_FALSE), "get_LocationName failed: %08x\n", hres); + if (SUCCEEDED(hres)) + { + ok_(__FILE__,line) (!strcmp_wa(name, exname) || !strcmp_wa(name,wine_title), "unexpected name: %s\n", wine_dbgstr_w(name)); + SysFreeString(name); + } +} + #define test_ready_state(ex) _test_ready_state(__LINE__,ex) static void _test_ready_state(unsigned line, READYSTATE exstate) { @@ -2744,11 +2760,12 @@ static void test_Navigate2(IWebBrowser2 *webbrowser, const char *nav_url) HRESULT hres; test_LocationURL(webbrowser, is_first_load ? "" : current_url); + test_LocationName(webbrowser, is_first_load ? "" : current_title); test_ready_state(is_first_load ? READYSTATE_UNINITIALIZED : READYSTATE_COMPLETE); is_http = !memcmp(nav_url, "http:", 5); V_VT(&url) = VT_BSTR; - V_BSTR(&url) = a2bstr(current_url = nav_url); + V_BSTR(&url) = a2bstr(current_title = current_url = nav_url); if((is_file = !strncasecmp(nav_url, "file://", 7))) current_url = nav_url + 7; @@ -3182,7 +3199,7 @@ static void test_put_href(IWebBrowser2 *unk, const char *url) dwl_flags = DWL_FROM_PUT_HREF; - str = a2bstr(current_url = url); + str = a2bstr(current_title = current_url = url); is_first_load = FALSE; hres = IHTMLLocation_put_href(location, str); @@ -3728,6 +3745,7 @@ static void test_WebBrowser(DWORD flags, BOOL do_close) test_ClassInfo(webbrowser); test_EnumVerbs(webbrowser); test_LocationURL(webbrowser, ""); + test_LocationName(webbrowser, ""); test_ConnectionPoint(webbrowser, TRUE); test_ClientSite(webbrowser, &ClientSite, !do_download); test_Extent(webbrowser); diff --git a/dlls/ieframe/webbrowser.c b/dlls/ieframe/webbrowser.c index 03acf3886989..f93fc5295a7f 100644 --- a/dlls/ieframe/webbrowser.c +++ b/dlls/ieframe/webbrowser.c @@ -503,8 +503,25 @@ static HRESULT WINAPI WebBrowser_put_Height(IWebBrowser2 *iface, LONG Height) static HRESULT WINAPI WebBrowser_get_LocationName(IWebBrowser2 *iface, BSTR *LocationName) { WebBrowser *This = impl_from_IWebBrowser2(iface); - FIXME("(%p)->(%p)\n", This, LocationName); - return E_NOTIMPL; + IHTMLDocument2 *doc = NULL; + TRACE("(%p)->(%p)\n", This, LocationName); + + WebBrowser_get_Document(This, &doc); + if (doc) + { + HRESULT hres; + hres = IHTMLDocument2_get_title(doc, LocationName); + if (SUCCEEDED(hres)) + IHTMLDocument2_Release(doc); + return hres; + } else if (This->doc_host.url) { + *LocationName = SysAllocString(This->doc_host.url); + return S_OK; + } else { + static const WCHAR null_string = {0}; + *LocationName = SysAllocString(&null_string); + return S_FALSE; + } } static HRESULT WINAPI WebBrowser_get_LocationURL(IWebBrowser2 *iface, BSTR *LocationURL) -- 2.17.0

3 2