wine-commits January 2018

wine-commits@winehq.org

2 participants
638 discussions

Józef Kucia : include: Allow using libvkd3d with custom Vulkan headers.
by Alexandre Julliard 16 Jan '18

16 Jan '18

Module: vkd3d Branch: master Commit: 1fbacd5a09dd16dd1a0eb999d3e5bd8c7d99c9d3 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=1fbacd5a09dd16dd1a0eb99… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jan 16 14:02:23 2018 +0100 include: Allow using libvkd3d with custom Vulkan headers. 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> --- include/vkd3d.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/include/vkd3d.h b/include/vkd3d.h index 320282b..a70bd2d 100644 --- a/include/vkd3d.h +++ b/include/vkd3d.h @@ -24,7 +24,10 @@ # include "vkd3d_d3d12.h" #endif /* VKD3D_NO_WIN32_TYPES */ -#include <vulkan/vulkan.h> +#ifndef VKD3D_NO_VULKAN_H +# include <vulkan/vulkan.h> +#endif /* VKD3D_NO_VULKAN_H */ + #include <stdbool.h> #ifdef __cplusplus

1 0

Józef Kucia : libs/vkd3d: Get rid of vkd3d_get_vk_queue().
by Alexandre Julliard 16 Jan '18

16 Jan '18

