March 2019 - Wine-commits - list.winehq.org

Józef Kucia : wined3d: Add R8G8_UNORM vertex format.
by Alexandre Julliard 04 Mar '19

04 Mar '19

Module: wine Branch: master Commit: 8205547f966a60d207dbbbd3375bad2542ad5caa URL: https://source.winehq.org/git/wine.git/?a=commit;h=8205547f966a60d207dbbbd3… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Mar 1 13:31:25 2019 +0100 wined3d: Add R8G8_UNORM vertex format. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 3 ++- dlls/wined3d/utils.c | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 90488ed..4a02b3f 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -16341,6 +16341,7 @@ static void test_create_input_layout(void) DXGI_FORMAT_R32_SINT, DXGI_FORMAT_R16_UINT, DXGI_FORMAT_R16_SINT, + DXGI_FORMAT_R8G8_UNORM, DXGI_FORMAT_R8_UINT, DXGI_FORMAT_R8_SINT, }; @@ -16357,7 +16358,7 @@ static void test_create_input_layout(void) layout_desc->Format = vertex_formats[i]; hr = ID3D11Device_CreateInputLayout(device, layout_desc, ARRAY_SIZE(layout_desc), vs_code, sizeof(vs_code), &input_layout); - ok(SUCCEEDED(hr), "Failed to create input layout for format %#x, hr %#x.\n", + ok(hr == S_OK, "Failed to create input layout for format %#x, hr %#x.\n", vertex_formats[i], hr); refcount = get_refcount(device); ok(refcount == expected_refcount, "Got refcount %u, expected %u.\n", diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 062f866..469ce1b 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -633,6 +633,7 @@ static const struct wined3d_format_vertex_info format_vertex_info[] = {WINED3DFMT_R16G16B16A16_FLOAT, WINED3D_FFP_EMIT_FLOAT16_4, GL_HALF_FLOAT, ARB_HALF_FLOAT_VERTEX}, {WINED3DFMT_R8G8B8A8_SNORM, WINED3D_FFP_EMIT_INVALID, GL_BYTE}, {WINED3DFMT_R8G8B8A8_SINT, WINED3D_FFP_EMIT_INVALID, GL_BYTE}, + {WINED3DFMT_R8G8_UNORM, WINED3D_FFP_EMIT_INVALID, GL_UNSIGNED_BYTE}, {WINED3DFMT_R16G16B16A16_UINT, WINED3D_FFP_EMIT_INVALID, GL_UNSIGNED_SHORT}, {WINED3DFMT_R8_UNORM, WINED3D_FFP_EMIT_INVALID, GL_UNSIGNED_BYTE}, {WINED3DFMT_R8_UINT, WINED3D_FFP_EMIT_INVALID, GL_UNSIGNED_BYTE},

1 0

Józef Kucia : maintainers: Add d3d12 to Direct3D section.
by Alexandre Julliard 04 Mar '19

04 Mar '19

Module: wine Branch: master Commit: d42fe85f2c2d824e68095570b15c2c4c9ce6cff3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d42fe85f2c2d824e68095570… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Mar 1 13:31:26 2019 +0100 maintainers: Add d3d12 to Direct3D section. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index e72a9e8..3442827 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -68,6 +68,7 @@ P: Józef Kucia <jkucia(a)codeweavers.com> P: Matteo Bruni <mbruni(a)codeweavers.com> F: dlls/d3d10*/ F: dlls/d3d11/ +F: dlls/d3d12/ F: dlls/d3d8/ F: dlls/d3d9/ F: dlls/d3drm/

1 0

Józef Kucia : dxgi: Introduce d3d12_swapchain_have_user_images().
by Alexandre Julliard 04 Mar '19

04 Mar '19

