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

Józef Kucia : vkd3d: Factor out vkd3d_create_thread() .
by Alexandre Julliard 11 Jun '19

11 Jun '19

Module: vkd3d Branch: master Commit: bc5e8a9cc2fd19aab45a7127b9f23114e65dbc4e URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=bc5e8a9cc2fd19aab45a712… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jun 11 10:13:37 2019 +0200 vkd3d: Factor out vkd3d_create_thread(). 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/command.c | 25 ++++++------------------- libs/vkd3d/device.c | 27 ++++++++++++++++++++++++++- libs/vkd3d/vkd3d_private.h | 16 ++++++++++------ 3 files changed, 42 insertions(+), 26 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 97cc7de..0c2fd3e 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -410,6 +410,7 @@ static void *vkd3d_fence_worker_main(void *arg) HRESULT vkd3d_fence_worker_start(struct vkd3d_fence_worker *worker, struct d3d12_device *device) { + HRESULT hr; int rc; TRACE("worker %p.\n", worker); @@ -437,28 +438,14 @@ HRESULT vkd3d_fence_worker_start(struct vkd3d_fence_worker *worker, return hresult_from_errno(rc); } - if (device->create_thread) - { - if (!(worker->u.handle = device->create_thread(vkd3d_fence_worker_main, worker))) - { - ERR("Failed to create fence worker thread.\n"); - pthread_mutex_destroy(&worker->mutex); - pthread_cond_destroy(&worker->cond); - return E_FAIL; - } - - return S_OK; - } - - if ((rc = pthread_create(&worker->u.thread, NULL, vkd3d_fence_worker_main, worker))) + if (FAILED(hr = vkd3d_create_thread(device->vkd3d_instance, + vkd3d_fence_worker_main, worker, &worker->thread))) { - ERR("Failed to create fence worker thread, error %d.\n", rc); pthread_mutex_destroy(&worker->mutex); pthread_cond_destroy(&worker->cond); - return hresult_from_errno(rc); } - return S_OK; + return hr; } HRESULT vkd3d_fence_worker_stop(struct vkd3d_fence_worker *worker, @@ -482,7 +469,7 @@ HRESULT vkd3d_fence_worker_stop(struct vkd3d_fence_worker *worker, if (device->join_thread) { - if (FAILED(hr = device->join_thread(worker->u.handle))) + if (FAILED(hr = device->join_thread(worker->thread.handle))) { ERR("Failed to join fence worker thread, hr %#x.\n", hr); return hr; @@ -490,7 +477,7 @@ HRESULT vkd3d_fence_worker_stop(struct vkd3d_fence_worker *worker, } else { - if ((rc = pthread_join(worker->u.thread, NULL))) + if ((rc = pthread_join(worker->thread.pthread, NULL))) { ERR("Failed to join fence worker thread, error %d.\n", rc); return hresult_from_errno(rc); diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 4df2462..e88d3c2 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -3112,7 +3112,6 @@ static HRESULT d3d12_device_init(struct d3d12_device *device, vkd3d_instance_incref(device->vkd3d_instance = instance); device->vk_info = instance->vk_info; device->signal_event = instance->signal_event; - device->create_thread = instance->create_thread; device->join_thread = instance->join_thread; device->wchar_size = instance->wchar_size; @@ -3198,6 +3197,32 @@ void d3d12_device_mark_as_removed(struct d3d12_device *device, HRESULT reason, device->removed_reason = reason; } +HRESULT vkd3d_create_thread(struct vkd3d_instance *instance, + PFN_vkd3d_thread thread_main, void *data, union vkd3d_thread_handle *thread) +{ + HRESULT hr = S_OK; + int rc; + + if (instance->create_thread) + { + if (!(thread->handle = instance->create_thread(thread_main, data))) + { + ERR("Failed to create thread.\n"); + hr = E_FAIL; + } + } + else + { + if ((rc = pthread_create(&thread->pthread, NULL, thread_main, data))) + { + ERR("Failed to create thread, error %d.\n", rc); + hr = hresult_from_errno(rc); + } + } + + return hr; +} + IUnknown *vkd3d_get_device_parent(ID3D12Device *device) { struct d3d12_device *d3d12_device = impl_from_ID3D12Device(device); diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 9191ae2..2fbf692 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -141,13 +141,18 @@ struct vkd3d_instance LONG refcount; }; +union vkd3d_thread_handle +{ + pthread_t pthread; + void *handle; +}; + +HRESULT vkd3d_create_thread(struct vkd3d_instance *instance, + PFN_vkd3d_thread thread_main, void *data, union vkd3d_thread_handle *thread) DECLSPEC_HIDDEN; + struct vkd3d_fence_worker { - union - { - pthread_t thread; - void *handle; - } u; + union vkd3d_thread_handle thread; pthread_mutex_t mutex; pthread_cond_t cond; bool should_exit; @@ -1014,7 +1019,6 @@ struct d3d12_device struct vkd3d_instance *vkd3d_instance; - PFN_vkd3d_create_thread create_thread; PFN_vkd3d_join_thread join_thread; IUnknown *parent;

1 0

Józef Kucia : vkd3d: Factor out vkd3d_join_thread().
by Alexandre Julliard 11 Jun '19

11 Jun '19

Module: vkd3d Branch: master Commit: 7ecd67aaa043248fbd5d44419d721f2108906e82 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=7ecd67aaa043248fbd5d444… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jun 11 10:13:38 2019 +0200 vkd3d: Factor out vkd3d_join_thread(). 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/command.c | 18 ++---------------- libs/vkd3d/device.c | 23 ++++++++++++++++++++++- libs/vkd3d/vkd3d_private.h | 3 +-- 3 files changed, 25 insertions(+), 19 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 0c2fd3e..fcb7a48 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -467,22 +467,8 @@ HRESULT vkd3d_fence_worker_stop(struct vkd3d_fence_worker *worker, pthread_mutex_unlock(&worker->mutex); - if (device->join_thread) - { - if (FAILED(hr = device->join_thread(worker->thread.handle))) - { - ERR("Failed to join fence worker thread, hr %#x.\n", hr); - return hr; - } - } - else - { - if ((rc = pthread_join(worker->thread.pthread, NULL))) - { - ERR("Failed to join fence worker thread, error %d.\n", rc); - return hresult_from_errno(rc); - } - } + if (FAILED(hr = vkd3d_join_thread(device->vkd3d_instance, &worker->thread))) + return hr; pthread_mutex_destroy(&worker->mutex); pthread_cond_destroy(&worker->cond); diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index e88d3c2..b1da9e9 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -3112,7 +3112,6 @@ static HRESULT d3d12_device_init(struct d3d12_device *device, vkd3d_instance_incref(device->vkd3d_instance = instance); device->vk_info = instance->vk_info; device->signal_event = instance->signal_event; - device->join_thread = instance->join_thread; device->wchar_size = instance->wchar_size; device->adapter_luid = create_info->adapter_luid; @@ -3223,6 +3222,28 @@ HRESULT vkd3d_create_thread(struct vkd3d_instance *instance, return hr; } +HRESULT vkd3d_join_thread(struct vkd3d_instance *instance, union vkd3d_thread_handle *thread) +{ + HRESULT hr = S_OK; + int rc; + + if (instance->join_thread) + { + if (FAILED(hr = instance->join_thread(thread->handle))) + ERR("Failed to join thread, hr %#x.\n", hr); + } + else + { + if ((rc = pthread_join(thread->pthread, NULL))) + { + ERR("Failed to join thread, error %d.\n", rc); + hr = hresult_from_errno(rc); + } + } + + return hr; +} + IUnknown *vkd3d_get_device_parent(ID3D12Device *device) { struct d3d12_device *d3d12_device = impl_from_ID3D12Device(device); diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 2fbf692..4118d5d 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -149,6 +149,7 @@ union vkd3d_thread_handle HRESULT vkd3d_create_thread(struct vkd3d_instance *instance, PFN_vkd3d_thread thread_main, void *data, union vkd3d_thread_handle *thread) DECLSPEC_HIDDEN; +HRESULT vkd3d_join_thread(struct vkd3d_instance *instance, union vkd3d_thread_handle *thread) DECLSPEC_HIDDEN; struct vkd3d_fence_worker { @@ -1019,8 +1020,6 @@ struct d3d12_device struct vkd3d_instance *vkd3d_instance; - PFN_vkd3d_join_thread join_thread; - IUnknown *parent; LUID adapter_luid;

1 0

Józef Kucia : vkd3d: Fix unbinding depth-stencil views.
by Alexandre Julliard 11 Jun '19

11 Jun '19

Module: vkd3d Branch: master Commit: bc8c07ffcc83881cd49e88bbb4d9bf76c85f6c84 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=bc8c07ffcc83881cd49e88b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jun 11 10:13:27 2019 +0200 vkd3d: Fix unbinding depth-stencil views. 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/command.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index f66bbe9..0cbf0fb 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -4373,6 +4373,8 @@ static void STDMETHODCALLTYPE d3d12_command_list_OMSetRenderTargets(ID3D12Graphi list->fb_layer_count = max(list->fb_layer_count, rtv_desc->layer_count); } + list->dsv = VK_NULL_HANDLE; + list->dsv_format = VK_FORMAT_UNDEFINED; if (depth_stencil_descriptor) { if ((dsv_desc = d3d12_dsv_desc_from_cpu_handle(*depth_stencil_descriptor)) @@ -4397,8 +4399,6 @@ static void STDMETHODCALLTYPE d3d12_command_list_OMSetRenderTargets(ID3D12Graphi else { WARN("DSV descriptor is not initialized.\n"); - list->dsv = VK_NULL_HANDLE; - list->dsv_format = VK_FORMAT_UNDEFINED; } }

1 0

Józef Kucia : vkd3d: Invalidate current pipeline when DSV format is changed.
by Alexandre Julliard 11 Jun '19

11 Jun '19

Module: vkd3d Branch: master Commit: 3abfb840fd344695cdb221f6f241060c34234d48 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=3abfb840fd344695cdb221f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jun 11 10:13:28 2019 +0200 vkd3d: Invalidate current pipeline when DSV format is changed. 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/command.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 0cbf0fb..560b697 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -2305,6 +2305,17 @@ static HRESULT STDMETHODCALLTYPE d3d12_command_list_ClearState(ID3D12GraphicsCom return E_NOTIMPL; } +static bool d3d12_command_list_has_unknown_dsv_format(struct d3d12_command_list *list) +{ + struct d3d12_graphics_pipeline_state *graphics; + + if (!d3d12_pipeline_state_is_graphics(list->state)) + return false; + + graphics = &list->state->u.graphics; + return graphics->null_attachment_mask & (1u << graphics->rt_count); +} + static bool d3d12_command_list_has_depth_stencil_view(struct d3d12_command_list *list) { struct d3d12_graphics_pipeline_state *graphics; @@ -2312,8 +2323,7 @@ static bool d3d12_command_list_has_depth_stencil_view(struct d3d12_command_list assert(d3d12_pipeline_state_is_graphics(list->state)); graphics = &list->state->u.graphics; - return graphics->dsv_format - || (graphics->null_attachment_mask & (1u << graphics->rt_count) && list->dsv_format); + return graphics->dsv_format || (d3d12_command_list_has_unknown_dsv_format(list) && list->dsv_format); } static void d3d12_command_list_get_fb_extent(struct d3d12_command_list *list, @@ -4321,6 +4331,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_OMSetRenderTargets(ID3D12Graphi struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface); const struct d3d12_rtv_desc *rtv_desc; const struct d3d12_dsv_desc *dsv_desc; + VkFormat prev_dsv_format; struct vkd3d_view *view; unsigned int i; @@ -4373,6 +4384,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_OMSetRenderTargets(ID3D12Graphi list->fb_layer_count = max(list->fb_layer_count, rtv_desc->layer_count); } + prev_dsv_format = list->dsv_format; list->dsv = VK_NULL_HANDLE; list->dsv_format = VK_FORMAT_UNDEFINED; if (depth_stencil_descriptor) @@ -4402,6 +4414,9 @@ static void STDMETHODCALLTYPE d3d12_command_list_OMSetRenderTargets(ID3D12Graphi } } + if (prev_dsv_format != list->dsv_format && d3d12_command_list_has_unknown_dsv_format(list)) + d3d12_command_list_invalidate_current_pipeline(list); + d3d12_command_list_invalidate_current_framebuffer(list); d3d12_command_list_invalidate_current_render_pass(list); }

1 0

Józef Kucia : tests: Add more tests for UNKNOWN format DSV.
by Alexandre Julliard 11 Jun '19

11 Jun '19

Module: vkd3d Branch: master Commit: 1966a32ac17fe685d473e07f3012843c906e1174 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=1966a32ac17fe685d473e07… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jun 11 10:13:29 2019 +0200 tests: Add more tests for UNKNOWN format DSV. 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 | 47 ++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 44 insertions(+), 3 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 3c1eec5..dea7a63 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -5131,7 +5131,7 @@ static void test_unknown_dsv_format(void) ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, 0, 4, &green.x, 0); - set_viewport(&context.viewport, 0.0f, 0.0f, 32.0f, 32.0f, 1.0f, 0.5f); + set_viewport(&context.viewport, 0.0f, 0.0f, 32.0f, 32.0f, 0.5f, 0.5f); ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); @@ -5152,7 +5152,7 @@ static void test_unknown_dsv_format(void) ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); - ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, FALSE, NULL); + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, FALSE, &ds.dsv_handle); ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST); @@ -5164,7 +5164,43 @@ static void test_unknown_dsv_format(void) ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, 0, 4, &green.x, 0); - set_viewport(&context.viewport, 0.0f, 0.0f, 32.0f, 32.0f, 1.0f, 0.6f); + set_viewport(&context.viewport, 0.0f, 0.0f, 32.0f, 32.0f, 0.6f, 0.6f); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + 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_vec4(context.render_target, 0, queue, command_list, &green, 0); + + /* DSVFormat = DXGI_FORMAT_UNKNOWN and depth write */ + ID3D12PipelineState_Release(context.pipeline_state); + pso_desc.DepthStencilState.DepthWriteMask = D3D12_DEPTH_WRITE_MASK_ALL; + pso_desc.DepthStencilState.DepthFunc = D3D12_COMPARISON_FUNC_ALWAYS; + hr = ID3D12Device_CreateGraphicsPipelineState(context.device, &pso_desc, + &IID_ID3D12PipelineState, (void **)&context.pipeline_state); + ok(hr == S_OK, "Failed to create graphics pipeline state, hr %#x.\n", hr); + + 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); + + ID3D12GraphicsCommandList_ClearDepthStencilView(command_list, ds.dsv_handle, + D3D12_CLEAR_FLAG_DEPTH, 0.0f, 0, 0, NULL); + + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, FALSE, &ds.dsv_handle); + ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, 0, 4, &red.x, 0); + set_viewport(&context.viewport, 0.0f, 0.0f, 32.0f, 32.0f, 1.0f, 1.0f); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); + + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, FALSE, NULL); + ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, 0, 4, &green.x, 0); + set_viewport(&context.viewport, 0.0f, 0.0f, 32.0f, 32.0f, 0.6f, 0.6f); ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); @@ -5172,6 +5208,11 @@ static void test_unknown_dsv_format(void) D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); check_sub_resource_vec4(context.render_target, 0, queue, command_list, &green, 0); + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, ds.texture, + D3D12_RESOURCE_STATE_DEPTH_WRITE, D3D12_RESOURCE_STATE_COPY_SOURCE); + check_sub_resource_float(ds.texture, 0, queue, command_list, 1.0f, 1); + destroy_depth_stencil(&ds); destroy_test_context(&context); }

