January 2024 - Wine-commits

Bernhard Übelacker : ntdll: Fix structure layout in RtlQueryProcessDebugInformation for 64-bit.
by Alexandre Julliard 24 Jan '24

24 Jan '24

Module: wine Branch: master Commit: ab28825aceec92775fd570fc3a42c154366eceea URL: https://gitlab.winehq.org/wine/wine/-/commit/ab28825aceec92775fd570fc3a42c1… Author: Bernhard Übelacker <bernhardu(a)mailbox.org> Date: Mon Jan 22 13:39:22 2024 +0100 ntdll: Fix structure layout in RtlQueryProcessDebugInformation for 64-bit. This is to avoid crash in Process Explorer 17.05. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56235 --- dlls/ntdll/debugbuffer.c | 4 ++-- dlls/ntdll/tests/rtl.c | 15 +++++++++++++++ include/winternl.h | 6 +++--- 3 files changed, 20 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/debugbuffer.c b/dlls/ntdll/debugbuffer.c index f073207ac06..aa35651bb40 100644 --- a/dlls/ntdll/debugbuffer.c +++ b/dlls/ntdll/debugbuffer.c @@ -77,8 +77,8 @@ static void dump_DEBUG_BUFFER(const DEBUG_BUFFER *iBuf) TRACE( "EventPairHandle:%p\n", iBuf->EventPairHandle); TRACE( "RemoteThreadHandle:%p\n", iBuf->RemoteThreadHandle); TRACE( "InfoClassMask:%lx\n", iBuf->InfoClassMask); - TRACE( "SizeOfInfo:%ld\n", iBuf->SizeOfInfo); - TRACE( "AllocatedSize:%ld\n", iBuf->AllocatedSize); + TRACE( "SizeOfInfo:%Iu\n", iBuf->SizeOfInfo); + TRACE( "AllocatedSize:%Iu\n", iBuf->AllocatedSize); TRACE( "SectionSize:%ld\n", iBuf->SectionSize); TRACE( "BackTraceInfo:%p\n", iBuf->BackTraceInformation); dump_DEBUG_MODULE_INFORMATION(iBuf->ModuleInformation); diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c index 03c31d7bf6b..754f5b711dd 100644 --- a/dlls/ntdll/tests/rtl.c +++ b/dlls/ntdll/tests/rtl.c @@ -157,6 +157,7 @@ static void test_RtlQueryProcessDebugInformation(void) DEBUG_BUFFER *buffer; NTSTATUS status; + /* PDI_HEAPS | PDI_HEAP_BLOCKS */ buffer = RtlCreateQueryDebugBuffer( 0, 0 ); ok( buffer != NULL, "RtlCreateQueryDebugBuffer returned NULL" ); @@ -165,6 +166,20 @@ static void test_RtlQueryProcessDebugInformation(void) status = RtlQueryProcessDebugInformation( GetCurrentProcessId(), PDI_HEAPS | PDI_HEAP_BLOCKS, buffer ); ok( !status, "RtlQueryProcessDebugInformation returned %lx\n", status ); + ok( buffer->InfoClassMask == (PDI_HEAPS | PDI_HEAP_BLOCKS), "unexpected InfoClassMask %ld\n", buffer->InfoClassMask); + ok( buffer->HeapInformation != NULL, "unexpected HeapInformation %p\n", buffer->HeapInformation); + + status = RtlDestroyQueryDebugBuffer( buffer ); + ok( !status, "RtlDestroyQueryDebugBuffer returned %lx\n", status ); + + /* PDI_MODULES */ + buffer = RtlCreateQueryDebugBuffer( 0, 0 ); + ok( buffer != NULL, "RtlCreateQueryDebugBuffer returned NULL" ); + + status = RtlQueryProcessDebugInformation( GetCurrentProcessId(), PDI_MODULES, buffer ); + ok( !status, "RtlQueryProcessDebugInformation returned %lx\n", status ); + ok( buffer->InfoClassMask == PDI_MODULES, "unexpected InfoClassMask %ld\n", buffer->InfoClassMask); + ok( buffer->ModuleInformation != NULL, "unexpected ModuleInformation %p\n", buffer->ModuleInformation); status = RtlDestroyQueryDebugBuffer( buffer ); ok( !status, "RtlDestroyQueryDebugBuffer returned %lx\n", status ); diff --git a/include/winternl.h b/include/winternl.h index 48eac76c4d6..52af87320a5 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -3040,11 +3040,11 @@ typedef struct _DEBUG_BUFFER { PVOID RemoteSectionBase; ULONG SectionBaseDelta; HANDLE EventPairHandle; - ULONG Unknown[2]; + SIZE_T Unknown[2]; HANDLE RemoteThreadHandle; ULONG InfoClassMask; - ULONG SizeOfInfo; - ULONG AllocatedSize; + SIZE_T SizeOfInfo; + SIZE_T AllocatedSize; ULONG SectionSize; PVOID ModuleInformation; PVOID BackTraceInformation;

