- Wine-Devel - list.winehq.org

[PATCH vkd3d 3/6] vkd3d-shader: Do not print FIXMEs for VKD3DSUF_ORDER_PRESERVING_COUNTER when generating SPIR-V.
by Henri Verbeet Feb. 19, 2021

Feb. 19, 2021

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index b0b23991..1448d3b4 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -5644,9 +5644,12 @@ static void vkd3d_dxbc_compiler_emit_dcl_resource(struct vkd3d_dxbc_compiler *co const struct vkd3d_shader_instruction *instruction) { const struct vkd3d_shader_semantic *semantic = &instruction->declaration.semantic; + uint32_t flags = instruction->flags; - if (instruction->flags) - FIXME("Unhandled UAV flags %#x.\n", instruction->flags); + /* We don't distinguish between APPEND and COUNTER UAVs. */ + flags &= ~VKD3DSUF_ORDER_PRESERVING_COUNTER; + if (flags) + FIXME("Unhandled UAV flags %#x.\n", flags); vkd3d_dxbc_compiler_emit_resource_declaration(compiler, &semantic->resource, semantic->resource_type, semantic->resource_data_type[0], 0, false); @@ -5656,9 +5659,12 @@ static void vkd3d_dxbc_compiler_emit_dcl_resource_raw(struct vkd3d_dxbc_compiler const struct vkd3d_shader_instruction *instruction) { const struct vkd3d_shader_raw_resource *resource = &instruction->declaration.raw_resource; + uint32_t flags = instruction->flags; - if (instruction->flags) - FIXME("Unhandled UAV flags %#x.\n", instruction->flags); + /* We don't distinguish between APPEND and COUNTER UAVs. */ + flags &= ~VKD3DSUF_ORDER_PRESERVING_COUNTER; + if (flags) + FIXME("Unhandled UAV flags %#x.\n", flags); vkd3d_dxbc_compiler_emit_resource_declaration(compiler, &resource->resource, VKD3D_SHADER_RESOURCE_BUFFER, VKD3D_DATA_UINT, 0, true); @@ -5669,9 +5675,12 @@ static void vkd3d_dxbc_compiler_emit_dcl_resource_structured(struct vkd3d_dxbc_c { const struct vkd3d_shader_structured_resource *resource = &instruction->declaration.structured_resource; unsigned int stride = resource->byte_stride; + uint32_t flags = instruction->flags; - if (instruction->flags) - FIXME("Unhandled UAV flags %#x.\n", instruction->flags); + /* We don't distinguish between APPEND and COUNTER UAVs. */ + flags &= ~VKD3DSUF_ORDER_PRESERVING_COUNTER; + if (flags) + FIXME("Unhandled UAV flags %#x.\n", flags); vkd3d_dxbc_compiler_emit_resource_declaration(compiler, &resource->resource, VKD3D_SHADER_RESOURCE_BUFFER, VKD3D_DATA_UINT, stride / 4, false); -- 2.11.0

1 0

[PATCH vkd3d 2/6] vkd3d-shader: Respect VKD3D_SHADER_COMPILE_OPTION_FORMATTING_INDENT for d3d-asm output.
by Henri Verbeet Feb. 19, 2021

Feb. 19, 2021

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d-shader/trace.c | 39 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index afc81d35..6e1b3a09 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -1682,8 +1682,9 @@ enum vkd3d_result vkd3d_dxbc_binary_to_text(void *data, struct vkd3d_d3d_asm_compiler compiler; enum vkd3d_result result = VKD3D_OK; struct vkd3d_string_buffer *buffer; + unsigned int indent, i; + const char *indent_str; const DWORD *ptr; - unsigned int i; void *code; static const struct vkd3d_d3d_asm_colours no_colours = @@ -1724,6 +1725,10 @@ enum vkd3d_result vkd3d_dxbc_binary_to_text(void *data, compiler.colours = colours; else compiler.colours = no_colours; + if (formatting & VKD3D_SHADER_COMPILE_OPTION_FORMATTING_INDENT) + indent_str = " "; + else + indent_str = ""; buffer = &compiler.buffer; vkd3d_string_buffer_init(buffer); @@ -1734,6 +1739,7 @@ enum vkd3d_result vkd3d_dxbc_binary_to_text(void *data, shader_get_type_prefix(shader_version->type), shader_version->major, shader_version->minor, compiler.colours.reset); + indent = 0; while (!shader_sm4_is_end(data, &ptr)) { struct vkd3d_shader_instruction ins; @@ -1747,7 +1753,38 @@ enum vkd3d_result vkd3d_dxbc_binary_to_text(void *data, continue; } + switch (ins.handler_idx) + { + case VKD3DSIH_ELSE: + case VKD3DSIH_ENDIF: + case VKD3DSIH_ENDLOOP: + case VKD3DSIH_ENDSWITCH: + --indent; + break; + + default: + break; + } + + for (i = 0; i < indent; ++i) + { + vkd3d_string_buffer_printf(buffer, "%s", indent_str); + } + shader_dump_instruction(&compiler, &ins); + + switch (ins.handler_idx) + { + case VKD3DSIH_ELSE: + case VKD3DSIH_IF: + case VKD3DSIH_LOOP: + case VKD3DSIH_SWITCH: + ++indent; + break; + + default: + break; + } } if ((code = vkd3d_malloc(buffer->content_size))) -- 2.11.0

1 0

[PATCH vkd3d 1/6] vkd3d-shader: Add some colour to the d3d-asm version token.
by Henri Verbeet Feb. 19, 2021

Feb. 19, 2021

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d-shader/trace.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index 742fbcec..afc81d35 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -308,6 +308,7 @@ struct vkd3d_d3d_asm_colours const char *opcode; const char *reg; const char *swizzle; + const char *version; const char *write_mask; }; @@ -1692,6 +1693,7 @@ enum vkd3d_result vkd3d_dxbc_binary_to_text(void *data, .opcode = "", .reg = "", .swizzle = "", + .version = "", .write_mask = "", }; static const struct vkd3d_d3d_asm_colours colours = @@ -1701,6 +1703,7 @@ enum vkd3d_result vkd3d_dxbc_binary_to_text(void *data, .opcode = "\x1b[96;1m", .reg = "\x1b[96m", .swizzle = "\x1b[93m", + .version = "\x1b[36m", .write_mask = "\x1b[93m", }; @@ -1727,8 +1730,9 @@ enum vkd3d_result vkd3d_dxbc_binary_to_text(void *data, shader_version = &compiler.shader_version; shader_sm4_read_header(data, &ptr, shader_version); - vkd3d_string_buffer_printf(buffer, "%s%s_%u_%u\n", compiler.colours.reset, - shader_get_type_prefix(shader_version->type), shader_version->major, shader_version->minor); + vkd3d_string_buffer_printf(buffer, "%s%s_%u_%u%s\n", compiler.colours.version, + shader_get_type_prefix(shader_version->type), shader_version->major, + shader_version->minor, compiler.colours.reset); while (!shader_sm4_is_end(data, &ptr)) { -- 2.11.0

1 0

[tools] winetest/gather: Fix test_links() when the source file is unknown.
by Francois Gouget Feb. 19, 2021

Feb. 19, 2021

This can happen if a given test unit (or just its source field) is missing from a set of report summary files (e.g. from ReportTest). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- winetest/gather | 2 ++ 1 file changed, 2 insertions(+) diff --git a/winetest/gather b/winetest/gather index 31ba8fa03..89486974d 100755 --- a/winetest/gather +++ b/winetest/gather @@ -722,6 +722,8 @@ sub test_links($$) { my ($testname, $group) = @_; my $source = $alltests{$testname}; + return "<td></td>" if (!defined $source); + return "<td class=\"links\"><a href=\"$gitweb/?a=history;f=$source;hb=$build\" title=\"$source change history\">history</a>" . " | <a href=\"$gitweb/?a=blob;f=$source;hb=$build\" title=\"$source source code\">source</a>" . (defined($group) ? " | <a href=\"index.html#$testname\" title=\"summary of $testname results across platforms\">summary</a>" : "") . -- 2.20.1

1 0

[tools] winetest/dissect: Fix the 'failed' summary lines.
by Francois Gouget Feb. 19, 2021

Feb. 19, 2021

The source must always be in the 8th field, not the 6th! So put placeholders to replace the failure and skip counts. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This bug causes 'uninitialized value' errors in gather when it fails to find a source file to link to. --- winetest/dissect | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index 73eae4b8c..32c4a9269 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -798,7 +798,7 @@ while ($line = <IN>) { if ($l_rc == 258) { add_test_line("end", "Test failed: timed out"); - $summary = "failed 258"; + $summary = "failed 258 - -"; $extra_failures++; $broken = 1; } @@ -808,7 +808,7 @@ while ($line = <IN>) { if ($l_rc & 0xc0000000) { add_test_line("end", sprintf("Test failed: crash (%08x)", $l_rc & 0xffffffff)); - $summary = "failed crash"; + $summary = "failed crash - -"; $extra_failures++; $broken = 1; } @@ -821,7 +821,7 @@ while ($line = <IN>) { elsif ($l_rc & 0xc0000000) { add_test_line("end", sprintf("Test failed: crash (%08x)", $l_rc & 0xffffffff)); - $summary = "failed crash"; + $summary = "failed crash - -"; $extra_failures++; $broken = 1; } -- 2.20.1

1 0

[PATCH v2] msdrm: Add stub DRMRegisterContent function.
by Vijay Kiran Kamuju Feb. 19, 2021

Feb. 19, 2021

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50595 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH resend] msdrm: Add stub DRMRegisterContent function.
by Vijay Kiran Kamuju Feb. 19, 2021

Feb. 19, 2021

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50595 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

2 1

[PATCH resend] uiautomationcore: Add stub UiaNodeFromFocus function
by Vijay Kiran Kamuju Feb. 19, 2021

Feb. 19, 2021

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50576 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH v3 7/7] wldap32: supply our username as SASL_CB_AUTHNAME too
by Damjan Jovanovic Feb. 19, 2021

Feb. 19, 2021

Try 3 gives up the attempt to provide credentials in an authentication method specific form, and just provides our username as the authentication username (SASL_CB_AUTHNAME) too. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50572 Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/wldap32/bind.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

3 7

[PATCH] mf/tests: Add a sample copier test for sample fields handling.
by Nikolay Sivov Feb. 19, 2021

Feb. 19, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/tests/mf.c | 56 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 54 insertions(+), 2 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 11eff78b645..65f2b40faa9 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -4918,20 +4918,51 @@ static void test_sample_copier(void) IMFTransform_Release(copier); } +struct sample_metadata +{ + unsigned int flags; + LONGLONG duration; + LONGLONG time; +}; + static void sample_copier_process(IMFTransform *copier, IMFMediaBuffer *input_buffer, - IMFMediaBuffer *output_buffer) + IMFMediaBuffer *output_buffer, const struct sample_metadata *md) { + static const struct sample_metadata zero_md = { 0, ~0u, ~0u }; IMFSample *input_sample, *output_sample; MFT_OUTPUT_DATA_BUFFER buffer; + unsigned int flags; + LONGLONG time; DWORD status; HRESULT hr; hr = MFCreateSample(&input_sample); ok(hr == S_OK, "Failed to create a sample, hr %#x.\n", hr); + if (md) + { + hr = IMFSample_SetSampleFlags(input_sample, md->flags); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFSample_SetSampleTime(input_sample, md->time); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFSample_SetSampleDuration(input_sample, md->duration); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + } + hr = MFCreateSample(&output_sample); ok(hr == S_OK, "Failed to create a sample, hr %#x.\n", hr); + hr = IMFSample_SetSampleFlags(output_sample, ~0u); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFSample_SetSampleTime(output_sample, ~0u); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFSample_SetSampleDuration(output_sample, ~0u); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFSample_AddBuffer(input_sample, input_buffer); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); @@ -4947,6 +4978,18 @@ static void sample_copier_process(IMFTransform *copier, IMFMediaBuffer *input_bu hr = IMFTransform_ProcessOutput(copier, 0, 1, &buffer, &status); ok(hr == S_OK, "Failed to get output, hr %#x.\n", hr); + if (!md) md = &zero_md; + + hr = IMFSample_GetSampleFlags(output_sample, &flags); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(md->flags == flags, "Unexpected flags.\n"); + hr = IMFSample_GetSampleTime(output_sample, &time); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(md->time == time, "Unexpected time.\n"); + hr = IMFSample_GetSampleDuration(output_sample, &time); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(md->duration == time, "Unexpected duration.\n"); + IMFSample_Release(input_sample); IMFSample_Release(output_sample); } @@ -4955,6 +4998,7 @@ static void test_sample_copier_output_processing(void) { IMFMediaBuffer *input_buffer, *output_buffer; MFT_OUTPUT_STREAM_INFO output_info; + struct sample_metadata md; IMFMediaType *mediatype; IMFTransform *copier; DWORD max_length; @@ -5007,7 +5051,7 @@ static void test_sample_copier_output_processing(void) hr = IMFMediaBuffer_SetCurrentLength(input_buffer, 4); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - sample_copier_process(copier, input_buffer, output_buffer); + sample_copier_process(copier, input_buffer, output_buffer, NULL); hr = IMFMediaBuffer_Lock(output_buffer, &ptr, &max_length, NULL); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); @@ -5016,6 +5060,14 @@ static void test_sample_copier_output_processing(void) hr = IMFMediaBuffer_Unlock(output_buffer); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + md.flags = 123; + md.time = 10; + md.duration = 2; + sample_copier_process(copier, input_buffer, output_buffer, &md); + + IMFMediaBuffer_Release(input_buffer); + IMFMediaBuffer_Release(output_buffer); + IMFMediaType_Release(mediatype); IMFTransform_Release(copier); } -- 2.30.0

2 2