Module: wine Branch: master Commit: 17d577415243a740c4c1ca2a30a4e7e2c18696c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=17d577415243a740c4c1ca2a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Mar 1 13:31:27 2019 +0100 dxgi: Introduce d3d12_swapchain_have_user_images(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/swapchain.c | 68 ++++++++++++++++++++++----------------------------- 1 file changed, 29 insertions(+), 39 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 3c09516..f2f89b9 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -1067,6 +1067,11 @@ static BOOL d3d12_swapchain_is_present_mode_supported(struct d3d12_swapchain *sw return supported; } +static BOOL d3d12_swapchain_have_user_images(struct d3d12_swapchain *swapchain) +{ + return !!swapchain->vk_images[0]; +} + static HRESULT d3d12_swapchain_create_user_buffers(struct d3d12_swapchain *swapchain, VkFormat vk_format) { const struct dxgi_vk_funcs *vk_funcs = &swapchain->vk_funcs; @@ -1081,7 +1086,7 @@ static HRESULT d3d12_swapchain_create_user_buffers(struct d3d12_swapchain *swapc VkResult vr; HRESULT hr; - if (swapchain->vk_images[0]) + if (d3d12_swapchain_have_user_images(swapchain)) return S_OK; memset(&image_info, 0, sizeof(image_info)); @@ -1437,7 +1442,6 @@ static HRESULT d3d12_swapchain_acquire_next_image(struct d3d12_swapchain *swapch 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; @@ -1455,11 +1459,9 @@ static void d3d12_swapchain_destroy_buffers(struct d3d12_swapchain *swapchain, B } } - have_user_images = swapchain->vk_images[0]; - for (i = 0; i < swapchain->buffer_count; ++i) { - if (swapchain->buffers[i] && (destroy_user_buffers || !have_user_images)) + if (swapchain->buffers[i] && (destroy_user_buffers || !d3d12_swapchain_have_user_images(swapchain))) { vkd3d_resource_decref(swapchain->buffers[i]); swapchain->buffers[i] = NULL; @@ -1589,10 +1591,7 @@ static HRESULT d3d12_swapchain_create_vulkan_swapchain(struct d3d12_swapchain *s 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; - - return S_OK; + return d3d12_swapchain_create_buffers(swapchain, vk_swapchain_format, vk_format); } static inline struct d3d12_swapchain *d3d12_swapchain_from_IDXGISwapChain3(IDXGISwapChain3 *iface) @@ -1999,7 +1998,7 @@ static HRESULT d3d12_swapchain_set_sync_interval(struct d3d12_swapchain *swapcha return S_OK; } - if (!swapchain->vk_images[swapchain->current_buffer_index]) + if (!d3d12_swapchain_have_user_images(swapchain)) { FIXME("Cannot recreate swapchain without user images.\n"); return S_OK; @@ -2024,39 +2023,13 @@ static HRESULT d3d12_swapchain_set_sync_interval(struct d3d12_swapchain *swapcha 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; - VkSubmitInfo submit_info; - VkResult vr; - - submit_info.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO; - submit_info.pNext = NULL; - submit_info.waitSemaphoreCount = 0; - submit_info.pWaitSemaphores = NULL; - submit_info.pWaitDstStageMask = NULL; - submit_info.commandBufferCount = 1; - submit_info.pCommandBuffers = &swapchain->vk_cmd_buffers[swapchain->current_buffer_index]; - submit_info.signalSemaphoreCount = 1; - submit_info.pSignalSemaphores = &swapchain->vk_semaphores[swapchain->current_buffer_index]; - - 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 vr; -} - 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; + VkSubmitInfo submit_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; @@ -2066,8 +2039,25 @@ static VkResult d3d12_swapchain_queue_present(struct d3d12_swapchain *swapchain, present_info.pImageIndices = &swapchain->current_buffer_index; present_info.pResults = NULL; - if (swapchain->vk_semaphores[swapchain->current_buffer_index]) + if (d3d12_swapchain_have_user_images(swapchain)) { + /* blit */ + submit_info.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO; + submit_info.pNext = NULL; + submit_info.waitSemaphoreCount = 0; + submit_info.pWaitSemaphores = NULL; + submit_info.pWaitDstStageMask = NULL; + submit_info.commandBufferCount = 1; + submit_info.pCommandBuffers = &swapchain->vk_cmd_buffers[swapchain->current_buffer_index]; + submit_info.signalSemaphoreCount = 1; + submit_info.pSignalSemaphores = &swapchain->vk_semaphores[swapchain->current_buffer_index]; + + 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 vr; + } + present_info.waitSemaphoreCount = 1; present_info.pWaitSemaphores = &swapchain->vk_semaphores[swapchain->current_buffer_index]; } @@ -2117,7 +2107,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_Present1(IDXGISwapChain3 *iface { vkd3d_release_vk_queue(swapchain->command_queue); - if (!swapchain->vk_images[swapchain->current_buffer_index]) + if (!d3d12_swapchain_have_user_images(swapchain)) { FIXME("Cannot recreate swapchain without user images.\n"); return DXGI_STATUS_MODE_CHANGED;

1 0

Józef Kucia : dxgi: Factor out d3d12_swapchain_recreate_vulkan_swapchain().
by Alexandre Julliard 04 Mar '19

04 Mar '19

Module: wine Branch: master Commit: 09e7f1cba15949c6f2618a436bf46492ad09aaf6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=09e7f1cba15949c6f2618a43… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Mar 1 13:31:28 2019 +0100 dxgi: Factor out d3d12_swapchain_recreate_vulkan_swapchain(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/swapchain.c | 64 ++++++++++++++++++++++----------------------------- 1 file changed, 28 insertions(+), 36 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index f2f89b9..22feeae 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -1411,7 +1411,7 @@ static HRESULT d3d12_swapchain_create_buffers(struct d3d12_swapchain *swapchain, return S_OK; } -static HRESULT d3d12_swapchain_acquire_next_image(struct d3d12_swapchain *swapchain) +static VkResult d3d12_swapchain_acquire_next_image(struct d3d12_swapchain *swapchain) { const struct dxgi_vk_funcs *vk_funcs = &swapchain->vk_funcs; VkDevice vk_device = swapchain->vk_device; @@ -1422,21 +1422,18 @@ static HRESULT d3d12_swapchain_acquire_next_image(struct d3d12_swapchain *swapch VK_NULL_HANDLE, vk_fence, &swapchain->current_buffer_index)) < 0) { ERR("Failed to acquire next Vulkan image, vr %d.\n", vr); - return hresult_from_vk_result(vr); + return vr; } if ((vr = vk_funcs->p_vkWaitForFences(vk_device, 1, &vk_fence, VK_TRUE, UINT64_MAX)) != VK_SUCCESS) { ERR("Failed to wait for fence, vr %d.\n", vr); - return hresult_from_vk_result(vr); + return vr; } if ((vr = vk_funcs->p_vkResetFences(vk_device, 1, &vk_fence)) < 0) - { ERR("Failed to reset fence, vr %d.\n", vr); - return hresult_from_vk_result(vr); - } - return S_OK; + return vr; } static void d3d12_swapchain_destroy_buffers(struct d3d12_swapchain *swapchain, BOOL destroy_user_buffers) @@ -1594,6 +1591,23 @@ static HRESULT d3d12_swapchain_create_vulkan_swapchain(struct d3d12_swapchain *s return d3d12_swapchain_create_buffers(swapchain, vk_swapchain_format, vk_format); } +static HRESULT d3d12_swapchain_recreate_vulkan_swapchain(struct d3d12_swapchain *swapchain) +{ + VkResult vr; + HRESULT hr; + + if (FAILED(hr = d3d12_swapchain_create_vulkan_swapchain(swapchain))) + { + ERR("Failed to recreate Vulkan swapchain, hr %#x.\n", hr); + return hr; + } + + if ((vr = d3d12_swapchain_acquire_next_image(swapchain)) < 0) + ERR("Failed to acquire Vulkan image after recreating swapchain, vr %d.\n", vr); + + return hresult_from_vk_result(vr); +} + static inline struct d3d12_swapchain *d3d12_swapchain_from_IDXGISwapChain3(IDXGISwapChain3 *iface) { return CONTAINING_RECORD(iface, struct d3d12_swapchain, IDXGISwapChain3_iface); @@ -1811,7 +1825,6 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_ResizeBuffers(IDXGISwapChain3 * DXGI_SWAP_CHAIN_DESC1 *desc, new_desc; unsigned int i; ULONG refcount; - HRESULT hr; TRACE("iface %p, buffer_count %u, width %u, height %u, format %s, flags %#x.\n", iface, buffer_count, width, height, debug_dxgi_format(format), flags); @@ -1864,13 +1877,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_ResizeBuffers(IDXGISwapChain3 * d3d12_swapchain_destroy_buffers(swapchain, TRUE); swapchain->desc = new_desc; - 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); + return d3d12_swapchain_recreate_vulkan_swapchain(swapchain); } static HRESULT STDMETHODCALLTYPE d3d12_swapchain_ResizeTarget(IDXGISwapChain3 *iface, @@ -1971,7 +1978,6 @@ static HRESULT d3d12_swapchain_set_sync_interval(struct d3d12_swapchain *swapcha unsigned int sync_interval) { VkPresentModeKHR present_mode; - HRESULT hr; switch (sync_interval) { @@ -2011,16 +2017,8 @@ static HRESULT d3d12_swapchain_set_sync_interval(struct d3d12_swapchain *swapcha } 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); + return d3d12_swapchain_recreate_vulkan_swapchain(swapchain); } static VkResult d3d12_swapchain_queue_present(struct d3d12_swapchain *swapchain, VkQueue vk_queue) @@ -2116,13 +2114,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_Present1(IDXGISwapChain3 *iface 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_acquire_next_image(swapchain))) + if (FAILED(hr = d3d12_swapchain_recreate_vulkan_swapchain(swapchain))) return hr; if (!(vk_queue = vkd3d_acquire_vk_queue(swapchain->command_queue))) @@ -2143,7 +2135,8 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_Present1(IDXGISwapChain3 *iface return hresult_from_vk_result(vr); } - return d3d12_swapchain_acquire_next_image(swapchain); + vr = d3d12_swapchain_acquire_next_image(swapchain); + return hresult_from_vk_result(vr); } static BOOL STDMETHODCALLTYPE d3d12_swapchain_IsTemporaryMonoSupported(IDXGISwapChain3 *iface) @@ -2575,11 +2568,10 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI } swapchain->vk_fence = vk_fence; - if (FAILED(hr = d3d12_swapchain_acquire_next_image(swapchain))) + if ((vr = d3d12_swapchain_acquire_next_image(swapchain)) < 0) { - WARN("Failed to acquire Vulkan image, hr %#x.\n", hr); d3d12_swapchain_destroy(swapchain); - return hr; + return hresult_from_vk_result(vr); } IWineDXGIFactory_AddRef(swapchain->factory = factory);

1 0

Józef Kucia : dxgi: Handle VK_ERROR_OUT_OF_DATE_KHR returned from vkAcquireNextImageKHR().
by Alexandre Julliard 04 Mar '19

04 Mar '19

Module: wine Branch: master Commit: bfdc07e7d0cc039557139acbfffd54d7669a7ef2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bfdc07e7d0cc039557139acb… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Mar 1 13:31:29 2019 +0100 dxgi: Handle VK_ERROR_OUT_OF_DATE_KHR returned from vkAcquireNextImageKHR(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/swapchain.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 22feeae..991a505 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -1421,7 +1421,7 @@ static VkResult d3d12_swapchain_acquire_next_image(struct d3d12_swapchain *swapc if ((vr = vk_funcs->p_vkAcquireNextImageKHR(vk_device, swapchain->vk_swapchain, UINT64_MAX, VK_NULL_HANDLE, vk_fence, &swapchain->current_buffer_index)) < 0) { - ERR("Failed to acquire next Vulkan image, vr %d.\n", vr); + WARN("Failed to acquire next Vulkan image, vr %d.\n", vr); return vr; } @@ -2136,6 +2136,14 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_Present1(IDXGISwapChain3 *iface } vr = d3d12_swapchain_acquire_next_image(swapchain); + if (vr == VK_ERROR_OUT_OF_DATE_KHR) + { + TRACE("Recreating Vulkan swapchain.\n"); + d3d12_swapchain_destroy_buffers(swapchain, FALSE); + return d3d12_swapchain_recreate_vulkan_swapchain(swapchain); + } + if (vr < 0) + ERR("Failed to acquire next Vulkan image, vr %d.\n", vr); return hresult_from_vk_result(vr); } @@ -2570,6 +2578,7 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI if ((vr = d3d12_swapchain_acquire_next_image(swapchain)) < 0) { + ERR("Failed to acquire Vulkan image, vr %d.\n", vr); d3d12_swapchain_destroy(swapchain); return hresult_from_vk_result(vr); }

1 0

Józef Kucia : d3d12/tests: Use multiple command lists in test_swapchain_backbuffer_index().
by Alexandre Julliard 04 Mar '19

04 Mar '19

Module: wine Branch: master Commit: ac676388cab860e3e5e469b823343f3b11d62d3a URL: https://source.winehq.org/git/wine.git/?a=commit;h=ac676388cab860e3e5e469b8… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Mar 1 13:31:30 2019 +0100 d3d12/tests: Use multiple command lists in test_swapchain_backbuffer_index(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d12/tests/d3d12.c | 271 ++++++++++++++++++++++++++++------------------- 1 file changed, 161 insertions(+), 110 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ac676388cab860e3e5e4…

1 0

Józef Kucia : d3d12/tests: Use multiple command lists in test_swapchain_size_mismatch().
by Alexandre Julliard 04 Mar '19

04 Mar '19

Module: wine Branch: master Commit: a6b572008800b8ea10804fd6524550590e512bd0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6b572008800b8ea10804fd6… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Mar 1 13:31:31 2019 +0100 d3d12/tests: Use multiple command lists in test_swapchain_size_mismatch(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d12/tests/d3d12.c | 35 +++++++++++++++++++++++++++++++---- 1 file changed, 31 insertions(+), 4 deletions(-) diff --git a/dlls/d3d12/tests/d3d12.c b/dlls/d3d12/tests/d3d12.c index 5cb9a29..16e5c4b 100644 --- a/dlls/d3d12/tests/d3d12.c +++ b/dlls/d3d12/tests/d3d12.c @@ -954,6 +954,7 @@ static void test_swapchain_draw(void) static void test_swapchain_size_mismatch(void) { static const float green[] = {0.0f, 1.0f, 0.0f, 1.0f}; + UINT64 frame_fence_value[MAX_FRAME_COUNT] = {0}; ID3D12GraphicsCommandList *command_list; D3D12_CPU_DESCRIPTOR_HANDLE rtv; struct test_context_desc desc; @@ -963,6 +964,8 @@ static void test_swapchain_size_mismatch(void) ID3D12CommandQueue *queue; unsigned int index, i; ID3D12Device *device; + ID3D12Fence *fence; + UINT64 fence_value; ULONG refcount; HWND window; HRESULT hr; @@ -1010,12 +1013,28 @@ static void test_swapchain_size_mismatch(void) window = create_window(WS_VISIBLE); ret = GetClientRect(window, &rect); ok(ret, "Failed to get client rect.\n"); - swapchain = create_swapchain(&context, window, 2, DXGI_FORMAT_B8G8R8A8_UNORM, rect.right, rect.bottom); + swapchain = create_swapchain(&context, window, 4, DXGI_FORMAT_B8G8R8A8_UNORM, rect.right, rect.bottom); + + hr = ID3D12Device_CreateFence(device, 0, D3D12_FENCE_FLAG_NONE, &IID_ID3D12Fence, (void **)&fence); + ok(hr == S_OK, "Failed to create fence, hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(context.list); ++i) + { + hr = ID3D12GraphicsCommandList_Close(context.list[i]); + ok(hr == S_OK, "Failed to close command list %u, hr %#x.\n", i, hr); + } + fence_value = 1; for (i = 0; i < 20; ++i) { index = IDXGISwapChain3_GetCurrentBackBufferIndex(swapchain); + + hr = wait_for_fence(fence, frame_fence_value[index]); + ok(hr == S_OK, "Failed to wait for fence, hr %#x.\n", hr); + + reset_command_list(&context, index); backbuffer = context.render_target[index]; + command_list = context.list[index]; rtv = context.rtv[index]; transition_sub_resource_state(command_list, backbuffer, 0, @@ -1030,13 +1049,21 @@ static void test_swapchain_size_mismatch(void) 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(&context, 0); - if (i == 6) + { + wait_queue_idle(device, queue); MoveWindow(window, 0, 0, 100, 100, TRUE); + } + + frame_fence_value[index] = fence_value; + hr = ID3D12CommandQueue_Signal(queue, fence, fence_value); + ok(hr == S_OK, "Failed to signal fence, hr %#x.\n", hr); + ++fence_value; } + wait_queue_idle(device, queue); + + ID3D12Fence_Release(fence); destroy_render_targets(&context); refcount = IDXGISwapChain3_Release(swapchain); ok(!refcount, "Swapchain has %u references left.\n", refcount);

1 0

Michael Stefaniuc : ieframe/tests: Remove useless cast to self.
by Alexandre Julliard 04 Mar '19

04 Mar '19

Module: wine Branch: master Commit: fbc92ec220881ea4061f393a93c3541024a8a385 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fbc92ec220881ea4061f393a… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Mar 1 21:08:24 2019 +0100 ieframe/tests: Remove useless cast to self. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ieframe/tests/webbrowser.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index 706d507..0e73117 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -4069,7 +4069,7 @@ static void test_SetAdvise(void) ok(!flags, "got %08x\n", aspects); ok(sink == NULL, "got %p\n", sink); - hr = IViewObject2_SetAdvise(view, DVASPECT_CONTENT, 0, (IAdviseSink *)&test_sink); + hr = IViewObject2_SetAdvise(view, DVASPECT_CONTENT, 0, &test_sink); ok(hr == S_OK, "got %08x\n", hr); aspects = flags = 0xdeadbeef;

1 0

Michael Stefaniuc : winedump: Remove useless casts to self.
by Alexandre Julliard 04 Mar '19

04 Mar '19

Module: wine Branch: master Commit: 22e74da91442cf209c793bf429aa9658e10fe41d URL: https://source.winehq.org/git/wine.git/?a=commit;h=22e74da91442cf209c793bf4… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Mar 1 21:08:20 2019 +0100 winedump: Remove useless casts to self. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winedump/debug.c | 4 ++-- tools/winedump/msc.c | 4 ++-- tools/winedump/msmangle.c | 10 +++++----- tools/winedump/pdb.c | 4 ++-- tools/winedump/search.c | 4 ++-- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/tools/winedump/debug.c b/tools/winedump/debug.c index 221c079..7fa5f4e 100644 --- a/tools/winedump/debug.c +++ b/tools/winedump/debug.c @@ -413,7 +413,7 @@ static void dump_codeview_headers(unsigned long base, unsigned long len) if (memcmp(signature, "NB10", 4) == 0) { const CODEVIEW_PDB_DATA* pdb_data; - pdb_data = (const void *)cv_base; + pdb_data = cv_base; printf(" Filepos: 0x%08lX\n", pdb_data->filepos); printf(" TimeStamp: %08X (%s)\n", @@ -426,7 +426,7 @@ static void dump_codeview_headers(unsigned long base, unsigned long len) { const OMFSignatureRSDS* rsds_data; - rsds_data = (const void *)cv_base; + rsds_data = cv_base; printf(" Guid: %s\n", get_guid_str(&rsds_data->guid)); printf(" Age: %08X\n", rsds_data->age); printf(" Filename: %s\n", rsds_data->name); diff --git a/tools/winedump/msc.c b/tools/winedump/msc.c index 5890b29..5f7765f 100644 --- a/tools/winedump/msc.c +++ b/tools/winedump/msc.c @@ -91,7 +91,7 @@ static int full_numeric_leaf(struct full_value* fv, const unsigned short int* le case LF_USHORT: length += 2; - fv->v.i = *(const unsigned short*)leaf; + fv->v.i = *leaf; break; case LF_LONG: @@ -1490,7 +1490,7 @@ void codeview_dump_linetab2(const char* linetab, DWORD size, const char* strimag break; default: printf("%sblock end %x\n", pfx, lt2->header); - lt2 = (const struct codeview_linetab2*)((const char*)linetab + size); + lt2 = (const struct codeview_linetab2*)(linetab + size); continue; } lt2 = codeview_linetab2_next_block(lt2); diff --git a/tools/winedump/msmangle.c b/tools/winedump/msmangle.c index 39e4f3a..f9fe75b 100644 --- a/tools/winedump/msmangle.c +++ b/tools/winedump/msmangle.c @@ -590,7 +590,7 @@ static char *demangle_datatype (char **str, compound_type *ct, if (!ct->expression) return NULL; - return (char *)(*str = iter); + return *str = iter; } @@ -629,7 +629,7 @@ static char *get_constraints_convention_1 (char **str, compound_type *ct) char *iter = *str, **retval = str; if (ct->have_qualifiers) - return (char *)*str; /* Previously got constraints for this type */ + return *str; /* Previously got constraints for this type */ if (*iter == '?' || *iter == 'A') { @@ -651,7 +651,7 @@ static char *get_constraints_convention_1 (char **str, compound_type *ct) } } - return (char *)(*retval = iter); + return *retval = iter; } @@ -666,7 +666,7 @@ static char *get_constraints_convention_2 (char **str, compound_type *ct) /* FIXME: Why do arrays have both convention 1 & 2 constraints? */ if (ct->have_qualifiers && ct->dest_type != 'Q') - return (char *)*str; /* Previously got constraints for this type */ + return *str; /* Previously got constraints for this type */ ct->have_qualifiers = TRUE; /* Even if none, we've got all we're getting */ @@ -687,7 +687,7 @@ static char *get_constraints_convention_2 (char **str, compound_type *ct) break; } - return (char *)(*retval = iter); + return *retval = iter; } diff --git a/tools/winedump/pdb.c b/tools/winedump/pdb.c index 6fd70ce..dcfbea8 100644 --- a/tools/winedump/pdb.c +++ b/tools/winedump/pdb.c @@ -336,7 +336,7 @@ static void pdb_dump_symbols(struct pdb_reader* reader, PDB_STREAM_INDEXES* sidx for (j = cfile; j < src->nSrcFiles && j < cfile + indx[i]; j++) { /* FIXME: in some cases, it's a p_string but WHEN ? */ - if (cstr + offset[j] >= (const char*)start_cstr /* wrap around */ && + if (cstr + offset[j] >= start_cstr /* wrap around */ && cstr + offset[j] < (const char*)src + symbols->srcmodule_size) printf("\t\t\tSource file: %s\n", cstr + offset[j]); else @@ -367,7 +367,7 @@ static void pdb_dump_symbols(struct pdb_reader* reader, PDB_STREAM_INDEXES* sidx "\t\tAge: %08u\n" "\t\tfile1: %s\n" "\t\tfile2: %s\n", - (ULONG_PTR)((const char*)imp - (const char*)first), + (ULONG_PTR)((const char*)imp - first), imp->unknown1, imp->unknown2, imp->TimeDateStamp, diff --git a/tools/winedump/search.c b/tools/winedump/search.c index 08aa8e1..49f83ca 100644 --- a/tools/winedump/search.c +++ b/tools/winedump/search.c @@ -311,7 +311,7 @@ static const char *get_type (parsed_symbol *sym, const char *proto, int arg) if (arg < 0) { - sym->return_text = (char*)type_str; + sym->return_text = type_str; sym->return_type = dest_type; } else @@ -332,7 +332,7 @@ static const char *get_type (parsed_symbol *sym, const char *proto, int arg) sym->arg_name [arg] = str_substring (proto_str, iter); proto_str = iter; } - sym->arg_text [arg] = (char*)type_str; + sym->arg_text [arg] = type_str; } return proto_str;

1 0

Michael Stefaniuc : ntdll/tests: Avoid using the comma operator.
by Alexandre Julliard 04 Mar '19

04 Mar '19

Module: wine Branch: master Commit: a4ff7ea2b486bcc5042712fe3e553ca33fe6b06a URL: https://source.winehq.org/git/wine.git/?a=commit;h=a4ff7ea2b486bcc5042712fe… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Mar 1 21:08:19 2019 +0100 ntdll/tests: Avoid using the comma operator. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/directory.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/directory.c b/dlls/ntdll/tests/directory.c index a69b31b..1109f7f 100644 --- a/dlls/ntdll/tests/directory.c +++ b/dlls/ntdll/tests/directory.c @@ -619,7 +619,7 @@ static void test_NtQueryDirectoryFile(void) ok( filename[0] == '.' && filename[1] == '.', "incorrect long file name: %s\n", wine_dbgstr_wn(next->FileName, next->FileNameLength/sizeof(WCHAR))); - data_size = fbdi->NextEntryOffset + offsetof( FILE_BOTH_DIRECTORY_INFORMATION, FileName[1] ), + data_size = fbdi->NextEntryOffset + offsetof( FILE_BOTH_DIRECTORY_INFORMATION, FileName[1] ); memset( data, 0x55, data_size ); U(io).Status = 0xdeadbeef; U(io).Information = 0xdeadbeef; @@ -636,7 +636,7 @@ static void test_NtQueryDirectoryFile(void) next = (FILE_BOTH_DIRECTORY_INFORMATION *)&fbdi->FileName[1]; ok( next->NextEntryOffset == 0x55555555, "wrong offset %x\n", next->NextEntryOffset ); - data_size = fbdi->NextEntryOffset + offsetof( FILE_BOTH_DIRECTORY_INFORMATION, FileName[2] ), + data_size = fbdi->NextEntryOffset + offsetof( FILE_BOTH_DIRECTORY_INFORMATION, FileName[2] ); memset( data, 0x55, data_size ); U(io).Status = 0xdeadbeef; U(io).Information = 0xdeadbeef;

1 0