1 0

Giovanni Mascellani : tests: Mark loading from stencil as buggy on MoltenVK.
by Alexandre Julliard 24 Jan '24

24 Jan '24

Module: vkd3d Branch: master Commit: 711ce4e65d083da591ce9444c57aadcccb2534b2 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/711ce4e65d083da591ce9444c57aa… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue Dec 26 22:32:47 2023 +0100 tests: Mark loading from stencil as buggy on MoltenVK. Specifically, MoltenVK seems to be able to load from stencil, but the specific replicating swizzle (repeating the stencil value on all the channels) is not honored. The stencil value is read only on the red channel. --- tests/d3d12.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 896a0f22..e6ae6c5f 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -21394,11 +21394,13 @@ static void test_stencil_load(void) transition_sub_resource_state(command_list, context.render_target, 0, D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + bug_if(is_mvk_device(context.device)) check_sub_resource_uvec4(context.render_target, 0, queue, command_list, &uvec4); reset_command_list(command_list, context.allocator); transition_sub_resource_state(command_list, texture, 0, D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE); + bug_if(is_mvk_device(context.device)) check_sub_resource_uvec4(texture, 0, queue, command_list, &uvec4); reset_command_list(command_list, context.allocator);

1 0

Giovanni Mascellani : tests: Skip unbounded descriptor ranges tests when they're unsupported.
by Alexandre Julliard 24 Jan '24

24 Jan '24

Module: vkd3d Branch: master Commit: 60e0246436f1e1b72af4673846f8eb52010fa9e1 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/60e0246436f1e1b72af4673846f8e… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue Dec 26 20:42:45 2023 +0100 tests: Skip unbounded descriptor ranges tests when they're unsupported. They are unsupported if the Vulkan descriptor indexing extension is not available; on MoltenVK it is known to be buggy, so it is disabled. --- tests/d3d12.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index e6ae6c5f..9b1ec8e3 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -36861,6 +36861,12 @@ static void test_unbounded_resource_arrays(void) command_list = context.list; queue = context.queue; + if (get_resource_binding_tier(device) < D3D12_RESOURCE_BINDING_TIER_2) + { + skip("Device doesn't support resource binding tier 2.\n"); + goto done; + } + memset(&root_signature_desc, 0, sizeof(root_signature_desc)); root_signature_desc.NumParameters = ARRAY_SIZE(root_parameters); root_signature_desc.pParameters = root_parameters; @@ -37021,6 +37027,12 @@ static void test_unbounded_samplers(void) command_list = context.list; queue = context.queue; + if (get_resource_binding_tier(device) < D3D12_RESOURCE_BINDING_TIER_2) + { + skip("Device doesn't support resource binding tier 2.\n"); + goto done; + } + root_signature_desc.NumParameters = ARRAY_SIZE(root_parameters); root_signature_desc.Flags = 0; root_signature_desc.NumStaticSamplers = 0;

1 0

Giovanni Mascellani : tests: Mark cull distance as buggy on MoltenVK.
by Alexandre Julliard 24 Jan '24

24 Jan '24

Module: vkd3d Branch: master Commit: 9a83e568b414853d2814c30835264e6e3c43749b URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/9a83e568b414853d2814c30835264… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Dec 27 11:55:12 2023 +0100 tests: Mark cull distance as buggy on MoltenVK. The generated MSL code is not accepted by the Metal runtime, and it looks wrong anyway. --- tests/d3d12.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 9b1ec8e3..b0a5182c 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -31973,6 +31973,13 @@ static void test_combined_clip_and_cull_distances(void) command_list = context.list; queue = context.queue; + if (is_mvk_device(device)) + { + skip("Cull distance not supported on MoltenVK.\n"); + destroy_test_context(&context); + return; + } + input_layout.pInputElementDescs = layout_desc; input_layout.NumElements = ARRAY_SIZE(layout_desc);

1 0

Giovanni Mascellani : tests: Mark clip distance as unsupported on MoltenVK.
by Alexandre Julliard 24 Jan '24

24 Jan '24

Module: vkd3d Branch: master Commit: 66cd2af1887e3abe467f91fd84229a3cb1da122b URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/66cd2af1887e3abe467f91fd84229… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Dec 27 11:59:14 2023 +0100 tests: Mark clip distance as unsupported on MoltenVK. At least for tessellation and geometry shaders. --- tests/d3d12.c | 159 ++++++++++++++++++++++++++++++---------------------------- 1 file changed, 83 insertions(+), 76 deletions(-)

1 0

Giovanni Mascellani : tests: Mark a timestamp query test as buggy on MoltenVK.
by Alexandre Julliard 24 Jan '24

24 Jan '24

Module: vkd3d Branch: master Commit: 5d4edba925537bf0b0b1dbb755439d09219306b9 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/5d4edba925537bf0b0b1dbb755439… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Dec 27 20:07:47 2023 +0100 tests: Mark a timestamp query test as buggy on MoltenVK. The generated Vulkan calls look right and do not trigger any validation error, but the returned timestamp is 0. A valid timestamp is returned if the CopyResource() call is commented, or the second EndQuery() call is moved before CopyResource(), or the first EndQuery() call is commented. I am not seeing any sensible pattern here, so I guess there is just a bug in MoltenVK. --- tests/d3d12.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index fce9d05f..77579c35 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -24848,6 +24848,7 @@ static void test_resolve_non_issued_query_data(void) "Got unexpected timestamp %#"PRIx64".\n", timestamps[0]); ok(!timestamps[1], "Got unexpected timestamp %#"PRIx64".\n", timestamps[1]); ok(!timestamps[2], "Got unexpected timestamp %#"PRIx64".\n", timestamps[2]); + bug_if(is_mvk_device(device)) ok(timestamps[3] != initial_data[3] && timestamps[3] > 0, "Got unexpected timestamp %#"PRIx64".\n", timestamps[3]); release_resource_readback(&rb);

