October 2021 - Wine-commits

Conor McCarthy : tests: Add tests for d3d12_command_list_IASetVertexBuffers() calls with NULL views.
by Alexandre Julliard 15 Oct '21

15 Oct '21

Module: vkd3d Branch: master Commit: 2bf4539c0d07f49d0f8c35b244c3206f02ea21c2 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=2bf4539c0d07f49d0f8c35b… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri Oct 15 01:37:38 2021 +0200 tests: Add tests for d3d12_command_list_IASetVertexBuffers() calls with NULL views. Part of a vkd3d-proton patch by Hans-Kristian Arntzen. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 4e908d4..e6461e3 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -19201,6 +19201,10 @@ static void test_null_vbv(void) vbv[1].SizeInBytes = 0; ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, ARRAY_SIZE(vbv), vbv); + /* Calls with NULL "views" pointers should be ignored. */ + ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, 1, NULL); + ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 1, 1, NULL); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 4, 4, 0, 0); transition_resource_state(command_list, context.render_target,

1 0

Conor McCarthy : tests: Add a test for 0 sample count resources to test_create_committed_resource().
by Alexandre Julliard 15 Oct '21

15 Oct '21

Module: vkd3d Branch: master Commit: a36dfef00432a5c42ea211f1b0a110c55bffe1d1 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=a36dfef00432a5c42ea211f… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri Oct 15 01:37:39 2021 +0200 tests: Add a test for 0 sample count resources to test_create_committed_resource(). Windows returns E_INVALIDARG at least on AMD and Intel. Psychonauts 2 attempts to create resources with this argument. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index e6461e3..4a7309d 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -1700,6 +1700,14 @@ static void test_create_committed_resource(void) ID3D12Resource_Release(resource); resource_desc.MipLevels = 1; + resource_desc.SampleDesc.Count = 0; + hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc, + D3D12_RESOURCE_STATE_RENDER_TARGET, &clear_value, &IID_ID3D12Resource, (void **)&resource); + todo ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + ID3D12Resource_Release(resource); + resource_desc.SampleDesc.Count = 1; + hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc, D3D12_RESOURCE_STATE_RENDER_TARGET | D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE, &clear_value, &IID_ID3D12Resource, (void **)&resource);

1 0

Conor McCarthy : vkd3d: Reject 0 sample count textures in d3d12_resource_validate_desc().
by Alexandre Julliard 15 Oct '21

15 Oct '21

Module: vkd3d Branch: master Commit: a86a6819121a448d091b5e48192d624886016bf7 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=a86a6819121a448d091b5e4… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri Oct 15 01:37:40 2021 +0200 vkd3d: Reject 0 sample count textures in d3d12_resource_validate_desc(). Buffers with 0 sample counts were already rejected here. Signed-off-by: Conor McCarthy <cmccarthy(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 | 6 ++++++ tests/d3d12.c | 4 +--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index d6e5d4b..705e720 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1681,6 +1681,12 @@ HRESULT d3d12_resource_validate_desc(const D3D12_RESOURCE_DESC *desc, struct d3d /* Fall through. */ case D3D12_RESOURCE_DIMENSION_TEXTURE2D: case D3D12_RESOURCE_DIMENSION_TEXTURE3D: + if (!desc->SampleDesc.Count) + { + WARN("Invalid sample count 0.\n"); + return E_INVALIDARG; + } + if (!(format = vkd3d_format_from_d3d12_resource_desc(device, desc, 0))) { WARN("Invalid format %#x.\n", desc->Format); diff --git a/tests/d3d12.c b/tests/d3d12.c index 4a7309d..0833476 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -1703,9 +1703,7 @@ static void test_create_committed_resource(void) resource_desc.SampleDesc.Count = 0; hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc, D3D12_RESOURCE_STATE_RENDER_TARGET, &clear_value, &IID_ID3D12Resource, (void **)&resource); - todo ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); - if (SUCCEEDED(hr)) - ID3D12Resource_Release(resource); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); resource_desc.SampleDesc.Count = 1; hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE,

1 0

Conor McCarthy : tests: Add tests for sample_c texel offsets.
by Alexandre Julliard 15 Oct '21

15 Oct '21

Module: vkd3d Branch: master Commit: ebc82a622cbd6514eabae78285dbe531befc49ab URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=ebc82a622cbd6514eabae78… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri Oct 15 01:37:41 2021 +0200 tests: Add tests for sample_c texel offsets. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 110 ++++++++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 80 insertions(+), 30 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=ebc82a622cbd6514eab…