Module: vkd3d Branch: master Commit: 55025f7bec02f0973663a949f54846ddedc611c5 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=55025f7bec02f0973663a94… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jan 16 14:02:22 2018 +0100 libs/vkd3d: Get rid of vkd3d_get_vk_queue(). Replaced by vkd3d_acquire_vk_queue(). 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> --- include/vkd3d.h | 1 - libs/vkd3d/command.c | 7 ------- libs/vkd3d/vkd3d.map | 1 - 3 files changed, 9 deletions(-) diff --git a/include/vkd3d.h b/include/vkd3d.h index 322675b..320282b 100644 --- a/include/vkd3d.h +++ b/include/vkd3d.h @@ -75,7 +75,6 @@ VkPhysicalDevice vkd3d_get_vk_physical_device(ID3D12Device *device); uint32_t vkd3d_get_vk_queue_family_index(ID3D12CommandQueue *queue); VkQueue vkd3d_acquire_vk_queue(ID3D12CommandQueue *queue); -VkQueue vkd3d_get_vk_queue(ID3D12CommandQueue *queue); void vkd3d_release_vk_queue(ID3D12CommandQueue *queue); HRESULT vkd3d_serialize_root_signature(const D3D12_ROOT_SIGNATURE_DESC *root_signature_desc, diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 7aa1386..3b7d2ee 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -4380,13 +4380,6 @@ HRESULT d3d12_command_queue_create(struct d3d12_device *device, return S_OK; } -VkQueue vkd3d_get_vk_queue(ID3D12CommandQueue *queue) -{ - struct d3d12_command_queue *d3d12_queue = impl_from_ID3D12CommandQueue(queue); - - return d3d12_queue->vkd3d_queue->vk_queue; -} - uint32_t vkd3d_get_vk_queue_family_index(ID3D12CommandQueue *queue) { struct d3d12_command_queue *d3d12_queue = impl_from_ID3D12CommandQueue(queue); diff --git a/libs/vkd3d/vkd3d.map b/libs/vkd3d/vkd3d.map index 57b8606..0c0d768 100644 --- a/libs/vkd3d/vkd3d.map +++ b/libs/vkd3d/vkd3d.map @@ -9,7 +9,6 @@ global: vkd3d_get_vk_format; vkd3d_get_vk_instance; vkd3d_get_vk_physical_device; - vkd3d_get_vk_queue; vkd3d_get_vk_queue_family_index; vkd3d_instance_decref; vkd3d_instance_incref;

1 0

Józef Kucia : libs/vkd3d-shader: Fix uninitialized error code in vkd3d_shader_parser_init().
by Alexandre Julliard 16 Jan '18

16 Jan '18

Module: vkd3d Branch: master Commit: 9e8dc13ba3f82b799c875e4423ea06fda49d9faa URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=9e8dc13ba3f82b799c875e4… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jan 16 14:02:21 2018 +0100 libs/vkd3d-shader: Fix uninitialized error code in vkd3d_shader_parser_init(). 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> --- libs/vkd3d-shader/vkd3d_shader_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 6522dd6..bf1a391 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -41,9 +41,9 @@ static HRESULT vkd3d_shader_parser_init(struct vkd3d_shader_parser *parser, if (!(parser->data = shader_sm4_init(shader_desc->byte_code, shader_desc->byte_code_size, &shader_desc->output_signature))) { - WARN("Failed to initialize shader parser, hr %#x.\n", hr); + WARN("Failed to initialize shader parser.\n"); free_shader_desc(shader_desc); - return hr; + return E_INVALIDARG; } shader_sm4_read_header(parser->data, &parser->ptr, &parser->shader_version);

1 0

Francois Gouget : winetest/gather: Remove support for obsolete statuses.
by Alexandre Julliard 16 Jan '18

16 Jan '18

Module: tools Branch: master Commit: 04404905e79325f5467dec0a7aa69536a459e248 URL: https://source.winehq.org/git/tools.git/?a=commit;h=04404905e79325f5467dec0… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jan 16 04:05:25 2018 +0100 winetest/gather: Remove support for obsolete statuses. dissect is now responsible for detecting crashes and reporting them as 'failed crash' in the summary file. So gather no longer needs to assume negative exit codes identify crashes. 'failed -2' should not happen at all. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/gather | 4 ---- 1 file changed, 4 deletions(-) diff --git a/winetest/gather b/winetest/gather index fbf0397..ac6c350 100755 --- a/winetest/gather +++ b/winetest/gather @@ -633,8 +633,6 @@ sub get_result_title($$) if ($result->{status} eq "missing") { return "Test did not run for an unknown reason"; } if ($result->{status} eq "mixed") { return "Mixed results"; } if ($result->{status} eq "crash") { return "Test crashed"; } - if ($result->{status} eq "-2") { return "Test failed"; } - if ($result->{status} =~ /^-/) { return "Test crashed"; } if ($result->{status} eq "258") { return "Test timed out"; } return ""; } @@ -701,8 +699,6 @@ sub singletest($$$) { else { $msg = $status eq "crash" ? "crashed" : - $status eq "-2" ? "failed" : - $status =~ /^-/ ? "crashed" : $status eq "258" ? "timeout": "failed"; } $title = join(" | ", $prefix, $title);

1 0

Francois Gouget : testbot: Document Item::OnDelete().
by Alexandre Julliard 16 Jan '18

16 Jan '18

Module: tools Branch: master Commit: 3dd26c762949946124ff73d1c207ced3956209f7 URL: https://source.winehq.org/git/tools.git/?a=commit;h=3dd26c762949946124ff73d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jan 16 04:02:09 2018 +0100 testbot: Document Item::OnDelete(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/Item.pm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/testbot/lib/ObjectModel/Item.pm b/testbot/lib/ObjectModel/Item.pm index 88c9d1a..6296130 100644 --- a/testbot/lib/ObjectModel/Item.pm +++ b/testbot/lib/ObjectModel/Item.pm @@ -433,6 +433,25 @@ sub Validate($) return (undef, undef); } +=pod +=over 12 + +=item C<OnDelete()> + +Prepares the item for deletion. + +The default implementation deletes any related 'Detailref' object as these +have a foreign key referencing this Item, which would prevent its deletion. +This allows the deletion of Items even if the database does not support +'ON DELETE CASCADE'. To preserve this behavior OnDelete() implementations +should remove any other foreign key that would prevent the deletion of an Item. + +Returns undef if successful, or an error message if the Item should not be +deleted or something prevents its deletion. + +=back +=cut + sub OnDelete($) { my ($self) = @_;

1 0

Julian Rüger : German translation for release 3.0-rc6
by Jeremy Newman 15 Jan '18

15 Jan '18

Module: website Branch: master Commit: be3b7caec8321824333d88c57c9dec0417ef5587 URL: https://source.winehq.org/git/website.git/?a=commit;h=be3b7caec8321824333d8… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Jan 15 17:12:59 2018 +0100 German translation for release 3.0-rc6 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2018011201.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/news/de/2018011201.xml b/news/de/2018011201.xml new file mode 100644 index 0000000..792280f --- /dev/null +++ b/news/de/2018011201.xml @@ -0,0 +1,12 @@ +<news> +<date>12. Januar 2018</date> +<title>Wine 3.0-rc6 freigegeben</title> +<body> + Die Entwicklungsversion 3.0-rc6 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/3.0-rc6">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Nur Fehlerkorrekturen, da wir uns im Code-freeze befinden.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/3.0/wine-3.0-rc6.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Henri Verbeet : libs/vkd3d-shader: Validate the DXBC version.
by Alexandre Julliard 15 Jan '18

15 Jan '18

Module: vkd3d Branch: master Commit: 2d8e2fbe8699e96c5596fe44204b60ace363a0f8 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=2d8e2fbe8699e96c5596fe4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 15 20:07:24 2018 +0330 libs/vkd3d-shader: Validate the DXBC version. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/dxbc.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 6aa2ffa..331b619 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -1814,6 +1814,7 @@ static HRESULT parse_dxbc(const char *data, SIZE_T data_size, DWORD chunk_count; DWORD total_size; unsigned int i; + DWORD version; DWORD tag; read_dword(&ptr, &tag); @@ -1828,7 +1829,13 @@ static HRESULT parse_dxbc(const char *data, SIZE_T data_size, WARN("Ignoring DXBC checksum.\n"); skip_dword_unknown(&ptr, 4); - skip_dword_unknown(&ptr, 1); /* It seems to always be 0x00000001. */ + read_dword(&ptr, &version); + TRACE("version: %#x.\n", version); + if (version != 0x00000001) + { + WARN("Got unexpected DXBC version %#x.\n", version); + return E_INVALIDARG; + } read_dword(&ptr, &total_size); TRACE("total size: %#x\n", total_size);

1 0

Józef Kucia : libs/vkd3d: Add thread-safe API for accessing Vulkan command queues.
by Alexandre Julliard 15 Jan '18

15 Jan '18

Module: vkd3d Branch: master Commit: 12ca2bbcf62166f6ddda19419dc1cb8e9e094946 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=12ca2bbcf62166f6ddda194… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jan 15 13:49:07 2018 +0100 libs/vkd3d: Add thread-safe API for accessing Vulkan command queues. 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> --- demos/demo_xcb.h | 11 +++++--- include/vkd3d.h | 4 ++- libs/vkd3d/command.c | 14 ++++++++++ libs/vkd3d/vkd3d.map | 2 ++ tests/vkd3d_api.c | 76 +++++++++++++++++++++++++++++++++++++++++++++++++--- 5 files changed, 99 insertions(+), 8 deletions(-) diff --git a/demos/demo_xcb.h b/demos/demo_xcb.h index 3cc2c54..a683dca 100644 --- a/demos/demo_xcb.h +++ b/demos/demo_xcb.h @@ -61,7 +61,7 @@ struct demo_swapchain VkInstance vk_instance; VkDevice vk_device; - VkQueue vk_queue; + ID3D12CommandQueue *command_queue; uint32_t current_buffer; unsigned int buffer_count; @@ -451,7 +451,6 @@ static inline struct demo_swapchain *demo_swapchain_create(ID3D12CommandQueue *c swapchain->vk_fence = vk_fence; swapchain->vk_instance = vk_instance; swapchain->vk_device = vk_device; - swapchain->vk_queue = vkd3d_get_vk_queue(command_queue); vkAcquireNextImageKHR(vk_device, vk_swapchain, UINT64_MAX, VK_NULL_HANDLE, vk_fence, &swapchain->current_buffer); @@ -488,6 +487,8 @@ static inline struct demo_swapchain *demo_swapchain_create(ID3D12CommandQueue *c free(vk_images); ID3D12Device_Release(d3d12_device); + ID3D12CommandQueue_AddRef(swapchain->command_queue = command_queue); + return swapchain; fail: @@ -518,6 +519,7 @@ static inline ID3D12Resource *demo_swapchain_get_back_buffer(struct demo_swapcha static inline void demo_swapchain_present(struct demo_swapchain *swapchain) { VkPresentInfoKHR present_desc; + VkQueue vk_queue; present_desc.sType = VK_STRUCTURE_TYPE_PRESENT_INFO_KHR; present_desc.pNext = NULL; @@ -528,7 +530,9 @@ static inline void demo_swapchain_present(struct demo_swapchain *swapchain) present_desc.pImageIndices = &swapchain->current_buffer; present_desc.pResults = NULL; - vkQueuePresentKHR(swapchain->vk_queue, &present_desc); + vk_queue = vkd3d_acquire_vk_queue(swapchain->command_queue); + vkQueuePresentKHR(vk_queue, &present_desc); + vkd3d_release_vk_queue(swapchain->command_queue); vkAcquireNextImageKHR(swapchain->vk_device, swapchain->vk_swapchain, UINT64_MAX, VK_NULL_HANDLE, swapchain->vk_fence, &swapchain->current_buffer); @@ -540,6 +544,7 @@ static inline void demo_swapchain_destroy(struct demo_swapchain *swapchain) { unsigned int i; + ID3D12CommandQueue_Release(swapchain->command_queue); for (i = 0; i < swapchain->buffer_count; ++i) { ID3D12Resource_Release(swapchain->buffers[i]); diff --git a/include/vkd3d.h b/include/vkd3d.h index 8a04dbd..322675b 100644 --- a/include/vkd3d.h +++ b/include/vkd3d.h @@ -73,8 +73,10 @@ VkDevice vkd3d_get_vk_device(ID3D12Device *device); VkInstance vkd3d_get_vk_instance(ID3D12Device *device); VkPhysicalDevice vkd3d_get_vk_physical_device(ID3D12Device *device); -VkQueue vkd3d_get_vk_queue(ID3D12CommandQueue *queue); uint32_t vkd3d_get_vk_queue_family_index(ID3D12CommandQueue *queue); +VkQueue vkd3d_acquire_vk_queue(ID3D12CommandQueue *queue); +VkQueue vkd3d_get_vk_queue(ID3D12CommandQueue *queue); +void vkd3d_release_vk_queue(ID3D12CommandQueue *queue); HRESULT vkd3d_serialize_root_signature(const D3D12_ROOT_SIGNATURE_DESC *root_signature_desc, D3D_ROOT_SIGNATURE_VERSION version, ID3DBlob **blob, ID3DBlob **error_blob); diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 85dcf6f..7aa1386 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -4394,6 +4394,20 @@ uint32_t vkd3d_get_vk_queue_family_index(ID3D12CommandQueue *queue) return d3d12_queue->vkd3d_queue->vk_family_index; } +VkQueue vkd3d_acquire_vk_queue(ID3D12CommandQueue *queue) +{ + struct d3d12_command_queue *d3d12_queue = impl_from_ID3D12CommandQueue(queue); + + return vkd3d_queue_acquire(d3d12_queue->vkd3d_queue); +} + +void vkd3d_release_vk_queue(ID3D12CommandQueue *queue) +{ + struct d3d12_command_queue *d3d12_queue = impl_from_ID3D12CommandQueue(queue); + + return vkd3d_queue_release(d3d12_queue->vkd3d_queue); +} + /* ID3D12CommandSignature */ static inline struct d3d12_command_signature *impl_from_ID3D12CommandSignature(ID3D12CommandSignature *iface) { diff --git a/libs/vkd3d/vkd3d.map b/libs/vkd3d/vkd3d.map index db638f6..57b8606 100644 --- a/libs/vkd3d/vkd3d.map +++ b/libs/vkd3d/vkd3d.map @@ -1,5 +1,6 @@ { global: + vkd3d_acquire_vk_queue; vkd3d_create_device; vkd3d_create_image_resource; vkd3d_create_instance; @@ -12,6 +13,7 @@ global: vkd3d_get_vk_queue_family_index; vkd3d_instance_decref; vkd3d_instance_incref; + vkd3d_release_vk_queue; vkd3d_serialize_root_signature; local: *; diff --git a/tests/vkd3d_api.c b/tests/vkd3d_api.c index 79d51cc..146467a 100644 --- a/tests/vkd3d_api.c +++ b/tests/vkd3d_api.c @@ -40,6 +40,33 @@ static const struct vkd3d_device_create_info device_default_create_info = .instance_create_info = &instance_default_create_info, }; +static ID3D12Device *create_device(void) +{ + ID3D12Device *device; + HRESULT hr; + + hr = vkd3d_create_device(&device_default_create_info, + &IID_ID3D12Device, (void **)&device); + return SUCCEEDED(hr) ? device : NULL; +} + +static ID3D12CommandQueue *create_command_queue(ID3D12Device *device, + D3D12_COMMAND_LIST_TYPE type) +{ + D3D12_COMMAND_QUEUE_DESC desc; + ID3D12CommandQueue *queue; + HRESULT hr; + + desc.Type = type; + desc.Priority = D3D12_COMMAND_QUEUE_PRIORITY_NORMAL; + desc.Flags = D3D12_COMMAND_QUEUE_FLAG_NONE; + desc.NodeMask = 0; + hr = ID3D12Device_CreateCommandQueue(device, &desc, + &IID_ID3D12CommandQueue, (void **)&queue); + ok(hr == S_OK, "Failed to create command queue, hr %#x.\n", hr); + return queue; +} + static void test_create_instance(void) { struct vkd3d_instance_create_info create_info; @@ -110,15 +137,55 @@ static void test_create_device(void) ok(!refcount, "Instance has %u references left.\n", refcount); } +static void test_vkd3d_queue(void) +{ + ID3D12CommandQueue *direct_queue, *compute_queue, *copy_queue; + uint32_t vk_queue_family; + ID3D12Device *device; + VkQueue vk_queue; + ULONG refcount; + + device = create_device(); + ok(device, "Failed to create device.\n"); + + direct_queue = create_command_queue(device, D3D12_COMMAND_LIST_TYPE_DIRECT); + ok(direct_queue, "Failed to create direct command queue.\n"); + compute_queue = create_command_queue(device, D3D12_COMMAND_LIST_TYPE_COMPUTE); + ok(compute_queue, "Failed to create direct command queue.\n"); + copy_queue = create_command_queue(device, D3D12_COMMAND_LIST_TYPE_COPY); + ok(copy_queue, "Failed to create direct command queue.\n"); + + vk_queue_family = vkd3d_get_vk_queue_family_index(direct_queue); + trace("Direct queue family index %u.\n", vk_queue_family); + vk_queue_family = vkd3d_get_vk_queue_family_index(compute_queue); + trace("Compute queue family index %u.\n", vk_queue_family); + vk_queue_family = vkd3d_get_vk_queue_family_index(copy_queue); + trace("Copy queue family index %u.\n", vk_queue_family); + + vk_queue = vkd3d_acquire_vk_queue(direct_queue); + ok(vk_queue != VK_NULL_HANDLE, "Failed to acquire Vulkan queue.\n"); + vkd3d_release_vk_queue(direct_queue); + vk_queue = vkd3d_acquire_vk_queue(compute_queue); + ok(vk_queue != VK_NULL_HANDLE, "Failed to acquire Vulkan queue.\n"); + vkd3d_release_vk_queue(compute_queue); + vk_queue = vkd3d_acquire_vk_queue(copy_queue); + ok(vk_queue != VK_NULL_HANDLE, "Failed to acquire Vulkan queue.\n"); + vkd3d_release_vk_queue(copy_queue); + + ID3D12CommandQueue_Release(direct_queue); + ID3D12CommandQueue_Release(compute_queue); + ID3D12CommandQueue_Release(copy_queue); + refcount = ID3D12Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + static bool have_d3d12_device(void) { ID3D12Device *device; - HRESULT hr; - if (SUCCEEDED(hr = vkd3d_create_device(&device_default_create_info, - &IID_ID3D12Device, (void **)&device))) + if ((device = create_device())) ID3D12Device_Release(device); - return hr == S_OK; + return device; } START_TEST(vkd3d_api) @@ -131,4 +198,5 @@ START_TEST(vkd3d_api) run_test(test_create_instance); run_test(test_create_device); + run_test(test_vkd3d_queue); }

1 0

Józef Kucia : tests: Add test for executing command lists from multiple threads.
by Alexandre Julliard 15 Jan '18

15 Jan '18

Module: vkd3d Branch: master Commit: 8357908bc23e66421bbb316de14ec3cfffa88ea5 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=8357908bc23e66421bbb316… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jan 15 13:49:06 2018 +0100 tests: Add test for executing command lists from multiple threads. 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> --- tests/d3d12.c | 98 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 98 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 5511620..b8b4d95 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -16983,6 +16983,103 @@ static void test_face_culling(void) destroy_test_context(&context); } +static void draw_thread_main(void *thread_data) +{ + static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; + struct test_context *context = thread_data; + ID3D12GraphicsCommandList *command_list; + ID3D12CommandAllocator *allocator; + D3D12_CPU_DESCRIPTOR_HANDLE rtv; + ID3D12Resource *render_target; + ID3D12DescriptorHeap *heap; + ID3D12CommandQueue *queue; + ID3D12Device *device; + unsigned int i; + HRESULT hr; + + queue = context->queue; + device = context->device; + heap = create_cpu_descriptor_heap(device, D3D12_DESCRIPTOR_HEAP_TYPE_RTV, 1); + rtv = get_cpu_descriptor_handle(context, heap, 0); + create_render_target(context, NULL, &render_target, &rtv); + + hr = ID3D12Device_CreateCommandAllocator(device, D3D12_COMMAND_LIST_TYPE_DIRECT, + &IID_ID3D12CommandAllocator, (void **)&allocator); + ok(SUCCEEDED(hr), "Failed to create command allocator, hr %#x.\n", hr); + hr = ID3D12Device_CreateCommandList(device, 0, D3D12_COMMAND_LIST_TYPE_DIRECT, + allocator, NULL, &IID_ID3D12GraphicsCommandList, (void **)&command_list); + ok(SUCCEEDED(hr), "Failed to create command list, hr %#x.\n", hr); + + for (i = 0; i < 100; ++i) + { + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, rtv, white, 0, NULL); + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &rtv, FALSE, NULL); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context->root_signature); + ID3D12GraphicsCommandList_SetPipelineState(command_list, context->pipeline_state); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context->viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context->scissor_rect); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); + + transition_resource_state(command_list, render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + check_sub_resource_uint(render_target, 0, queue, command_list, 0xff00ff00, 0); + reset_command_list(command_list, allocator); + transition_resource_state(command_list, render_target, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + } + + ID3D12DescriptorHeap_Release(heap); + ID3D12Resource_Release(render_target); + ID3D12CommandAllocator_Release(allocator); + ID3D12GraphicsCommandList_Release(command_list); +} + +static void test_multithread_command_queue_exec(void) +{ + static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; + ID3D12GraphicsCommandList *command_list; + struct test_context context; + ID3D12CommandQueue *queue; + HANDLE threads[10]; + unsigned int i; + + if (!init_test_context(&context, NULL)) + return; + command_list = context.list; + queue = context.queue; + + for (i = 0; i < ARRAY_SIZE(threads); ++i) + { + threads[i] = create_thread(draw_thread_main, &context); + ok(threads[i], "Failed to create thread %u.\n", i); + } + + for (i = 0; i < 100; ++i) + { + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, FALSE, NULL); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); + + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xff00ff00, 0); + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + } + + for (i = 0; i < ARRAY_SIZE(threads); ++i) + ok(join_thread(threads[i]), "Failed to join thread %u.\n", i); + + destroy_test_context(&context); +} + START_TEST(d3d12) { bool enable_debug_layer = false; @@ -17085,4 +17182,5 @@ START_TEST(d3d12) run_test(test_copy_texture_region); run_test(test_separate_bindings); run_test(test_face_culling); + run_test(test_multithread_command_queue_exec); }

1 0

Józef Kucia : libs/vkd3d: Make GPU VA allocator thread-safe.
by Alexandre Julliard 15 Jan '18

15 Jan '18

Module: vkd3d Branch: master Commit: d18e986b276de989261579087969e4e9773f469e URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=d18e986b276de9892615790… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jan 15 13:49:05 2018 +0100 libs/vkd3d: Make GPU VA allocator thread-safe. 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> --- libs/vkd3d/device.c | 66 +++++++++++++++++++++++++++++++++++++++------- libs/vkd3d/vkd3d_private.h | 4 +-- 2 files changed, 59 insertions(+), 11 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 39ec966..1e40e5d 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -920,19 +920,31 @@ static void d3d12_device_init_pipeline_cache(struct d3d12_device *device) } } -/* FIXME: Allocator should be thread-safe. */ D3D12_GPU_VIRTUAL_ADDRESS vkd3d_gpu_va_allocator_allocate(struct vkd3d_gpu_va_allocator *allocator, size_t size, void *ptr) { D3D12_GPU_VIRTUAL_ADDRESS ceiling = ~(D3D12_GPU_VIRTUAL_ADDRESS)0; struct vkd3d_gpu_va_allocation *allocation; + int rc; + + if ((rc = pthread_mutex_lock(&allocator->mutex))) + { + ERR("Failed to lock mutex, error %d.\n", rc); + return 0; + } if (!vkd3d_array_reserve((void **)&allocator->allocations, &allocator->allocations_size, allocator->allocation_count + 1, sizeof(*allocator->allocations))) + { + pthread_mutex_unlock(&allocator->mutex); return 0; + } if (size > ceiling || ceiling - size < allocator->floor) + { + pthread_mutex_unlock(&allocator->mutex); return 0; + } allocation = &allocator->allocations[allocator->allocation_count++]; allocation->base = allocator->floor; @@ -941,6 +953,8 @@ D3D12_GPU_VIRTUAL_ADDRESS vkd3d_gpu_va_allocator_allocate(struct vkd3d_gpu_va_al allocator->floor += size; + pthread_mutex_unlock(&allocator->mutex); + return allocation->base; } @@ -959,35 +973,69 @@ static int vkd3d_gpu_va_allocation_compare(const void *k, const void *e) void *vkd3d_gpu_va_allocator_dereference(struct vkd3d_gpu_va_allocator *allocator, D3D12_GPU_VIRTUAL_ADDRESS address) { struct vkd3d_gpu_va_allocation *allocation; + int rc; - if (!(allocation = bsearch(&address, allocator->allocations, allocator->allocation_count, - sizeof(*allocation), vkd3d_gpu_va_allocation_compare))) + if ((rc = pthread_mutex_lock(&allocator->mutex))) + { + ERR("Failed to lock mutex, error %d.\n", rc); return NULL; + } + + allocation = bsearch(&address, allocator->allocations, allocator->allocation_count, + sizeof(*allocation), vkd3d_gpu_va_allocation_compare); + + pthread_mutex_unlock(&allocator->mutex); - return allocation->ptr; + return allocation ? allocation->ptr : NULL; } void vkd3d_gpu_va_allocator_free(struct vkd3d_gpu_va_allocator *allocator, D3D12_GPU_VIRTUAL_ADDRESS address) { struct vkd3d_gpu_va_allocation *allocation; + int rc; - if (!(allocation = bsearch(&address, allocator->allocations, allocator->allocation_count, - sizeof(*allocation), vkd3d_gpu_va_allocation_compare))) + if ((rc = pthread_mutex_lock(&allocator->mutex))) + { + ERR("Failed to lock mutex, error %d.\n", rc); return; + } - if (allocation->base == address) + allocation = bsearch(&address, allocator->allocations, allocator->allocation_count, + sizeof(*allocation), vkd3d_gpu_va_allocation_compare); + if (allocation && allocation->base == address) allocation->ptr = NULL; + + pthread_mutex_unlock(&allocator->mutex); } -void vkd3d_gpu_va_allocator_init(struct vkd3d_gpu_va_allocator *allocator) +static bool vkd3d_gpu_va_allocator_init(struct vkd3d_gpu_va_allocator *allocator) { + int rc; + memset(allocator, 0, sizeof(*allocator)); allocator->floor = 0x1000; + + if ((rc = pthread_mutex_init(&allocator->mutex, NULL))) + { + ERR("Failed to initialize mutex, error %d.\n", rc); + return false; + } + + return true; } -void vkd3d_gpu_va_allocator_cleanup(struct vkd3d_gpu_va_allocator *allocator) +static void vkd3d_gpu_va_allocator_cleanup(struct vkd3d_gpu_va_allocator *allocator) { + int rc; + + if ((rc = pthread_mutex_lock(&allocator->mutex))) + { + ERR("Failed to lock mutex, error %d.\n", rc); + return; + } vkd3d_free(allocator->allocations); + pthread_mutex_unlock(&allocator->mutex); + pthread_mutex_destroy(&allocator->mutex); } /* ID3D12Device */ diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 1b0924f..de5ed8e 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -122,6 +122,8 @@ HRESULT vkd3d_fence_worker_stop(struct vkd3d_fence_worker *worker, struct vkd3d_gpu_va_allocator { + pthread_mutex_t mutex; + D3D12_GPU_VIRTUAL_ADDRESS floor; struct vkd3d_gpu_va_allocation @@ -136,12 +138,10 @@ struct vkd3d_gpu_va_allocator D3D12_GPU_VIRTUAL_ADDRESS vkd3d_gpu_va_allocator_allocate(struct vkd3d_gpu_va_allocator *allocator, size_t size, void *ptr) DECLSPEC_HIDDEN; -void vkd3d_gpu_va_allocator_cleanup(struct vkd3d_gpu_va_allocator *allocator) DECLSPEC_HIDDEN; void *vkd3d_gpu_va_allocator_dereference(struct vkd3d_gpu_va_allocator *allocator, D3D12_GPU_VIRTUAL_ADDRESS address) DECLSPEC_HIDDEN; void vkd3d_gpu_va_allocator_free(struct vkd3d_gpu_va_allocator *allocator, D3D12_GPU_VIRTUAL_ADDRESS address) DECLSPEC_HIDDEN; -void vkd3d_gpu_va_allocator_init(struct vkd3d_gpu_va_allocator *allocator) DECLSPEC_HIDDEN; /* ID3D12Fence */ struct d3d12_fence

1 0

← Newer
1
...
29
30
31
32
33
34
35
...
64
Older →

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 January 2018