1 0

Giovanni Mascellani : tests: Mark count buffers as buggy on MoltenVK.
by Alexandre Julliard 24 Jan '24

24 Jan '24

Module: vkd3d Branch: master Commit: d304422a345d1437c69a1b4c99a9ed148d564ea3 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/d304422a345d1437c69a1b4c99a9e… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Dec 27 22:36:42 2023 +0100 tests: Mark count buffers as buggy on MoltenVK. They require Vulkan indirect draw count extension. --- tests/d3d12.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 77579c35..73253f54 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -25220,6 +25220,7 @@ static void test_execute_indirect(void) transition_resource_state(command_list, context.render_target, D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + bug_if(is_mvk_device(context.device)) check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xff00ff00, 0); reset_command_list(command_list, context.allocator); @@ -25317,6 +25318,7 @@ static void test_execute_indirect(void) transition_resource_state(command_list, context.render_target, D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + bug_if(is_mvk_device(context.device)) check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xffffff00, 0); ID3D12PipelineState_Release(pipeline_state);

1 0

Henri Verbeet : vkd3d-shader/ir: Get rid of shader_instruction_is_dcl().
by Alexandre Julliard 24 Jan '24

24 Jan '24

Module: vkd3d Branch: master Commit: 365ad56888b25c2fb6252210fa9a3b1e910d32fa URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/365ad56888b25c2fb6252210fa9a3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 22 20:32:55 2024 +0100 vkd3d-shader/ir: Get rid of shader_instruction_is_dcl(). --- libs/vkd3d-shader/ir.c | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index f44d0839..82d93cc3 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -39,10 +39,11 @@ static inline bool shader_register_is_phase_instance_id(const struct vkd3d_shade return reg->type == VKD3DSPR_FORKINSTID || reg->type == VKD3DSPR_JOININSTID; } -static bool shader_instruction_is_dcl(const struct vkd3d_shader_instruction *ins) +static bool vsir_instruction_is_dcl(const struct vkd3d_shader_instruction *instruction) { - return (VKD3DSIH_DCL <= ins->handler_idx && ins->handler_idx <= VKD3DSIH_DCL_VERTICES_OUT) - || ins->handler_idx == VKD3DSIH_HS_DECLS; + enum vkd3d_shader_opcode handler_idx = instruction->handler_idx; + return (VKD3DSIH_DCL <= handler_idx && handler_idx <= VKD3DSIH_DCL_VERTICES_OUT) + || handler_idx == VKD3DSIH_HS_DECLS; } static void vkd3d_shader_instruction_make_nop(struct vkd3d_shader_instruction *ins) @@ -340,7 +341,7 @@ static void flattener_eliminate_phase_related_dcls(struct hull_flattener *normal return; } - if (normaliser->phase == VKD3DSIH_INVALID || shader_instruction_is_dcl(ins)) + if (normaliser->phase == VKD3DSIH_INVALID || vsir_instruction_is_dcl(ins)) return; if (normaliser->phase_body_idx == ~0u) @@ -639,7 +640,7 @@ static enum vkd3d_result instruction_array_normalise_hull_shader_control_point_i normaliser.phase = ins->handler_idx; break; default: - if (shader_instruction_is_dcl(ins)) + if (vsir_instruction_is_dcl(ins)) break; for (j = 0; j < ins->dst_count; ++j) shader_dst_param_normalise_outpointid(&ins->dst[j], &normaliser); @@ -1332,7 +1333,7 @@ static void shader_instruction_normalise_io_params(struct vkd3d_shader_instructi memset(normaliser->pc_dcl_params, 0, sizeof(normaliser->pc_dcl_params)); break; default: - if (shader_instruction_is_dcl(ins)) + if (vsir_instruction_is_dcl(ins)) break; for (i = 0; i < ins->dst_count; ++i) shader_dst_param_io_normalise(&ins->dst[i], false, normaliser); @@ -1972,13 +1973,6 @@ static void VKD3D_PRINTF_FUNC(3, 4) cf_flattener_create_block_name(struct cf_fla flattener->block_names[block_id] = buffer.buffer; } -static bool vsir_instruction_is_dcl(const struct vkd3d_shader_instruction *instruction) -{ - enum vkd3d_shader_opcode handler_idx = instruction->handler_idx; - return (VKD3DSIH_DCL <= handler_idx && handler_idx <= VKD3DSIH_DCL_VERTICES_OUT) - || handler_idx == VKD3DSIH_HS_DECLS; -} - static enum vkd3d_result cf_flattener_iterate_instruction_array(struct cf_flattener *flattener) { bool main_block_open, is_hull_shader, after_declarations_section;

1 0

Henri Verbeet : vkd3d-shader/ir: Use vsir_instruction_is_dcl() in vsir_validate_instruction().
by Alexandre Julliard 24 Jan '24

24 Jan '24

Module: vkd3d Branch: master Commit: eabcaf15fbdff9a003d30559907e5a7373a0dac9 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/eabcaf15fbdff9a003d30559907e5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 22 20:35:28 2024 +0100 vkd3d-shader/ir: Use vsir_instruction_is_dcl() in vsir_validate_instruction(). --- libs/vkd3d-shader/ir.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index 82d93cc3..45ccea45 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -2898,8 +2898,7 @@ static void vsir_validate_instruction(struct validation_context *ctx) * purely structured. In principle we could allow structured * constructs in a block, provided they are confined in a single * block, but need for that hasn't arisen yet, so we don't. */ - if (ctx->cf_type == CF_TYPE_UNKNOWN && !(instruction->handler_idx >= VKD3DSIH_DCL - && instruction->handler_idx <= VKD3DSIH_DCL_VERTICES_OUT)) + if (ctx->cf_type == CF_TYPE_UNKNOWN && !vsir_instruction_is_dcl(instruction)) { if (instruction->handler_idx == VKD3DSIH_LABEL) ctx->cf_type = CF_TYPE_BLOCKS;

1 0

Henri Verbeet : vkd3d: Use debugstr_hresult() in vkd3d_create_compute_pipeline().
by Alexandre Julliard 24 Jan '24

24 Jan '24

Module: vkd3d Branch: master Commit: 9c1e661ae39e9dcf413ebb66bd9a1973d9e63f60 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/9c1e661ae39e9dcf413ebb66bd9a1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 17 17:57:55 2024 +0100 vkd3d: Use debugstr_hresult() in vkd3d_create_compute_pipeline(). --- libs/vkd3d/state.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 12a8cd54..c4afa1ed 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -2272,7 +2272,7 @@ static HRESULT vkd3d_create_compute_pipeline(struct d3d12_device *device, VK_CALL(vkDestroyShaderModule(device->vk_device, pipeline_info.stage.module, NULL)); if (vr < 0) { - WARN("Failed to create Vulkan compute pipeline, hr %#x.\n", hr); + WARN("Failed to create Vulkan compute pipeline, hr %s.\n", debugstr_hresult(hr)); return hresult_from_vk_result(vr); }

1 0