wine-commits February 2019

wine-commits@winehq.org

1 participants
672 discussions

Matteo Bruni : d3d9/tests: Add a test for drawing with released buffers.
by Alexandre Julliard 28 Feb '19

28 Feb '19

Module: wine Branch: master Commit: 73d9d728defa51ab1d23e13d0ea811235d664a54 URL: https://source.winehq.org/git/wine.git/?a=commit;h=73d9d728defa51ab1d23e13d… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Feb 27 18:30:10 2019 +0100 d3d9/tests: Add a test for drawing with released buffers. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 52 +++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 49 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 52d67c8..69cd441 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -24518,8 +24518,9 @@ static void test_color_vertex(void) static void test_sysmem_draw(void) { - IDirect3DVertexBuffer9 *vb, *vb_s0, *vb_s1, *dst_vb; + IDirect3DVertexBuffer9 *vb, *vb_s0, *vb_s1, *dst_vb, *get_vb; IDirect3DVertexDeclaration9 *vertex_declaration; + unsigned int i, offset, stride; IDirect3DTexture9 *texture; IDirect3DIndexBuffer9 *ib; IDirect3DDevice9 *device; @@ -24527,7 +24528,6 @@ static void test_sysmem_draw(void) D3DLOCKED_RECT lr; IDirect3D9 *d3d; D3DCOLOR colour; - unsigned int i; ULONG refcount; HWND window; HRESULT hr; @@ -24713,6 +24713,53 @@ static void test_sysmem_draw(void) colour = getPixelColor(device, 320, 240); ok(color_match(colour, 0x00443322, 1), "Got unexpected colour 0x%08x.\n", colour); + /* Test that releasing but not unbinding a vertex buffer doesn't break. */ + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_DIFFUSE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetStreamSource(device, 0, vb, 0, sizeof(*quad)); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetIndices(device, ib); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + refcount = IDirect3DVertexBuffer9_Release(vb_s1); + ok(!refcount, "Unexpected refcount %u.\n", refcount); + hr = IDirect3DDevice9_GetStreamSource(device, 1, &get_vb, &offset, &stride); + ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); + ok(get_vb == vb_s1, "Got unexpected vertex buffer %p.\n", get_vb); + refcount = IDirect3DVertexBuffer9_Release(get_vb); + ok(!refcount, "Unexpected refcount %u.\n", refcount); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0x77777777, 0.0f, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawIndexedPrimitive(device, D3DPT_TRIANGLESTRIP, 0, 0, 4, 0, 2); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + colour = getPixelColor(device, 320, 240); + ok(color_match(colour, 0x00007f7f, 1), "Got unexpected colour 0x%08x.\n", colour); + + hr = IDirect3DDevice9_SetVertexDeclaration(device, vertex_declaration); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetStreamSource(device, 0, vb_s0, 0, sizeof(*quad_s0)); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0x77777777, 0.0f, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawIndexedPrimitive(device, D3DPT_TRIANGLESTRIP, 0, 0, 4, 0, 2); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + colour = getPixelColor(device, 320, 240); + ok(color_match(colour, 0x00007f7f, 1), "Got unexpected colour 0x%08x.\n", colour); + hr = IDirect3DDevice9_CreateTexture(device, 2, 2, 1, 0, D3DFMT_A8R8G8B8, D3DPOOL_SYSTEMMEM, &texture, NULL); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); memset(&lr, 0, sizeof(lr)); @@ -24742,7 +24789,6 @@ static void test_sysmem_draw(void) ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); IDirect3DTexture9_Release(texture); - IDirect3DVertexBuffer9_Release(vb_s1); IDirect3DVertexBuffer9_Release(vb_s0); IDirect3DVertexDeclaration9_Release(vertex_declaration); IDirect3DIndexBuffer9_Release(ib);

1 0

Matteo Bruni : d3d8: Release system memory wined3d buffer only after the draw buffer is destroyed.
by Alexandre Julliard 28 Feb '19

28 Feb '19