1 0

Philip Rebohle : vkd3d-shader/spirv: Implement texel offset support for sample_c instructions.
by Alexandre Julliard 15 Oct '21

15 Oct '21

Module: vkd3d Branch: master Commit: ea1b01b1f80e5a5b4e2920be71a802d36347759e URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=ea1b01b1f80e5a5b4e2920b… Author: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> Date: Fri Oct 15 01:37:42 2021 +0200 vkd3d-shader/spirv: Implement texel offset support for sample_c instructions. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 13 +++++++++---- tests/d3d12.c | 3 +-- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 58bf3d9..f9124fc 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -8235,12 +8235,9 @@ static void vkd3d_dxbc_compiler_emit_sample_c(struct vkd3d_dxbc_compiler *compil SpvImageOperandsMask operands_mask = 0; unsigned int image_operand_count = 0; struct vkd3d_shader_image image; - uint32_t image_operands[1]; + uint32_t image_operands[2]; SpvOp op; - if (vkd3d_shader_instruction_has_texel_offset(instruction)) - FIXME("Texel offset not supported.\n"); - if (instruction->handler_idx == VKD3DSIH_SAMPLE_C_LZ) { op = SpvOpImageSampleDrefExplicitLod; @@ -8255,6 +8252,14 @@ static void vkd3d_dxbc_compiler_emit_sample_c(struct vkd3d_dxbc_compiler *compil vkd3d_dxbc_compiler_prepare_image(compiler, &image, &src[1].reg, &src[2].reg, VKD3D_IMAGE_FLAG_SAMPLED | VKD3D_IMAGE_FLAG_DEPTH); + + if (vkd3d_shader_instruction_has_texel_offset(instruction)) + { + operands_mask |= SpvImageOperandsConstOffsetMask; + image_operands[image_operand_count++] = vkd3d_dxbc_compiler_emit_texel_offset(compiler, + instruction, image.resource_type_info); + } + sampled_type_id = vkd3d_spirv_get_type_id(builder, image.sampled_type, 1); coordinate_id = vkd3d_dxbc_compiler_emit_load_src(compiler, &src[0], VKD3DSP_WRITEMASK_ALL); dref_id = vkd3d_dxbc_compiler_emit_load_src(compiler, &src[3], VKD3DSP_WRITEMASK_0); diff --git a/tests/d3d12.c b/tests/d3d12.c index 93cd56d..c73e15b 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -14784,8 +14784,7 @@ static void test_sample_c_lz(void) transition_resource_state(command_list, context.render_target, D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); - todo_if(j && tests[i].d_ref > 0.0f) - check_sub_resource_float(context.render_target, 0, queue, command_list, tests[i].expected, 2); + check_sub_resource_float(context.render_target, 0, queue, command_list, tests[i].expected, 2); reset_command_list(command_list, context.allocator); transition_resource_state(command_list, context.render_target,

1 0

Conor McCarthy : vkd3d-shader/spirv: Implement support for descriptor array offsets.
by Alexandre Julliard 15 Oct '21

15 Oct '21

Module: vkd3d Branch: master Commit: e328d0b17871c32aaf89b3505c09a6bdcc6c1e5d URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=e328d0b17871c32aaf89b35… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri Oct 15 01:37:43 2021 +0200 vkd3d-shader/spirv: Implement support for descriptor array offsets. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 72 +++++++++++++++++++++++++++++++++++++++++++++-- libs/vkd3d-shader/spirv.c | 12 +++++++- 2 files changed, 81 insertions(+), 3 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 37b5936..3ba84a5 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -64,6 +64,11 @@ enum vkd3d_shader_structure_type * \since 1.3 */ VKD3D_SHADER_STRUCTURE_TYPE_PREPROCESS_INFO, + /** + * The structure is a vkd3d_shader_descriptor_offset_info structure. + * \since 1.3 + */ + VKD3D_SHADER_STRUCTURE_TYPE_DESCRIPTOR_OFFSET_INFO, VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_STRUCTURE_TYPE), }; @@ -208,8 +213,9 @@ struct vkd3d_shader_descriptor_binding /** The binding index of the descriptor. */ unsigned int binding; /** - * The size of this descriptor array. Descriptor arrays are not supported in - * this version of vkd3d-shader, and therefore this value must be 1. + * The size of this descriptor array. If an offset is specified for this + * binding by the vkd3d_shader_descriptor_offset_info structure, counting + * starts at that offset. */ unsigned int count; }; @@ -452,6 +458,68 @@ struct vkd3d_shader_transform_feedback_info unsigned int buffer_stride_count; }; +/** + * A chained structure containing descriptor offsets. + * + * This structure is optional. + * + * This structure extends vkd3d_shader_interface_info. + * + * This structure contains only input parameters. + * + * \since 1.3 + */ +struct vkd3d_shader_descriptor_offset_info +{ + /** Must be set to VKD3D_SHADER_STRUCTURE_TYPE_DESCRIPTOR_OFFSET_INFO. */ + enum vkd3d_shader_structure_type type; + /** Optional pointer to a structure containing further parameters. */ + const void *next; + + /** + * Pointer to an array of offsets into the descriptor arrays referenced by + * the 'bindings' array in struct vkd3d_shader_interface_info. This allows + * mapping multiple shader resource arrays to a single binding point in + * the target environment. + * + * For example, to map Direct3D constant buffer registers 'cb0[0:3]' and + * 'cb1[6:7]' to descriptors 8-12 and 4-5 in the Vulkan descriptor array in + * descriptor set 3 and with binding 2, set the following values in the + * 'bindings' array in struct vkd3d_shader_interface_info: + * + * \code + * type = VKD3D_SHADER_DESCRIPTOR_TYPE_CBV + * register_space = 0 + * register_index = 0 + * binding.set = 3 + * binding.binding = 2 + * binding.count = 4 + * + * type = VKD3D_SHADER_DESCRIPTOR_TYPE_CBV + * register_space = 0 + * register_index = 6 + * binding.set = 3 + * binding.binding = 2 + * binding.count = 2 + * \endcode + * + * and then pass \c {8, \c 4} as \a binding_offsets here. + * + * This field may be NULL, in which case the corresponding offsets are + * specified to be 0. + */ + const unsigned int *binding_offsets; + + /** + * Pointer to an array of offsets into the descriptor arrays referenced by + * the 'uav_counters' array in struct vkd3d_shader_interface_info. This + * works the same way as \ref binding_offsets above. UAV counter arrays are + * not supported in this version of vkd3d-shader, and therefore this field + * must either be NULL or specify 0 offsets. + */ + const unsigned int *uav_counter_offsets; +}; + /** The format of a shader to be compiled or scanned. */ enum vkd3d_shader_source_type { diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index f9124fc..6cf438d 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2231,6 +2231,7 @@ struct vkd3d_dxbc_compiler size_t control_flow_info_size; struct vkd3d_shader_interface_info shader_interface; + struct vkd3d_shader_descriptor_offset_info offset_info; struct vkd3d_push_constant_buffer_binding *push_constants; const struct vkd3d_shader_spirv_target_info *spirv_target_info; @@ -2292,6 +2293,7 @@ struct vkd3d_dxbc_compiler *vkd3d_dxbc_compiler_create(const struct vkd3d_shader const struct vkd3d_shader_signature *patch_constant_signature = &shader_desc->patch_constant_signature; const struct vkd3d_shader_signature *output_signature = &shader_desc->output_signature; const struct vkd3d_shader_interface_info *shader_interface; + const struct vkd3d_shader_descriptor_offset_info *offset_info; const struct vkd3d_shader_spirv_target_info *target_info; struct vkd3d_dxbc_compiler *compiler; unsigned int max_element_count; @@ -2385,6 +2387,13 @@ struct vkd3d_dxbc_compiler *vkd3d_dxbc_compiler_create(const struct vkd3d_shader for (i = 0; i < shader_interface->push_constant_buffer_count; ++i) compiler->push_constants[i].pc = shader_interface->push_constant_buffers[i]; } + + if ((offset_info = vkd3d_find_struct(shader_interface->next, DESCRIPTOR_OFFSET_INFO))) + { + compiler->offset_info = *offset_info; + if (offset_info->uav_counter_offsets) + WARN("Ignoring UAV counter offsets %p.\n", offset_info->uav_counter_offsets); + } } compiler->scan_descriptor_info = scan_descriptor_info; @@ -2546,6 +2555,7 @@ static struct vkd3d_shader_descriptor_binding vkd3d_dxbc_compiler_get_descriptor { const struct vkd3d_shader_interface_info *shader_interface = &compiler->shader_interface; unsigned int register_last = (range->last == ~0u) ? range->first : range->last; + const unsigned int *binding_offsets = compiler->offset_info.binding_offsets; enum vkd3d_shader_descriptor_type descriptor_type; enum vkd3d_shader_binding_flag resource_type_flag; struct vkd3d_shader_descriptor_binding binding; @@ -2626,7 +2636,7 @@ static struct vkd3d_shader_descriptor_binding vkd3d_dxbc_compiler_get_descriptor || current->binding.count <= register_last - current->register_index) continue; - *binding_base_idx = current->register_index; + *binding_base_idx = current->register_index - (binding_offsets ? binding_offsets[i] : 0); return current->binding; } if (shader_interface->binding_count)

