August 2018 - Wine-devel - list.winehq.org

[PATCH vkd3d 05/12] libs/vkd3d-shader: Require shader signature elements for shader outputs.
by Józef Kucia 16 Aug '18

16 Aug '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index d7c80163c677..d62d553ed1dd 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -3236,7 +3236,7 @@ static unsigned int get_shader_output_swizzle(struct vkd3d_dxbc_compiler *compil return compile_args->output_swizzles[register_idx]; } -static uint32_t vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler, +static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_dst_param *dst, enum vkd3d_shader_input_sysval_semantic sysval) { unsigned int component_idx, component_count, output_component_count; @@ -3252,8 +3252,13 @@ static uint32_t vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *comp bool use_private_variable; uint32_t id, var_id; - signature_element = vkd3d_find_signature_element_for_reg(compiler->output_signature, - &signature_idx, reg->idx[0].offset, dst->write_mask); + if (!(signature_element = vkd3d_find_signature_element_for_reg(compiler->output_signature, + &signature_idx, reg->idx[0].offset, dst->write_mask))) + { + FIXME("No signature element for shader output, ignoring shader output.\n"); + return; + } + builtin = vkd3d_get_spirv_builtin(dst->reg.type, sysval); component_idx = vkd3d_write_mask_get_component_idx(dst->write_mask); @@ -3265,7 +3270,7 @@ static uint32_t vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *comp } else { - component_type = signature_element ? signature_element->component_type : VKD3D_TYPE_FLOAT; + component_type = signature_element->component_type; output_component_count = vkd3d_write_mask_component_count(signature_element->mask & 0xff); } assert(component_count <= output_component_count); @@ -3286,15 +3291,12 @@ static uint32_t vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *comp if (component_idx) vkd3d_spirv_build_op_decorate1(builder, id, SpvDecorationComponent, component_idx); } - if (signature_element) - { - compiler->output_info[signature_idx].id = id; - compiler->output_info[signature_idx].component_type = component_type; - } + + compiler->output_info[signature_idx].id = id; + compiler->output_info[signature_idx].component_type = component_type; use_private_variable = component_type != VKD3D_TYPE_FLOAT || component_count != VKD3D_VEC4_SIZE - || (signature_element - && get_shader_output_swizzle(compiler, signature_element->register_index) != VKD3D_NO_SWIZZLE); + || get_shader_output_swizzle(compiler, signature_element->register_index) != VKD3D_NO_SWIZZLE; if (use_private_variable) storage_class = SpvStorageClassPrivate; @@ -3325,8 +3327,6 @@ static uint32_t vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *comp if (!compiler->output_setup_function_id) compiler->output_setup_function_id = vkd3d_spirv_alloc_id(builder); } - - return id; } static void vkd3d_dxbc_compiler_emit_dcl_global_flags(struct vkd3d_dxbc_compiler *compiler, -- 2.16.4

2 1

[PATCH vkd3d 12/12] vkd3d: Try to keep current render pass as long as possible.
by Józef Kucia 16 Aug '18

16 Aug '18