Module: wine Branch: master Commit: 873178c03a56eca4d818369386b0be6ba01b08c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=873178c03a56eca4d8183693… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Feb 27 18:30:09 2019 +0100 d3d8: Release system memory wined3d buffer only after the draw buffer is destroyed. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46371 Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/buffer.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/d3d8/buffer.c b/dlls/d3d8/buffer.c index 8aec654..822730f 100644 --- a/dlls/d3d8/buffer.c +++ b/dlls/d3d8/buffer.c @@ -57,9 +57,10 @@ static ULONG WINAPI d3d8_vertexbuffer_AddRef(IDirect3DVertexBuffer8 *iface) { IDirect3DDevice8_AddRef(buffer->parent_device); wined3d_mutex_lock(); - wined3d_buffer_incref(buffer->wined3d_buffer); if (buffer->draw_buffer) wined3d_buffer_incref(buffer->draw_buffer); + else + wined3d_buffer_incref(buffer->wined3d_buffer); wined3d_mutex_unlock(); } @@ -79,9 +80,10 @@ static ULONG WINAPI d3d8_vertexbuffer_Release(IDirect3DVertexBuffer8 *iface) IDirect3DDevice8 *device = buffer->parent_device; wined3d_mutex_lock(); - wined3d_buffer_decref(buffer->wined3d_buffer); if (draw_buffer) wined3d_buffer_decref(draw_buffer); + else + wined3d_buffer_decref(buffer->wined3d_buffer); wined3d_mutex_unlock(); /* Release the device last, as it may cause the device to be destroyed. */ @@ -269,6 +271,9 @@ static const IDirect3DVertexBuffer8Vtbl Direct3DVertexBuffer8_Vtbl = static void STDMETHODCALLTYPE d3d8_vertexbuffer_wined3d_object_destroyed(void *parent) { struct d3d8_vertexbuffer *buffer = parent; + + if (buffer->draw_buffer) + wined3d_buffer_decref(buffer->wined3d_buffer); d3d8_resource_cleanup(&buffer->resource); heap_free(buffer); } @@ -380,9 +385,10 @@ static ULONG WINAPI d3d8_indexbuffer_AddRef(IDirect3DIndexBuffer8 *iface) { IDirect3DDevice8_AddRef(buffer->parent_device); wined3d_mutex_lock(); - wined3d_buffer_incref(buffer->wined3d_buffer); if (buffer->draw_buffer) wined3d_buffer_incref(buffer->draw_buffer); + else + wined3d_buffer_incref(buffer->wined3d_buffer); wined3d_mutex_unlock(); } @@ -402,9 +408,10 @@ static ULONG WINAPI d3d8_indexbuffer_Release(IDirect3DIndexBuffer8 *iface) IDirect3DDevice8 *device = buffer->parent_device; wined3d_mutex_lock(); - wined3d_buffer_decref(buffer->wined3d_buffer); if (draw_buffer) wined3d_buffer_decref(draw_buffer); + else + wined3d_buffer_decref(buffer->wined3d_buffer); wined3d_mutex_unlock(); /* Release the device last, as it may cause the device to be destroyed. */ @@ -591,6 +598,9 @@ static const IDirect3DIndexBuffer8Vtbl d3d8_indexbuffer_vtbl = static void STDMETHODCALLTYPE d3d8_indexbuffer_wined3d_object_destroyed(void *parent) { struct d3d8_indexbuffer *buffer = parent; + + if (buffer->draw_buffer) + wined3d_buffer_decref(buffer->wined3d_buffer); d3d8_resource_cleanup(&buffer->resource); heap_free(buffer); }

1 0

Matteo Bruni : d3d9: Release system memory wined3d buffer only after the draw buffer is destroyed.
by Alexandre Julliard 28 Feb '19

28 Feb '19