1 0

Conor McCarthy : vkd3d: Introduce a helper function to chain vkd3d structures.
by Alexandre Julliard 15 Oct '21

15 Oct '21

Module: vkd3d Branch: master Commit: 6a88c57f5d776ad4978ffad3918e4c3a75b9c332 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=6a88c57f5d776ad4978ffad… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri Oct 15 01:37:44 2021 +0200 vkd3d: Introduce a helper function to chain vkd3d structures. Analogous to vk_prepend_struct(). Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/state.c | 9 ++++----- libs/vkd3d/vkd3d_private.h | 13 +++++++++++++ 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 277afe4..29d8618 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -2689,12 +2689,11 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s goto fail; } - shader_interface.next = shader_stages[i].stage == xfb_stage ? &xfb_info : NULL; + shader_interface.next = NULL; + if (shader_stages[i].stage == xfb_stage) + vkd3d_prepend_struct(&shader_interface, &xfb_info); if (target_info) - { - target_info->next = shader_interface.next; - shader_interface.next = target_info; - } + vkd3d_prepend_struct(&shader_interface, target_info); if (FAILED(hr = create_shader_stage(device, &graphics->stages[graphics->stage_count], shader_stages[i].stage, b, &shader_interface))) diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index f8474ca..0594eea 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -1395,4 +1395,17 @@ static inline void vk_prepend_struct(void *header, void *structure) vk_header->pNext = vk_structure; } +static inline void vkd3d_prepend_struct(void *header, void *structure) +{ + struct + { + unsigned int type; + const void *next; + } *vkd3d_header = header, *vkd3d_structure = structure; + + assert(!vkd3d_structure->next); + vkd3d_structure->next = vkd3d_header->next; + vkd3d_header->next = vkd3d_structure; +} + #endif /* __VKD3D_PRIVATE_H */