1 0

Józef Kucia : vkd3d: Emit barriers in ClearUnorderedAccessViewUint().
by Alexandre Julliard 11 Jun '19

11 Jun '19

Module: vkd3d Branch: master Commit: 812878fa872e15e68871c6ad2ef436ebf1d98bc5 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=812878fa872e15e68871c6a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jun 11 10:13:30 2019 +0200 vkd3d: Emit barriers in ClearUnorderedAccessViewUint(). We use transfer operations instead of unordered access. 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/command.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 560b697..ec9e25d 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -4618,6 +4618,9 @@ static void STDMETHODCALLTYPE d3d12_command_list_ClearUnorderedAccessViewUint(ID const struct vkd3d_vk_device_procs *vk_procs; const struct d3d12_desc *cpu_descriptor; struct d3d12_resource *resource_impl; + VkBufferMemoryBarrier buffer_barrier; + VkImageMemoryBarrier image_barrier; + VkPipelineStageFlags stage_mask; VkImageSubresourceRange range; VkClearColorValue color; @@ -4650,6 +4653,22 @@ static void STDMETHODCALLTYPE d3d12_command_list_ClearUnorderedAccessViewUint(ID VK_CALL(vkCmdFillBuffer(list->vk_command_buffer, resource_impl->u.vk_buffer, cpu_descriptor->uav.buffer.offset, cpu_descriptor->uav.buffer.size, values[0])); + + buffer_barrier.sType = VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER; + buffer_barrier.pNext = NULL; + buffer_barrier.srcAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT; + buffer_barrier.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; + buffer_barrier.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; + buffer_barrier.buffer = resource_impl->u.vk_buffer; + buffer_barrier.offset = cpu_descriptor->uav.buffer.offset; + buffer_barrier.size = cpu_descriptor->uav.buffer.size; + + vk_barrier_parameters_from_d3d12_resource_state(D3D12_RESOURCE_STATE_UNORDERED_ACCESS, + resource_impl, list->vk_queue_flags, &buffer_barrier.dstAccessMask, &stage_mask, NULL); + + VK_CALL(vkCmdPipelineBarrier(list->vk_command_buffer, + VK_PIPELINE_STAGE_TRANSFER_BIT, stage_mask, 0, + 0, NULL, 1, &buffer_barrier, 0, NULL)); } else { @@ -4666,6 +4685,23 @@ static void STDMETHODCALLTYPE d3d12_command_list_ClearUnorderedAccessViewUint(ID VK_CALL(vkCmdClearColorImage(list->vk_command_buffer, resource_impl->u.vk_image, VK_IMAGE_LAYOUT_GENERAL, &color, 1, &range)); + + image_barrier.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER; + image_barrier.pNext = NULL; + image_barrier.srcAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT; + image_barrier.oldLayout = VK_IMAGE_LAYOUT_GENERAL; + image_barrier.newLayout = VK_IMAGE_LAYOUT_GENERAL; + image_barrier.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; + image_barrier.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; + image_barrier.image = resource_impl->u.vk_image; + image_barrier.subresourceRange = range; + + vk_barrier_parameters_from_d3d12_resource_state(D3D12_RESOURCE_STATE_UNORDERED_ACCESS, + resource_impl, list->vk_queue_flags, &image_barrier.dstAccessMask, &stage_mask, NULL); + + VK_CALL(vkCmdPipelineBarrier(list->vk_command_buffer, + VK_PIPELINE_STAGE_TRANSFER_BIT, stage_mask, 0, + 0, NULL, 0, NULL, 1, &image_barrier)); } }

1 0

Józef Kucia : tests: Add test for early depth-stencil test.
by Alexandre Julliard 11 Jun '19

11 Jun '19

Module: vkd3d Branch: master Commit: a4c18e83e3e35ce63c8af4cb4db4e6df54908193 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=a4c18e83e3e35ce63c8af4c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jun 11 10:13:31 2019 +0200 tests: Add test for early depth-stencil test. 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 | 154 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 154 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index dea7a63..358e784 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -29966,6 +29966,159 @@ static void test_graphics_compute_queue_synchronization(void) destroy_test_context(&context); } +static void test_early_depth_stencil_tests(void) +{ + D3D12_ROOT_SIGNATURE_DESC root_signature_desc; + D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc; + ID3D12DescriptorHeap *cpu_heap, *gpu_heap; + ID3D12GraphicsCommandList *command_list; + D3D12_DESCRIPTOR_RANGE descriptor_range; + D3D12_ROOT_PARAMETER root_parameter; + struct depth_stencil_resource ds; + struct test_context_desc desc; + struct test_context context; + ID3D12CommandQueue *queue; + ID3D12Resource *texture; + HRESULT hr; + + static const DWORD ps_code[] = + { +#if 0 + RWTexture2D<int> u; + + [earlydepthstencil] + void main() + { + InterlockedAdd(u[uint2(0, 0)], 1); + } +#endif + 0x43425844, 0xd8c9f845, 0xadb9dbe2, 0x4e8aea86, 0x80f0b053, 0x00000001, 0x0000009c, 0x00000003, + 0x0000002c, 0x0000003c, 0x0000004c, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x00000008, 0x00000000, 0x00000008, 0x58454853, 0x00000048, 0x00000050, 0x00000012, 0x0100286a, + 0x0400189c, 0x0011e000, 0x00000000, 0x00003333, 0x0a0000ad, 0x0011e000, 0x00000000, 0x00004002, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00004001, 0x00000001, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE ps = {ps_code, sizeof(ps_code)}; + static const UINT values[4] = {0}; + + memset(&desc, 0, sizeof(desc)); + desc.no_render_target = true; + if (!init_test_context(&context, &desc)) + return; + command_list = context.list; + queue = context.queue; + + descriptor_range.RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_UAV; + descriptor_range.NumDescriptors = 1; + descriptor_range.BaseShaderRegister = 0; + descriptor_range.RegisterSpace = 0; + descriptor_range.OffsetInDescriptorsFromTableStart = D3D12_DESCRIPTOR_RANGE_OFFSET_APPEND; + root_parameter.ParameterType = D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE; + root_parameter.DescriptorTable.NumDescriptorRanges = 1; + root_parameter.DescriptorTable.pDescriptorRanges = &descriptor_range; + root_parameter.ShaderVisibility = D3D12_SHADER_VISIBILITY_PIXEL; + root_signature_desc.NumParameters = 1; + root_signature_desc.pParameters = &root_parameter; + root_signature_desc.NumStaticSamplers = 0; + root_signature_desc.pStaticSamplers = NULL; + root_signature_desc.Flags = D3D12_ROOT_SIGNATURE_FLAG_NONE; + hr = create_root_signature(context.device, &root_signature_desc, &context.root_signature); + ok(hr == S_OK, "Failed to create root signature, hr %#x.\n", hr); + + init_pipeline_state_desc(&pso_desc, context.root_signature, 0, NULL, &ps, NULL); + pso_desc.NumRenderTargets = 0; + pso_desc.DSVFormat = DXGI_FORMAT_D32_FLOAT; + pso_desc.DepthStencilState.DepthEnable = TRUE; + pso_desc.DepthStencilState.DepthWriteMask = D3D12_DEPTH_WRITE_MASK_ZERO; + pso_desc.DepthStencilState.DepthFunc = D3D12_COMPARISON_FUNC_LESS_EQUAL; + hr = ID3D12Device_CreateGraphicsPipelineState(context.device, &pso_desc, + &IID_ID3D12PipelineState, (void **)&context.pipeline_state); + ok(hr == S_OK, "Failed to create graphics pipeline state, hr %#x.\n", hr); + + init_depth_stencil(&ds, context.device, 1, 1, 1, 1, DXGI_FORMAT_D32_FLOAT, 0, NULL); + set_rect(&context.scissor_rect, 0, 0, 1, 1); + + texture = create_default_texture(context.device, 1, 1, DXGI_FORMAT_R32_SINT, + D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_UNORDERED_ACCESS); + cpu_heap = create_cpu_descriptor_heap(context.device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 1); + gpu_heap = create_gpu_descriptor_heap(context.device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 1); + ID3D12Device_CreateUnorderedAccessView(context.device, texture, NULL, NULL, + get_cpu_descriptor_handle(&context, cpu_heap, 0)); + ID3D12Device_CreateUnorderedAccessView(context.device, texture, NULL, NULL, + get_cpu_descriptor_handle(&context, gpu_heap, 0)); + + set_viewport(&context.viewport, 0.0f, 0.0f, 1.0f, 100.0f, 0.5f, 0.5f); + + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 0, NULL, FALSE, &ds.dsv_handle); + 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_SetDescriptorHeaps(command_list, 1, &gpu_heap); + ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(command_list, 0, + get_gpu_descriptor_handle(&context, gpu_heap, 0)); + + ID3D12GraphicsCommandList_ClearUnorderedAccessViewUint(command_list, + get_gpu_descriptor_handle(&context, gpu_heap, 0), + get_cpu_descriptor_handle(&context, cpu_heap, 0), texture, values, 0, NULL); + + ID3D12GraphicsCommandList_ClearDepthStencilView(command_list, ds.dsv_handle, + D3D12_CLEAR_FLAG_DEPTH, 0.6f, 0, 0, NULL); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); + + transition_resource_state(command_list, ds.texture, + D3D12_RESOURCE_STATE_DEPTH_WRITE, D3D12_RESOURCE_STATE_COPY_SOURCE); + transition_resource_state(command_list, texture, + D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE); + check_sub_resource_float(ds.texture, 0, queue, command_list, 0.6f, 1); + reset_command_list(command_list, context.allocator); + check_sub_resource_uint(texture, 0, queue, command_list, 2, 1); + + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, ds.texture, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_DEPTH_WRITE); + transition_resource_state(command_list, texture, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_UNORDERED_ACCESS); + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 0, NULL, FALSE, &ds.dsv_handle); + 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_SetDescriptorHeaps(command_list, 1, &gpu_heap); + ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(command_list, 0, + get_gpu_descriptor_handle(&context, gpu_heap, 0)); + + ID3D12GraphicsCommandList_ClearDepthStencilView(command_list, ds.dsv_handle, + D3D12_CLEAR_FLAG_DEPTH, 0.3f, 0, 0, NULL); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); + + ID3D12GraphicsCommandList_ClearDepthStencilView(command_list, ds.dsv_handle, + D3D12_CLEAR_FLAG_DEPTH, 0.55f, 0, 0, NULL); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); + + ID3D12GraphicsCommandList_ClearDepthStencilView(command_list, ds.dsv_handle, + D3D12_CLEAR_FLAG_DEPTH, 0.5f, 0, 0, NULL); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); + + transition_resource_state(command_list, ds.texture, + D3D12_RESOURCE_STATE_DEPTH_WRITE, D3D12_RESOURCE_STATE_COPY_SOURCE); + transition_resource_state(command_list, texture, + D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE); + check_sub_resource_float(ds.texture, 0, queue, command_list, 0.5f, 1); + reset_command_list(command_list, context.allocator); + check_sub_resource_uint(texture, 0, queue, command_list, 4, 1); + + ID3D12Resource_Release(texture); + ID3D12DescriptorHeap_Release(cpu_heap); + ID3D12DescriptorHeap_Release(gpu_heap); + destroy_depth_stencil(&ds); + destroy_test_context(&context); +} + START_TEST(d3d12) { parse_args(argc, argv); @@ -30123,4 +30276,5 @@ START_TEST(d3d12) run_test(test_read_write_subresource); run_test(test_queue_wait); run_test(test_graphics_compute_queue_synchronization); + run_test(test_early_depth_stencil_tests); }

1 0

Józef Kucia : vkd3d: Allocate device memory when heap offset is misaligned.
by Alexandre Julliard 11 Jun '19

11 Jun '19

Module: vkd3d Branch: master Commit: be23a8fc90bade6c1af4f2e317b0b0d8a34593b7 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=be23a8fc90bade6c1af4f2e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jun 11 10:13:32 2019 +0200 vkd3d: Allocate device memory when heap offset is misaligned. On radv with AMD Polaris GPUs, the alignment may be as high as 0x20000 or 0x40000. World of Warcraft seems to ignore the alignment returned from GetResourceAllocationInfo(), and simply aligns to 0x10000 (D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT). 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/resource.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 15dac12..6bbd5af 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1492,7 +1492,7 @@ HRESULT d3d12_committed_resource_create(struct d3d12_device *device, } static HRESULT vkd3d_bind_heap_memory(struct d3d12_device *device, - struct d3d12_resource *resource, struct d3d12_heap *heap, UINT64 heap_offset) + struct d3d12_resource *resource, struct d3d12_heap *heap, uint64_t heap_offset) { const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; VkDevice vk_device = device->vk_device; @@ -1506,16 +1506,16 @@ static HRESULT vkd3d_bind_heap_memory(struct d3d12_device *device, if (heap_offset % requirements.alignment) { - FIXME("Invalid heap offset %#"PRIx64".\n", heap_offset); - return E_INVALIDARG; + FIXME("Invalid heap offset %#"PRIx64" (alignment %#"PRIx64").\n", + heap_offset, requirements.alignment); + goto allocate_memory; } if (!(requirements.memoryTypeBits & (1u << heap->vk_memory_type))) { - FIXME("Memory type %u cannot be bound to resource %p (allowed types %#x), " - "allocating device memory.\n", + FIXME("Memory type %u cannot be bound to resource %p (allowed types %#x).\n", heap->vk_memory_type, resource, requirements.memoryTypeBits); - return vkd3d_allocate_resource_memory(device, resource, &heap->desc.Properties, heap->desc.Flags); + goto allocate_memory; } if (d3d12_resource_is_buffer(resource)) @@ -1534,6 +1534,10 @@ static HRESULT vkd3d_bind_heap_memory(struct d3d12_device *device, } return hresult_from_vk_result(vr); + +allocate_memory: + FIXME("Allocating device memory.\n"); + return vkd3d_allocate_resource_memory(device, resource, &heap->desc.Properties, heap->desc.Flags); } HRESULT d3d12_placed_resource_create(struct d3d12_device *device, struct d3d12_heap *heap, UINT64 heap_offset,

1 0

Józef Kucia : vkd3d: Avoid allocating memory in d3d12_command_list_RSSetScissorRects().
by Alexandre Julliard 11 Jun '19

11 Jun '19

Module: vkd3d Branch: master Commit: 6862f340041540b2369eca6577f790391e6c6b49 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=6862f340041540b2369eca6… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jun 11 10:13:33 2019 +0200 vkd3d: Avoid allocating memory in d3d12_command_list_RSSetScissorRects(). 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/command.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index ec9e25d..cb7f086 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -3562,7 +3562,11 @@ static void STDMETHODCALLTYPE d3d12_command_list_RSSetViewports(ID3D12GraphicsCo TRACE("iface %p, viewport_count %u, viewports %p.\n", iface, viewport_count, viewports); - assert(viewport_count <= D3D12_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE); + if (viewport_count > ARRAY_SIZE(vk_viewports)) + { + FIXME("Viewport count %u > D3D12_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE.\n", viewport_count); + viewport_count = ARRAY_SIZE(vk_viewports); + } for (i = 0; i < viewport_count; ++i) { @@ -3588,16 +3592,16 @@ static void STDMETHODCALLTYPE d3d12_command_list_RSSetScissorRects(ID3D12Graphic UINT rect_count, const D3D12_RECT *rects) { struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface); + VkRect2D vk_rects[D3D12_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE]; const struct vkd3d_vk_device_procs *vk_procs; - struct VkRect2D *vk_rects; unsigned int i; TRACE("iface %p, rect_count %u, rects %p.\n", iface, rect_count, rects); - if (!(vk_rects = vkd3d_calloc(rect_count, sizeof(*vk_rects)))) + if (rect_count > ARRAY_SIZE(vk_rects)) { - ERR("Failed to allocate Vulkan scissor rects.\n"); - return; + FIXME("Rect count %u > D3D12_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE.\n", rect_count); + rect_count = ARRAY_SIZE(vk_rects); } for (i = 0; i < rect_count; ++i) @@ -3610,8 +3614,6 @@ static void STDMETHODCALLTYPE d3d12_command_list_RSSetScissorRects(ID3D12Graphic vk_procs = &list->device->vk_procs; VK_CALL(vkCmdSetScissor(list->vk_command_buffer, 0, rect_count, vk_rects)); - - free(vk_rects); } static void STDMETHODCALLTYPE d3d12_command_list_OMSetBlendFactor(ID3D12GraphicsCommandList1 *iface,

1 0

Józef Kucia : vkd3d: Avoid allocating memory in d3d12_command_list_update_uav_counter_descriptors ().
by Alexandre Julliard 11 Jun '19

11 Jun '19

Module: vkd3d Branch: master Commit: 28f99600a568b6a58240057de416eabcfb17cee4 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=28f99600a568b6a58240057… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jun 11 10:13:34 2019 +0200 vkd3d: Avoid allocating memory in d3d12_command_list_update_uav_counter_descriptors(). 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/command.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index cb7f086..f4ad829 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -2721,11 +2721,11 @@ done: static void d3d12_command_list_update_uav_counter_descriptors(struct d3d12_command_list *list, VkPipelineBindPoint bind_point) { + VkWriteDescriptorSet vk_descriptor_writes[VKD3D_SHADER_MAX_UNORDERED_ACCESS_VIEWS]; struct vkd3d_pipeline_bindings *bindings = &list->pipeline_bindings[bind_point]; const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs; const struct d3d12_pipeline_state *state = list->state; VkDevice vk_device = list->device->vk_device; - VkWriteDescriptorSet *vk_descriptor_writes; VkDescriptorSet vk_descriptor_set; unsigned int uav_counter_count; unsigned int i; @@ -2734,14 +2734,12 @@ static void d3d12_command_list_update_uav_counter_descriptors(struct d3d12_comma return; uav_counter_count = vkd3d_popcount(state->uav_counter_mask); + assert(uav_counter_count <= ARRAY_SIZE(vk_descriptor_writes)); vk_descriptor_set = d3d12_command_allocator_allocate_descriptor_set(list->allocator, state->vk_set_layout); if (!vk_descriptor_set) return; - if (!(vk_descriptor_writes = vkd3d_calloc(uav_counter_count, sizeof(*vk_descriptor_writes)))) - return; - for (i = 0; i < uav_counter_count; ++i) { const struct vkd3d_shader_uav_counter_binding *uav_counter = &state->uav_counters[i]; @@ -2762,7 +2760,6 @@ static void d3d12_command_list_update_uav_counter_descriptors(struct d3d12_comma } VK_CALL(vkUpdateDescriptorSets(vk_device, uav_counter_count, vk_descriptor_writes, 0, NULL)); - vkd3d_free(vk_descriptor_writes); VK_CALL(vkCmdBindDescriptorSets(list->vk_command_buffer, bind_point, state->vk_pipeline_layout, state->set_index, 1, &vk_descriptor_set, 0, NULL));

1 0