Module: wine Branch: master Commit: 7052e8e390b5998ff0c7870504dd499c59299f4b URL: https://source.winehq.org/git/wine.git/?a=commit;h=7052e8e390b5998ff0c78705… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Feb 27 18:30:08 2019 +0100 d3d9: Release system memory wined3d buffer only after the draw buffer is destroyed. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/buffer.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/d3d9/buffer.c b/dlls/d3d9/buffer.c index dcd7e28..43321b3 100644 --- a/dlls/d3d9/buffer.c +++ b/dlls/d3d9/buffer.c @@ -59,9 +59,10 @@ static ULONG WINAPI d3d9_vertexbuffer_AddRef(IDirect3DVertexBuffer9 *iface) { IDirect3DDevice9Ex_AddRef(buffer->parent_device); wined3d_mutex_lock(); - wined3d_buffer_incref(buffer->wined3d_buffer); if (buffer->draw_buffer) wined3d_buffer_incref(buffer->draw_buffer); + else + wined3d_buffer_incref(buffer->wined3d_buffer); wined3d_mutex_unlock(); } @@ -81,9 +82,10 @@ static ULONG WINAPI d3d9_vertexbuffer_Release(IDirect3DVertexBuffer9 *iface) IDirect3DDevice9Ex *device = buffer->parent_device; wined3d_mutex_lock(); - wined3d_buffer_decref(buffer->wined3d_buffer); if (draw_buffer) wined3d_buffer_decref(draw_buffer); + else + wined3d_buffer_decref(buffer->wined3d_buffer); wined3d_mutex_unlock(); /* Release the device last, as it may cause the device to be destroyed. */ @@ -270,6 +272,9 @@ static const IDirect3DVertexBuffer9Vtbl d3d9_vertexbuffer_vtbl = static void STDMETHODCALLTYPE d3d9_vertexbuffer_wined3d_object_destroyed(void *parent) { struct d3d9_vertexbuffer *buffer = parent; + + if (buffer->draw_buffer) + wined3d_buffer_decref(buffer->wined3d_buffer); d3d9_resource_cleanup(&buffer->resource); heap_free(buffer); } @@ -387,9 +392,10 @@ static ULONG WINAPI d3d9_indexbuffer_AddRef(IDirect3DIndexBuffer9 *iface) { IDirect3DDevice9Ex_AddRef(buffer->parent_device); wined3d_mutex_lock(); - wined3d_buffer_incref(buffer->wined3d_buffer); if (buffer->draw_buffer) wined3d_buffer_incref(buffer->draw_buffer); + else + wined3d_buffer_incref(buffer->wined3d_buffer); wined3d_mutex_unlock(); } @@ -409,9 +415,10 @@ static ULONG WINAPI d3d9_indexbuffer_Release(IDirect3DIndexBuffer9 *iface) IDirect3DDevice9Ex *device = buffer->parent_device; wined3d_mutex_lock(); - wined3d_buffer_decref(buffer->wined3d_buffer); if (draw_buffer) wined3d_buffer_decref(draw_buffer); + else + wined3d_buffer_decref(buffer->wined3d_buffer); wined3d_mutex_unlock(); /* Release the device last, as it may cause the device to be destroyed. */ @@ -596,6 +603,9 @@ static const IDirect3DIndexBuffer9Vtbl d3d9_indexbuffer_vtbl = static void STDMETHODCALLTYPE d3d9_indexbuffer_wined3d_object_destroyed(void *parent) { struct d3d9_indexbuffer *buffer = parent; + + if (buffer->draw_buffer) + wined3d_buffer_decref(buffer->wined3d_buffer); d3d9_resource_cleanup(&buffer->resource); heap_free(buffer); }

1 0

Józef Kucia : wined3d: Add GPU information for Intel HD Graphics 620.
by Alexandre Julliard 28 Feb '19

28 Feb '19

Module: wine Branch: master Commit: 88aaee78fe96084f2d1ff5c224b04d10c459088e URL: https://source.winehq.org/git/wine.git/?a=commit;h=88aaee78fe96084f2d1ff5c2… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Feb 27 16:39:42 2019 +0100 wined3d: Add GPU information for Intel HD Graphics 620. 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/wined3d/directx.c | 1 + dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 2 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 0c70f04..a05f6cc 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -456,6 +456,7 @@ static const struct wined3d_gpu_description gpu_description_table[] = {HW_VENDOR_INTEL, CARD_INTEL_IP580_2, "Intel(R) Iris(TM) Pro Graphics 580", DRIVER_INTEL_HD4000, 2048}, {HW_VENDOR_INTEL, CARD_INTEL_IPP580_1, "Intel(R) Iris(TM) Pro Graphics P580", DRIVER_INTEL_HD4000, 2048}, {HW_VENDOR_INTEL, CARD_INTEL_IPP580_2, "Intel(R) Iris(TM) Pro Graphics P580", DRIVER_INTEL_HD4000, 2048}, + {HW_VENDOR_INTEL, CARD_INTEL_HD620, "Intel(R) HD Graphics 620", DRIVER_INTEL_HD4000, 3072}, {HW_VENDOR_INTEL, CARD_INTEL_HD630, "Intel(R) HD Graphics 630", DRIVER_INTEL_HD4000, 3072}, }; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f2b9b5f..1b70582 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2520,6 +2520,7 @@ enum wined3d_pci_device CARD_INTEL_IP580_2 = 0x193b, CARD_INTEL_IPP580_1 = 0x193a, CARD_INTEL_IPP580_2 = 0x193d, + CARD_INTEL_HD620 = 0x5916, CARD_INTEL_HD630 = 0x5912, };

1 0

Józef Kucia : wined3d: Rename ShaderBackend registry setting to shader_backend.
by Alexandre Julliard 28 Feb '19

28 Feb '19

Module: wine Branch: master Commit: 660b446aaeca506499a6975f8dd71a9d6fa0b893 URL: https://source.winehq.org/git/wine.git/?a=commit;h=660b446aaeca506499a6975f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Feb 27 16:05:03 2019 +0100 wined3d: Rename ShaderBackend registry setting to shader_backend. This appears to be preferred naming convention for new registry keys. 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/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 fb70b94..5ca58ae 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")) {