From: Józef Kucia <jkucia(a)codeweavers.com> A lot of Vulkan commands must be recorded outside a render pass. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 64 +++++++++++++++++++++++++++++++++++++++------- libs/vkd3d/vkd3d_private.h | 1 + 2 files changed, 56 insertions(+), 9 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 7989401600b2..ce5f60fb6824 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -1143,6 +1143,21 @@ static void d3d12_command_list_invalidate_current_pipeline(struct d3d12_command_ list->current_pipeline = VK_NULL_HANDLE; } +static void d3d12_command_list_end_current_render_pass(struct d3d12_command_list *list, + const struct vkd3d_vk_device_procs *vk_procs) +{ + if (list->current_render_pass) + VK_CALL(vkCmdEndRenderPass(list->vk_command_buffer)); + + list->current_render_pass = VK_NULL_HANDLE; +} + +static void d3d12_command_list_invalidate_current_render_pass(struct d3d12_command_list *list) +{ + const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs; + d3d12_command_list_end_current_render_pass(list, vk_procs); +} + static void d3d12_command_list_invalidate_bindings(struct d3d12_command_list *list, struct d3d12_pipeline_state *state) { @@ -1396,6 +1411,9 @@ static void d3d12_command_list_track_resource_usage(struct d3d12_command_list *l { if (resource->flags & VKD3D_RESOURCE_INITIAL_STATE_TRANSITION) { + const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs; + d3d12_command_list_end_current_render_pass(list, vk_procs); + d3d12_command_list_transition_resource_to_initial_state(list, resource); resource->flags &= ~VKD3D_RESOURCE_INITIAL_STATE_TRANSITION; } @@ -1523,6 +1541,9 @@ static HRESULT STDMETHODCALLTYPE d3d12_command_list_Close(ID3D12GraphicsCommandL } vk_procs = &list->device->vk_procs; + + d3d12_command_list_end_current_render_pass(list, vk_procs); + if ((vr = VK_CALL(vkEndCommandBuffer(list->vk_command_buffer))) < 0) { WARN("Failed to end command buffer, vr %d.\n", vr); @@ -2202,6 +2223,7 @@ static bool d3d12_command_list_begin_render_pass(struct d3d12_command_list *list const struct vkd3d_vk_device_procs *vk_procs) { struct VkRenderPassBeginInfo begin_desc; + VkRenderPass vk_render_pass; if (!list->state) { @@ -2216,9 +2238,14 @@ static bool d3d12_command_list_begin_render_pass(struct d3d12_command_list *list d3d12_command_list_update_descriptors(list, VK_PIPELINE_BIND_POINT_GRAPHICS); + if (list->current_render_pass != VK_NULL_HANDLE) + return true; + + vk_render_pass = list->state->u.graphics.render_pass; + begin_desc.sType = VK_STRUCTURE_TYPE_RENDER_PASS_BEGIN_INFO; begin_desc.pNext = NULL; - begin_desc.renderPass = list->state->u.graphics.render_pass; + begin_desc.renderPass = vk_render_pass; begin_desc.framebuffer = list->current_framebuffer; begin_desc.renderArea.offset.x = 0; begin_desc.renderArea.offset.y = 0; @@ -2228,6 +2255,8 @@ static bool d3d12_command_list_begin_render_pass(struct d3d12_command_list *list begin_desc.pClearValues = NULL; VK_CALL(vkCmdBeginRenderPass(list->vk_command_buffer, &begin_desc, VK_SUBPASS_CONTENTS_INLINE)); + list->current_render_pass = vk_render_pass; + return true; } @@ -2245,7 +2274,6 @@ static void STDMETHODCALLTYPE d3d12_command_list_DrawInstanced(ID3D12GraphicsCom vk_procs = &list->device->vk_procs; - /* FIXME: We probably don't want to begin a render pass for each draw. */ if (!d3d12_command_list_begin_render_pass(list, vk_procs)) { WARN("Failed to begin render pass, ignoring draw call.\n"); @@ -2254,8 +2282,6 @@ static void STDMETHODCALLTYPE d3d12_command_list_DrawInstanced(ID3D12GraphicsCom VK_CALL(vkCmdDraw(list->vk_command_buffer, vertex_count_per_instance, instance_count, start_vertex_location, start_instance_location)); - - VK_CALL(vkCmdEndRenderPass(list->vk_command_buffer)); } static void STDMETHODCALLTYPE d3d12_command_list_DrawIndexedInstanced(ID3D12GraphicsCommandList *iface, @@ -2272,7 +2298,6 @@ static void STDMETHODCALLTYPE d3d12_command_list_DrawIndexedInstanced(ID3D12Grap vk_procs = &list->device->vk_procs; - /* FIXME: We probably don't want to begin a render pass for each draw. */ if (!d3d12_command_list_begin_render_pass(list, vk_procs)) { WARN("Failed to begin render pass, ignoring draw call.\n"); @@ -2281,8 +2306,6 @@ static void STDMETHODCALLTYPE d3d12_command_list_DrawIndexedInstanced(ID3D12Grap VK_CALL(vkCmdDrawIndexed(list->vk_command_buffer, index_count_per_instance, instance_count, start_vertex_location, base_vertex_location, start_instance_location)); - - VK_CALL(vkCmdEndRenderPass(list->vk_command_buffer)); } static void STDMETHODCALLTYPE d3d12_command_list_Dispatch(ID3D12GraphicsCommandList *iface, @@ -2301,6 +2324,8 @@ static void STDMETHODCALLTYPE d3d12_command_list_Dispatch(ID3D12GraphicsCommandL vk_procs = &list->device->vk_procs; + d3d12_command_list_end_current_render_pass(list, vk_procs); + d3d12_command_list_update_descriptors(list, VK_PIPELINE_BIND_POINT_COMPUTE); VK_CALL(vkCmdDispatch(list->vk_command_buffer, x, y, z)); @@ -2328,6 +2353,8 @@ static void STDMETHODCALLTYPE d3d12_command_list_CopyBufferRegion(ID3D12Graphics d3d12_command_list_track_resource_usage(list, dst_resource); d3d12_command_list_track_resource_usage(list, src_resource); + d3d12_command_list_end_current_render_pass(list, vk_procs); + buffer_copy.srcOffset = src_offset; buffer_copy.dstOffset = dst_offset; buffer_copy.size = byte_count; @@ -2548,6 +2575,8 @@ static void STDMETHODCALLTYPE d3d12_command_list_CopyTextureRegion(ID3D12Graphic d3d12_command_list_track_resource_usage(list, dst_resource); d3d12_command_list_track_resource_usage(list, src_resource); + d3d12_command_list_end_current_render_pass(list, vk_procs); + if (src->Type == D3D12_TEXTURE_COPY_TYPE_SUBRESOURCE_INDEX && dst->Type == D3D12_TEXTURE_COPY_TYPE_PLACED_FOOTPRINT) { @@ -2661,6 +2690,8 @@ static void STDMETHODCALLTYPE d3d12_command_list_CopyResource(ID3D12GraphicsComm d3d12_command_list_track_resource_usage(list, dst_resource); d3d12_command_list_track_resource_usage(list, src_resource); + d3d12_command_list_end_current_render_pass(list, vk_procs); + if (d3d12_resource_is_buffer(dst_resource)) { assert(d3d12_resource_is_buffer(src_resource)); @@ -2850,6 +2881,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_SetPipelineState(ID3D12Graphics if (!d3d12_pipeline_state_is_render_pass_compatible(list->state, state)) { d3d12_command_list_invalidate_current_framebuffer(list); + d3d12_command_list_invalidate_current_render_pass(list); } d3d12_command_list_invalidate_current_pipeline(list); } @@ -2869,6 +2901,8 @@ static void STDMETHODCALLTYPE d3d12_command_list_ResourceBarrier(ID3D12GraphicsC vk_procs = &list->device->vk_procs; + d3d12_command_list_end_current_render_pass(list, vk_procs); + for (i = 0; i < barrier_count; ++i) { unsigned int sub_resource_idx = D3D12_RESOURCE_BARRIER_ALL_SUBRESOURCES; @@ -3486,6 +3520,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_OMSetRenderTargets(ID3D12Graphi } d3d12_command_list_invalidate_current_framebuffer(list); + d3d12_command_list_invalidate_current_render_pass(list); } static void d3d12_command_list_clear(struct d3d12_command_list *list, @@ -3504,6 +3539,8 @@ static void d3d12_command_list_clear(struct d3d12_command_list *list, unsigned int i; VkResult vr; + d3d12_command_list_end_current_render_pass(list, vk_procs); + if (!rect_count) { full_rect.top = 0; @@ -3695,6 +3732,8 @@ static void STDMETHODCALLTYPE d3d12_command_list_ClearUnorderedAccessViewUint(ID return; } + d3d12_command_list_end_current_render_pass(list, vk_procs); + cpu_descriptor = d3d12_desc_from_cpu_handle(cpu_handle); if (!cpu_descriptor->view_size) { @@ -3737,6 +3776,8 @@ static void STDMETHODCALLTYPE d3d12_command_list_BeginQuery(ID3D12GraphicsComman TRACE("iface %p, heap %p, type %#x, index %u.\n", iface, heap, type, index); + d3d12_command_list_end_current_render_pass(list, vk_procs); + if (type == D3D12_QUERY_TYPE_OCCLUSION) flags = VK_QUERY_CONTROL_PRECISE_BIT; @@ -3753,6 +3794,8 @@ static void STDMETHODCALLTYPE d3d12_command_list_EndQuery(ID3D12GraphicsCommandL TRACE("iface %p, heap %p, type %#x, index %u.\n", iface, heap, type, index); + d3d12_command_list_end_current_render_pass(list, vk_procs); + d3d12_query_heap_mark_result_as_available(query_heap, index); if (type == D3D12_QUERY_TYPE_TIMESTAMP) @@ -3798,6 +3841,8 @@ static void STDMETHODCALLTYPE d3d12_command_list_ResolveQueryData(ID3D12Graphics return; } + d3d12_command_list_end_current_render_pass(list, vk_procs); + if (type == D3D12_QUERY_TYPE_PIPELINE_STATISTICS) stride = sizeof(struct D3D12_QUERY_DATA_PIPELINE_STATISTICS); @@ -3887,8 +3932,6 @@ static void STDMETHODCALLTYPE d3d12_command_list_ExecuteIndirect(ID3D12GraphicsC VK_CALL(vkCmdDrawIndirect(list->vk_command_buffer, arg_impl->u.vk_buffer, arg_buffer_offset, max_command_count, signature_desc->ByteStride)); - - VK_CALL(vkCmdEndRenderPass(list->vk_command_buffer)); break; case D3D12_INDIRECT_ARGUMENT_TYPE_DISPATCH: @@ -3902,6 +3945,8 @@ static void STDMETHODCALLTYPE d3d12_command_list_ExecuteIndirect(ID3D12GraphicsC break; } + d3d12_command_list_end_current_render_pass(list, vk_procs); + d3d12_command_list_update_descriptors(list, VK_PIPELINE_BIND_POINT_COMPUTE); VK_CALL(vkCmdDispatchIndirect(list->vk_command_buffer, @@ -4022,6 +4067,7 @@ static HRESULT d3d12_command_list_init(struct d3d12_command_list *list, struct d list->current_framebuffer = VK_NULL_HANDLE; list->current_pipeline = VK_NULL_HANDLE; + list->current_render_pass = VK_NULL_HANDLE; memset(list->pipeline_bindings, 0, sizeof(list->pipeline_bindings)); list->state = NULL; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 9fa29fb59774..f9a2f5a18f0c 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -617,6 +617,7 @@ struct d3d12_command_list VkFramebuffer current_framebuffer; VkPipeline current_pipeline; + VkRenderPass current_render_pass; struct vkd3d_pipeline_bindings pipeline_bindings[VK_PIPELINE_BIND_POINT_RANGE_SIZE]; struct d3d12_pipeline_state *state; -- 2.16.4

2 1

[PATCH vkd3d 11/12] vkd3d: Avoid invalidating current framebuffer needlessly.
by Józef Kucia 16 Aug '18

16 Aug '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 10 +++++++--- libs/vkd3d/state.c | 34 ++++++++++++++++++++++++++++++++++ libs/vkd3d/vkd3d_private.h | 2 ++ 3 files changed, 43 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 3d57545b20e1..7989401600b2 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -2835,22 +2835,26 @@ static void STDMETHODCALLTYPE d3d12_command_list_SetPipelineState(ID3D12Graphics { struct d3d12_pipeline_state *state = unsafe_impl_from_ID3D12PipelineState(pipeline_state); struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList(iface); + const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs; TRACE("iface %p, pipeline_state %p.\n", iface, pipeline_state); - list->state = state; d3d12_command_list_invalidate_bindings(list, state); if (d3d12_pipeline_state_is_compute(state)) { - const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs; VK_CALL(vkCmdBindPipeline(list->vk_command_buffer, state->vk_bind_point, state->u.compute.vk_pipeline)); } else { - d3d12_command_list_invalidate_current_framebuffer(list); + if (!d3d12_pipeline_state_is_render_pass_compatible(list->state, state)) + { + d3d12_command_list_invalidate_current_framebuffer(list); + } d3d12_command_list_invalidate_current_pipeline(list); } + + list->state = state; } static void STDMETHODCALLTYPE d3d12_command_list_ResourceBarrier(ID3D12GraphicsCommandList *iface, diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 8b10a6269a9c..43b1c1574fd0 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1798,6 +1798,40 @@ static unsigned int vkd3d_get_rt_format_swizzle(const struct vkd3d_format *forma return VKD3D_NO_SWIZZLE; } +/* + * This must return results in accordance with render passes created by + * d3d12_pipeline_state_init_graphics(). + */ +bool d3d12_pipeline_state_is_render_pass_compatible(const struct d3d12_pipeline_state *state_a, + const struct d3d12_pipeline_state *state_b) +{ + const struct d3d12_graphics_pipeline_state *a = &state_a->u.graphics; + const struct d3d12_graphics_pipeline_state *b = &state_b->u.graphics; + unsigned int i; + + if (!state_a != !state_b) + return false; + if (!state_a && !state_b) + return true; + + if (state_a->vk_bind_point != VK_PIPELINE_BIND_POINT_GRAPHICS + || state_b->vk_bind_point != VK_PIPELINE_BIND_POINT_GRAPHICS) + return false; + + if (a->rt_idx != b->rt_idx) + return false; + if (a->attachment_count != b->attachment_count) + return false; + + for (i = 0; i < a->attachment_count; ++i) + { + if (a->attachments[i].format != b->attachments[i].format) + return false; + } + + return true; +} + static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *state, struct d3d12_device *device, const D3D12_GRAPHICS_PIPELINE_STATE_DESC *desc) { diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 59741684dc38..9fa29fb59774 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -525,6 +525,8 @@ HRESULT d3d12_pipeline_state_create_compute(struct d3d12_device *device, const D3D12_COMPUTE_PIPELINE_STATE_DESC *desc, struct d3d12_pipeline_state **state) DECLSPEC_HIDDEN; HRESULT d3d12_pipeline_state_create_graphics(struct d3d12_device *device, const D3D12_GRAPHICS_PIPELINE_STATE_DESC *desc, struct d3d12_pipeline_state **state) DECLSPEC_HIDDEN; +bool d3d12_pipeline_state_is_render_pass_compatible(const struct d3d12_pipeline_state *state_a, + const struct d3d12_pipeline_state *state_b) DECLSPEC_HIDDEN; struct d3d12_pipeline_state *unsafe_impl_from_ID3D12PipelineState(ID3D12PipelineState *iface) DECLSPEC_HIDDEN; struct vkd3d_buffer -- 2.16.4

2 1

[PATCH vkd3d 10/12] vkd3d: Avoid invalidating graphics pipeline and framebuffer.
by Józef Kucia 16 Aug '18

16 Aug '18

From: Józef Kucia <jkucia(a)codeweavers.com> Do not invalidate the current graphics pipeline and the current framebuffer when a compute pipeline is bound. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 9 ++++++--- libs/vkd3d/vkd3d_private.h | 5 +++++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 9455898c07b3..3d57545b20e1 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -2839,15 +2839,18 @@ static void STDMETHODCALLTYPE d3d12_command_list_SetPipelineState(ID3D12Graphics TRACE("iface %p, pipeline_state %p.\n", iface, pipeline_state); list->state = state; - d3d12_command_list_invalidate_current_framebuffer(list); - d3d12_command_list_invalidate_current_pipeline(list); d3d12_command_list_invalidate_bindings(list, state); - if (state && state->vk_bind_point == VK_PIPELINE_BIND_POINT_COMPUTE) + if (d3d12_pipeline_state_is_compute(state)) { const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs; VK_CALL(vkCmdBindPipeline(list->vk_command_buffer, state->vk_bind_point, state->u.compute.vk_pipeline)); } + else + { + d3d12_command_list_invalidate_current_framebuffer(list); + d3d12_command_list_invalidate_current_pipeline(list); + } } static void STDMETHODCALLTYPE d3d12_command_list_ResourceBarrier(ID3D12GraphicsCommandList *iface, diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 8efb9304a554..59741684dc38 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -516,6 +516,11 @@ struct d3d12_pipeline_state struct d3d12_device *device; }; +static inline bool d3d12_pipeline_state_is_compute(const struct d3d12_pipeline_state *state) +{ + return state && state->vk_bind_point == VK_PIPELINE_BIND_POINT_COMPUTE; +} + HRESULT d3d12_pipeline_state_create_compute(struct d3d12_device *device, const D3D12_COMPUTE_PIPELINE_STATE_DESC *desc, struct d3d12_pipeline_state **state) DECLSPEC_HIDDEN; HRESULT d3d12_pipeline_state_create_graphics(struct d3d12_device *device, -- 2.16.4

2 1

[PATCH vkd3d 09/12] vkd3d: Initialize all fields before calling d3d12_command_allocator_allocate_command_buffer().
by Józef Kucia 16 Aug '18

16 Aug '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 501a06764e24..9455898c07b3 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -4001,12 +4001,6 @@ static HRESULT d3d12_command_list_init(struct d3d12_command_list *list, struct d list->allocator = allocator; list->pipeline_state = initial_pipeline_state; - if (FAILED(hr = d3d12_command_allocator_allocate_command_buffer(allocator, list))) - { - ID3D12Device_Release(&device->ID3D12Device_iface); - return hr; - } - memset(list->strides, 0, sizeof(list->strides)); list->ia_desc.sType = VK_STRUCTURE_TYPE_PIPELINE_INPUT_ASSEMBLY_STATE_CREATE_INFO; list->ia_desc.pNext = NULL; @@ -4025,6 +4019,12 @@ static HRESULT d3d12_command_list_init(struct d3d12_command_list *list, struct d list->state = NULL; + if (FAILED(hr = d3d12_command_allocator_allocate_command_buffer(allocator, list))) + { + ID3D12Device_Release(&device->ID3D12Device_iface); + return hr; + } + return S_OK; } -- 2.16.4

2 1

[PATCH vkd3d 08/12] tests: Add test for draw with no descriptor bindings.
by Józef Kucia 16 Aug '18

16 Aug '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 69 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index a0185951999d..7b0040730aa0 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -3512,6 +3512,74 @@ static void test_draw_indexed_instanced(void) destroy_test_context(&context); } +static void test_draw_no_descriptor_bindings(void) +{ + static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; + D3D12_ROOT_SIGNATURE_DESC root_signature_desc; + D3D12_DESCRIPTOR_RANGE descriptor_range[2]; + ID3D12GraphicsCommandList *command_list; + D3D12_ROOT_PARAMETER root_parameters[2]; + struct test_context_desc desc; + struct test_context context; + ID3D12CommandQueue *queue; + HRESULT hr; + + memset(&desc, 0, sizeof(desc)); + desc.no_root_signature = true; + if (!init_test_context(&context, &desc)) + return; + command_list = context.list; + queue = context.queue; + + descriptor_range[0].RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_SRV; + descriptor_range[0].NumDescriptors = 2; + descriptor_range[0].BaseShaderRegister = 0; + descriptor_range[0].RegisterSpace = 0; + descriptor_range[0].OffsetInDescriptorsFromTableStart = 1; + root_parameters[0].ParameterType = D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE; + root_parameters[0].DescriptorTable.NumDescriptorRanges = 1; + root_parameters[0].DescriptorTable.pDescriptorRanges = &descriptor_range[0]; + root_parameters[0].ShaderVisibility = D3D12_SHADER_VISIBILITY_PIXEL; + + descriptor_range[1].RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_UAV; + descriptor_range[1].NumDescriptors = 1; + descriptor_range[1].BaseShaderRegister = 0; + descriptor_range[1].RegisterSpace = 0; + descriptor_range[1].OffsetInDescriptorsFromTableStart = D3D12_DESCRIPTOR_RANGE_OFFSET_APPEND; + root_parameters[1].ParameterType = D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE; + root_parameters[1].DescriptorTable.NumDescriptorRanges = 1; + root_parameters[1].DescriptorTable.pDescriptorRanges = &descriptor_range[1]; + root_parameters[1].ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL; + + root_signature_desc.NumParameters = ARRAY_SIZE(root_parameters); + root_signature_desc.pParameters = root_parameters; + 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); + + context.pipeline_state = create_pipeline_state(context.device, + context.root_signature, context.render_target_desc.Format, NULL, NULL, NULL); + + 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); + + destroy_test_context(&context); +} + static void test_multiple_render_targets(void) { static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; @@ -18053,6 +18121,7 @@ START_TEST(d3d12) run_test(test_clear_unordered_access_view); run_test(test_draw_instanced); run_test(test_draw_indexed_instanced); + run_test(test_draw_no_descriptor_bindings); run_test(test_multiple_render_targets); run_test(test_append_aligned_element); run_test(test_gpu_virtual_address); -- 2.16.4

2 1

[PATCH vkd3d 07/12] vkd3d: Call vkCmdBindDescriptorSets() only with valid descriptor set.
by Józef Kucia 16 Aug '18

16 Aug '18

From: Józef Kucia <jkucia(a)codeweavers.com> If the current pipeline state doesn't need any descriptors it is perfectly valid to not have a descriptor set. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 4536264a6c3b..501a06764e24 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -2188,9 +2188,12 @@ static void d3d12_command_list_update_descriptors(struct d3d12_command_list *lis } bindings->descriptor_table_dirty_mask = 0; - bindings->in_use = true; - VK_CALL(vkCmdBindDescriptorSets(list->vk_command_buffer, bind_point, - rs->vk_pipeline_layout, rs->main_set, 1, &bindings->descriptor_set, 0, NULL)); + if (bindings->descriptor_set) + { + VK_CALL(vkCmdBindDescriptorSets(list->vk_command_buffer, bind_point, + rs->vk_pipeline_layout, rs->main_set, 1, &bindings->descriptor_set, 0, NULL)); + bindings->in_use = true; + } d3d12_command_list_update_uav_counter_descriptors(list, bind_point); } -- 2.16.4

2 1

[PATCH vkd3d 06/12] vkd3d: Add few more formats.
by Józef Kucia 16 Aug '18

16 Aug '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/utils.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libs/vkd3d/utils.c b/libs/vkd3d/utils.c index 98b764a169d1..e6b949d068cf 100644 --- a/libs/vkd3d/utils.c +++ b/libs/vkd3d/utils.c @@ -35,6 +35,7 @@ static const struct vkd3d_format vkd3d_formats[] = {DXGI_FORMAT_R16G16B16A16_UINT, VK_FORMAT_R16G16B16A16_UINT, 8, 1, 1, 1, COLOR}, {DXGI_FORMAT_R10G10B10A2_UNORM, VK_FORMAT_A2B10G10R10_UNORM_PACK32, 4, 1, 1, 1, COLOR}, {DXGI_FORMAT_R11G11B10_FLOAT, VK_FORMAT_B10G11R11_UFLOAT_PACK32, 4, 1, 1, 1, COLOR}, + {DXGI_FORMAT_R8G8_TYPELESS, VK_FORMAT_R8G8_UNORM, 2, 1, 1, 1, COLOR}, {DXGI_FORMAT_R8G8_UNORM, VK_FORMAT_R8G8_UNORM, 2, 1, 1, 1, COLOR}, {DXGI_FORMAT_R8G8B8A8_TYPELESS, VK_FORMAT_R8G8B8A8_UNORM, 4, 1, 1, 1, COLOR}, {DXGI_FORMAT_R8G8B8A8_UNORM, VK_FORMAT_R8G8B8A8_UNORM, 4, 1, 1, 1, COLOR}, @@ -52,6 +53,7 @@ static const struct vkd3d_format vkd3d_formats[] = {DXGI_FORMAT_R16_FLOAT, VK_FORMAT_R16_SFLOAT, 2, 1, 1, 1, COLOR}, {DXGI_FORMAT_D16_UNORM, VK_FORMAT_D16_UNORM, 2, 1, 1, 1, DEPTH}, {DXGI_FORMAT_R16_UNORM, VK_FORMAT_R16_UNORM, 2, 1, 1, 1, COLOR}, + {DXGI_FORMAT_R8_TYPELESS, VK_FORMAT_R8_UNORM, 1, 1, 1, 1, COLOR}, {DXGI_FORMAT_R8_UNORM, VK_FORMAT_R8_UNORM, 1, 1, 1, 1, COLOR}, {DXGI_FORMAT_R8_UINT, VK_FORMAT_R8_UINT, 1, 1, 1, 1, COLOR}, {DXGI_FORMAT_R8_SNORM, VK_FORMAT_R8_SNORM, 1, 1, 1, 1, COLOR}, -- 2.16.4

2 1

[PATCH vkd3d 04/12] programs/vkd3d-compiler: Do not overallocate memory for shader code.
by Józef Kucia 16 Aug '18

16 Aug '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 2 +- programs/vkd3d-compiler/main.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index a5dae19ef7cb..d7c80163c677 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2509,7 +2509,7 @@ static uint32_t vkd3d_dxbc_compiler_emit_load_constant(struct vkd3d_dxbc_compile const struct vkd3d_shader_register *reg, DWORD swizzle, DWORD write_mask) { unsigned int component_count = vkd3d_write_mask_component_count(write_mask); - uint32_t values[VKD3D_VEC4_SIZE]; + uint32_t values[VKD3D_VEC4_SIZE] = {0}; unsigned int i, j; assert(reg->type == VKD3DSPR_IMMCONST); diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index 83ccd3d65a4a..5fe4540ca17c 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -46,7 +46,7 @@ static bool read_shader(struct vkd3d_shader_code *shader, const char *filename) return false; } - if (!(code = malloc(sizeof(uint32_t) * shader->size))) + if (!(code = malloc(shader->size))) { fprintf(stderr, "Out of memory.\n"); fclose(fd); -- 2.16.4

3 2

[PATCH vkd3d 03/12] libs/vkd3d: Add fall-through comment to vkd3d_select_memory_type().
by Józef Kucia 16 Aug '18

16 Aug '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/resource.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 1456c4b925e7..44f323350056 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -417,6 +417,7 @@ static unsigned int vkd3d_select_memory_type(struct d3d12_device *device, uint32 case D3D12_HEAP_TYPE_CUSTOM: FIXME("Custom heaps not supported yet.\n"); + /* fall-through */ case D3D12_HEAP_TYPE_UPLOAD: case D3D12_HEAP_TYPE_READBACK: required_flags = VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT; -- 2.16.4

2 1