1 0

Conor McCarthy : vkd3d: Pass descriptor offset info to vkd3d-shader for compute pipelines.
by Alexandre Julliard 15 Oct '21

15 Oct '21

Module: vkd3d Branch: master Commit: 1edbd3d6989ffea6bbfe0841d4673a2744e8ccc3 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=1edbd3d6989ffea6bbfe084… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri Oct 15 01:37:45 2021 +0200 vkd3d: Pass descriptor offset info to vkd3d-shader for compute pipelines. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/state.c | 30 ++++++++++++++++++++++++------ libs/vkd3d/vkd3d_private.h | 1 + tests/d3d12.c | 1 - 3 files changed, 25 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 29d8618..e27c98e 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -91,6 +91,7 @@ static void d3d12_root_signature_cleanup(struct d3d12_root_signature *root_signa if (root_signature->descriptor_mapping) vkd3d_free(root_signature->descriptor_mapping); + vkd3d_free(root_signature->descriptor_offsets); if (root_signature->root_constants) vkd3d_free(root_signature->root_constants); @@ -713,10 +714,11 @@ static HRESULT d3d12_root_signature_init_descriptor_array_binding(struct d3d12_r } static void d3d12_root_signature_map_vk_unbounded_binding(struct d3d12_root_signature *root_signature, - const struct d3d12_root_descriptor_table_range *range, bool buffer_descriptor, + const struct d3d12_root_descriptor_table_range *range, unsigned int descriptor_offset, bool buffer_descriptor, enum vkd3d_shader_visibility shader_visibility, struct vkd3d_descriptor_set_context *context) { - struct vkd3d_shader_resource_binding *mapping = &root_signature->descriptor_mapping[context->descriptor_index++]; + struct vkd3d_shader_resource_binding *mapping = &root_signature->descriptor_mapping[context->descriptor_index]; + unsigned int *offset = &root_signature->descriptor_offsets[context->descriptor_index++]; mapping->type = range->type; mapping->register_space = range->register_space; @@ -727,18 +729,21 @@ static void d3d12_root_signature_map_vk_unbounded_binding(struct d3d12_root_sign || range->type == VKD3D_SHADER_DESCRIPTOR_TYPE_UAV) && !buffer_descriptor); mapping->binding.binding = range->binding; mapping->binding.count = range->vk_binding_count; + *offset = descriptor_offset; } static void d3d12_root_signature_map_descriptor_unbounded_binding(struct d3d12_root_signature *root_signature, - const struct d3d12_root_descriptor_table_range *range, + const struct d3d12_root_descriptor_table_range *range, unsigned int descriptor_offset, enum vkd3d_shader_visibility shader_visibility, struct vkd3d_descriptor_set_context *context) { bool is_buffer = range->type == VKD3D_SHADER_DESCRIPTOR_TYPE_CBV; if (range->type == VKD3D_SHADER_DESCRIPTOR_TYPE_SRV || range->type == VKD3D_SHADER_DESCRIPTOR_TYPE_UAV) - d3d12_root_signature_map_vk_unbounded_binding(root_signature, range, true, shader_visibility, context); + d3d12_root_signature_map_vk_unbounded_binding(root_signature, range, + descriptor_offset, true, shader_visibility, context); - d3d12_root_signature_map_vk_unbounded_binding(root_signature, range, is_buffer, shader_visibility, context); + d3d12_root_signature_map_vk_unbounded_binding(root_signature, range, + descriptor_offset, is_buffer, shader_visibility, context); } static int compare_register_range(const void *a, const void *b) @@ -882,7 +887,7 @@ static HRESULT d3d12_root_signature_init_root_descriptor_tables(struct d3d12_roo range->binding = base_range->binding; range->vk_binding_count = base_range->vk_binding_count - rel_offset; d3d12_root_signature_map_descriptor_unbounded_binding(root_signature, range, - shader_visibility, context); + rel_offset, shader_visibility, context); continue; } else if (range->descriptor_count == UINT_MAX) @@ -1165,6 +1170,9 @@ static HRESULT d3d12_root_signature_init(struct d3d12_root_signature *root_signa if (!(root_signature->descriptor_mapping = vkd3d_calloc(root_signature->binding_count, sizeof(*root_signature->descriptor_mapping)))) goto fail; + if (!(root_signature->descriptor_offsets = vkd3d_calloc(root_signature->binding_count, + sizeof(*root_signature->descriptor_offsets)))) + goto fail; root_signature->root_constant_count = info.root_constant_count; if (!(root_signature->root_constants = vkd3d_calloc(root_signature->root_constant_count, sizeof(*root_signature->root_constants)))) @@ -1878,6 +1886,7 @@ static HRESULT d3d12_pipeline_state_init_compute(struct d3d12_pipeline_state *st const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; struct vkd3d_shader_scan_descriptor_info shader_info; struct vkd3d_shader_interface_info shader_interface; + struct vkd3d_shader_descriptor_offset_info offset_info; const struct d3d12_root_signature *root_signature; struct vkd3d_shader_spirv_target_info target_info; VkPipelineLayout vk_pipeline_layout; @@ -1917,6 +1926,15 @@ static HRESULT d3d12_pipeline_state_init_compute(struct d3d12_pipeline_state *st target_info.extensions = device->vk_info.shader_extensions; target_info.extension_count = device->vk_info.shader_extension_count; + if (root_signature->descriptor_offsets) + { + offset_info.type = VKD3D_SHADER_STRUCTURE_TYPE_DESCRIPTOR_OFFSET_INFO; + offset_info.next = NULL; + offset_info.binding_offsets = root_signature->descriptor_offsets; + offset_info.uav_counter_offsets = NULL; + vkd3d_prepend_struct(&target_info, &offset_info); + } + shader_interface.type = VKD3D_SHADER_STRUCTURE_TYPE_INTERFACE_INFO; shader_interface.next = &target_info; shader_interface.bindings = root_signature->descriptor_mapping; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 0594eea..496372e 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -736,6 +736,7 @@ struct d3d12_root_signature unsigned int binding_count; struct vkd3d_shader_resource_binding *descriptor_mapping; + unsigned int *descriptor_offsets; unsigned int root_constant_count; struct vkd3d_shader_push_constant_buffer *root_constants; diff --git a/tests/d3d12.c b/tests/d3d12.c index c73e15b..460445b 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -35105,7 +35105,6 @@ static void test_unbounded_resource_arrays(void) D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE); get_buffer_readback_with_command_list(output_buffers[i], DXGI_FORMAT_R32_UINT, &rb, queue, command_list); /* Buffers at index >= 64 are aliased. */ - todo_if(i != 74 && i > 63) check_readback_data_uint(&rb, NULL, (i < 64 ? 63 - i : 127 - i) ^ 0x35, 0); release_resource_readback(&rb); reset_command_list(command_list, context.allocator);

1 0

Conor McCarthy : vkd3d: Pass descriptor offset info to vkd3d-shader for graphics pipelines.
by Alexandre Julliard 15 Oct '21

15 Oct '21

Module: vkd3d Branch: master Commit: 3948056256eb891c7991fc6a0309bf8e5369f6bc URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=3948056256eb891c7991fc6… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri Oct 15 01:37:46 2021 +0200 vkd3d: Pass descriptor offset info to vkd3d-shader for graphics pipelines. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/state.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index e27c98e..ef74d7f 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -2403,6 +2403,7 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s struct vkd3d_shader_transform_feedback_info xfb_info; struct vkd3d_shader_spirv_target_info ps_target_info; struct vkd3d_shader_interface_info shader_interface; + struct vkd3d_shader_descriptor_offset_info offset_info; struct vkd3d_shader_spirv_target_info *target_info; const struct d3d12_root_signature *root_signature; struct vkd3d_shader_signature input_signature; @@ -2643,6 +2644,15 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s shader_interface.combined_samplers = NULL; shader_interface.combined_sampler_count = 0; + if (root_signature->descriptor_offsets) + { + offset_info.type = VKD3D_SHADER_STRUCTURE_TYPE_DESCRIPTOR_OFFSET_INFO; + offset_info.next = NULL; + offset_info.binding_offsets = root_signature->descriptor_offsets; + offset_info.uav_counter_offsets = NULL; + vkd3d_prepend_struct(&shader_interface, &offset_info); + } + for (i = 0; i < ARRAY_SIZE(shader_stages); ++i) { struct vkd3d_shader_scan_descriptor_info shader_info =

1 0

Alistair Leslie-Hughes : dbghelp: Support UWOP_EPILOG in unwind.
by Alexandre Julliard 14 Oct '21

14 Oct '21

Module: wine Branch: master Commit: 40f0119739d36b03f4df5d525d098ec032f1a37b URL: https://source.winehq.org/git/wine.git/?a=commit;h=40f0119739d36b03f4df5d52… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Oct 14 19:45:56 2021 +1100 dbghelp: Support UWOP_EPILOG in unwind. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/cpu_x86_64.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/dbghelp/cpu_x86_64.c b/dlls/dbghelp/cpu_x86_64.c index 8e8ac85dd2f..4fd8d76e010 100644 --- a/dlls/dbghelp/cpu_x86_64.c +++ b/dlls/dbghelp/cpu_x86_64.c @@ -209,6 +209,19 @@ static void dump_unwind_info(struct cpu_stack_walk* csw, ULONG64 base, RUNTIME_F case UWOP_PUSH_MACHFRAME: TRACE("PUSH_MACHFRAME %u\n", info->UnwindCode[i].u.OpInfo); break; + case UWOP_EPILOG: + if (info->Version == 2) + { + unsigned int offset; + if (info->UnwindCode[i].u.OpInfo) + offset = info->UnwindCode[i].u.CodeOffset; + else + offset = (info->UnwindCode[i+1].u.OpInfo << 8) + info->UnwindCode[i+1].u.CodeOffset; + TRACE("UWOP_EPILOG %u offset %u\n", info->UnwindCode[i].u.OpInfo, offset); + i += 1; + break; + } + /* Fall through */ default: FIXME("unknown code %u\n", info->UnwindCode[i].u.UnwindOp); break; @@ -490,7 +503,7 @@ static BOOL interpret_function_table_entry(struct cpu_stack_walk* csw, return FALSE; } - if (info->Version != 1) + if (info->Version != 1 && info->Version != 2) { WARN("unknown unwind info version %u at %lx\n", info->Version, base + function->UnwindData); return FALSE;

1 0