1 0

Józef Kucia : d3d12/tests: Add test for backbuffer index after changing sync interval.
by Alexandre Julliard 28 Feb '19

28 Feb '19

Module: wine Branch: master Commit: f451c7b586f7bf390e34ab2e73e383b97cb6f2ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=f451c7b586f7bf390e34ab2e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Feb 27 16:05:02 2019 +0100 d3d12/tests: Add test for backbuffer index after changing sync interval. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d12/tests/d3d12.c | 77 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) diff --git a/dlls/d3d12/tests/d3d12.c b/dlls/d3d12/tests/d3d12.c index 67e7240..dec7cf8 100644 --- a/dlls/d3d12/tests/d3d12.c +++ b/dlls/d3d12/tests/d3d12.c @@ -1009,6 +1009,82 @@ static void test_swapchain_size_mismatch(void) destroy_test_context(&context); } +static void test_swapchain_backbuffer_index(void) +{ + static const float green[] = {0.0f, 1.0f, 0.0f, 1.0f}; + unsigned int previous_index, expected_index, index, i; + ID3D12GraphicsCommandList *command_list; + ID3D12Resource *backbuffers[2]; + struct test_context_desc desc; + struct test_context context; + unsigned int sync_interval; + IDXGISwapChain3 *swapchain; + ID3D12CommandQueue *queue; + 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 = 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); + } + + previous_index = 1; + for (i = 0; i < 20; ++i) + { + index = IDXGISwapChain3_GetCurrentBackBufferIndex(swapchain); + ID3D12Device_CreateRenderTargetView(device, backbuffers[index], NULL, context.rtv); + + expected_index = (previous_index + 1) % 2; + ok(index == expected_index, "Test %u: Got index %u, expected %u.\n", i, index, expected_index); + + 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); + + if (i <= 4 || (8 <= i && i <= 14)) + sync_interval = 1; + else + sync_interval = 0; + + hr = IDXGISwapChain3_Present(swapchain, sync_interval, 0); + ok(hr == S_OK, "Failed to present, hr %#x.\n", hr); + + wait_queue_idle(device, queue); + reset_command_list(command_list, context.allocator); + + previous_index = index; + } + + 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; @@ -1039,4 +1115,5 @@ START_TEST(d3d12) test_draw(); test_swapchain_draw(); test_swapchain_size_mismatch(); + test_swapchain_backbuffer_index(); }

1 0

Józef Kucia : dxgi: Recreate Vulkan swapchain only when current buffer index is 0.
by Alexandre Julliard 28 Feb '19

28 Feb '19

Module: wine Branch: master Commit: 0510bca6964a103c5d38d1f5b5eb2a2a72d6a2b9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0510bca6964a103c5d38d1f5… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Feb 27 16:05:01 2019 +0100 dxgi: Recreate Vulkan swapchain only when current buffer index is 0. 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 | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index fb55820..3c09516 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");

1 0

Józef Kucia : dxgi: Implement 0 sync interval for D3D12 swapchains.
by Alexandre Julliard 28 Feb '19

28 Feb '19

Module: wine Branch: master Commit: b78f02922d392de34c1a060788c245a336d699ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=b78f02922d392de34c1a0607… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Feb 27 16:05:00 2019 +0100 dxgi: Implement 0 sync interval for D3D12 swapchains. 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 | 101 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 98 insertions(+), 3 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 06fb7ef..fb55820 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:

1 0

Józef Kucia : d3d12/tests: Add test for swapchain and window sizes mismatch.
by Alexandre Julliard 28 Feb '19

28 Feb '19

Module: wine Branch: master Commit: 2aac5c436e6c193882276967f4c2e68f3db6dc81 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2aac5c436e6c193882276967… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Feb 27 16:04:59 2019 +0100 d3d12/tests: Add test for swapchain and window sizes mismatch. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 7b610c0..67e7240 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(); }

1 0

Józef Kucia : dxgi: Use VK_FILTER_LINEAR for swapchain blits if dimensions don't match.
by Alexandre Julliard 28 Feb '19

28 Feb '19

Module: wine Branch: master Commit: 00e6b50da6008dced31a70f8e76274237738e62a URL: https://source.winehq.org/git/wine.git/?a=commit;h=00e6b50da6008dced31a70f8… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Feb 27 16:04:58 2019 +0100 dxgi: Use VK_FILTER_LINEAR for swapchain blits if dimensions don't match. 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 | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index ed7861c..06fb7ef 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,

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2019