wine-commits August 2018

wine-commits@winehq.org

2 participants
618 discussions

Francois Gouget : testbot/WineRun*: FatalError() does not return so remove the following else.
by Alexandre Julliard 14 Aug '18

14 Aug '18

Module: tools Branch: master Commit: 3ea3377cd37e4e675d8728c3a94ba994f7ccb258 URL: https://source.winehq.org/git/tools.git/?a=commit;h=3ea3377cd37e4e675d8728c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Aug 10 20:09:40 2018 +0200 testbot/WineRun*: FatalError() does not return so remove the following else. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunBuild.pl | 4 ++-- testbot/bin/WineRunReconfig.pl | 4 ++-- testbot/bin/WineRunTask.pl | 4 ++-- testbot/bin/WineRunWineTest.pl | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index 10c0989..47e4b3b 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -316,11 +316,11 @@ if ($VM->Type ne "build") { FatalError("This is not a build VM! (" . $VM->Type . ")\n"); } -elsif (!$Debug and $VM->Status ne "running") +if (!$Debug and $VM->Status ne "running") { FatalError("The VM is not ready for use (" . $VM->Status . ")\n"); } -elsif (!$VM->GetDomain()->IsPoweredOn()) +if (!$VM->GetDomain()->IsPoweredOn()) { FatalError("The VM is not powered on\n"); } diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 83f358c..7278bcd 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -316,11 +316,11 @@ if ($VM->Type ne "build" and $VM->Type ne "wine") { FatalError("This is neither a build nor a Wine VM! (" . $VM->Type . ")\n"); } -elsif (!$Debug and $VM->Status ne "running") +if (!$Debug and $VM->Status ne "running") { FatalError("The VM is not ready for use (" . $VM->Status . ")\n"); } -elsif (!$VM->GetDomain()->IsPoweredOn()) +if (!$VM->GetDomain()->IsPoweredOn()) { FatalError("The VM is not powered on\n"); } diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 974ff3b..204f863 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -372,11 +372,11 @@ if ($VM->Type ne "win32" and $VM->Type ne "win64") { FatalError("This is not a Windows VM! (" . $VM->Type . ")\n"); } -elsif (!$Debug and $VM->Status ne "running") +if (!$Debug and $VM->Status ne "running") { FatalError("The VM is not ready for use (" . $VM->Status . ")\n"); } -elsif (!$VM->GetDomain()->IsPoweredOn()) +if (!$VM->GetDomain()->IsPoweredOn()) { FatalError("The VM is not powered on\n"); } diff --git a/testbot/bin/WineRunWineTest.pl b/testbot/bin/WineRunWineTest.pl index e7aa72e..ee4c853 100755 --- a/testbot/bin/WineRunWineTest.pl +++ b/testbot/bin/WineRunWineTest.pl @@ -373,11 +373,11 @@ if ($VM->Type ne "wine") { FatalError("This is not a Wine VM! (" . $VM->Type . ")\n"); } -elsif (!$Debug and $VM->Status ne "running") +if (!$Debug and $VM->Status ne "running") { FatalError("The VM is not ready for use (" . $VM->Status . ")\n"); } -elsif (!$VM->GetDomain()->IsPoweredOn()) +if (!$VM->GetDomain()->IsPoweredOn()) { FatalError("The VM is not powered on\n"); }

1 0

Francois Gouget : testbot: Add some section headers in PatchUtils.
by Alexandre Julliard 14 Aug '18

14 Aug '18

Module: tools Branch: master Commit: 2bc423008e171bfa98e360d2dfd0a34835c76638 URL: https://source.winehq.org/git/tools.git/?a=commit;h=2bc423008e171bfa98e360d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Aug 10 20:09:19 2018 +0200 testbot: Add some section headers in PatchUtils. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/PatchUtils.pm | 74 +++++++++++++++++++---------------- 1 file changed, 41 insertions(+), 33 deletions(-) diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index be5ce14..d399ced 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -36,39 +36,9 @@ our @EXPORT = qw(GetPatchImpact UpdateWineData); use WineTestBot::Config; -# These paths are too generic to be proof that this is a Wine patch. -my $AmbiguousPathsRe = join('|', - 'Makefile\.in$', - # aclocal.m4 gets special treatment - # configure gets special treatment - # configure.ac gets special treatment - 'include/Makefile\.in$', - 'include/config\.h\.in$', - 'po/', - 'tools/Makefile.in', - 'tools/config.guess', - 'tools/config.sub', - 'tools/install-sh', - 'tools/makedep.c', -); - -# Patches to these paths don't impact the Wine build. So ignore them. -my $IgnoredPathsRe = join('|', - '\.mailmap$', - 'ANNOUNCE$', - 'AUTHORS$', - 'COPYING\.LIB$', - 'LICENSE\$', - 'LICENSE\.OLD$', - 'MAINTAINERS$', - 'README$', - 'VERSION$', - 'documentation/', - 'tools/c2man\.pl$', - 'tools/winapi/', - 'tools/winemaker/', -); - +# +# Source repository maintenance +# =pod =over 12 @@ -140,6 +110,44 @@ sub _LoadWineFiles() } } + +# +# Wine patch analysis +# + +# These paths are too generic to be proof that this is a Wine patch. +my $AmbiguousPathsRe = join('|', + 'Makefile\.in$', + # aclocal.m4 gets special treatment + # configure gets special treatment + # configure.ac gets special treatment + 'include/Makefile\.in$', + 'include/config\.h\.in$', + 'po/', + 'tools/Makefile.in', + 'tools/config.guess', + 'tools/config.sub', + 'tools/install-sh', + 'tools/makedep.c', +); + +# Patches to these paths don't impact the Wine build. So ignore them. +my $IgnoredPathsRe = join('|', + '\.mailmap$', + 'ANNOUNCE$', + 'AUTHORS$', + 'COPYING\.LIB$', + 'LICENSE\$', + 'LICENSE\.OLD$', + 'MAINTAINERS$', + 'README$', + 'VERSION$', + 'documentation/', + 'tools/c2man\.pl$', + 'tools/winapi/', + 'tools/winemaker/', +); + sub _HandleFile($$$) { my ($Impacts, $FilePath, $Change) = @_;

1 0

Francois Gouget : testbot: Remove an unneeded POSIX( qw(:errno_h) import.
by Alexandre Julliard 14 Aug '18

14 Aug '18

Module: tools Branch: master Commit: b3af8fc4f2aad1bb59e66a14a5e9776416418132 URL: https://source.winehq.org/git/tools.git/?a=commit;h=b3af8fc4f2aad1bb59e66a1… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Aug 10 20:09:28 2018 +0200 testbot: Remove an unneeded POSIX( qw(:errno_h) import. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Tasks.pm | 1 - 1 file changed, 1 deletion(-) diff --git a/testbot/lib/WineTestBot/Tasks.pm b/testbot/lib/WineTestBot/Tasks.pm index 54ebf53..70b6205 100644 --- a/testbot/lib/WineTestBot/Tasks.pm +++ b/testbot/lib/WineTestBot/Tasks.pm @@ -67,7 +67,6 @@ Status is set to skipped. use WineTestBot::WineTestBotObjects; our @ISA = qw(WineTestBot::WineTestBotItem); -use POSIX qw(:errno_h); use File::Path; use ObjectModel::BackEnd; use WineTestBot::Config;

1 0

Francois Gouget : testbot: A couple of indentation fixes in WineTestBot:: Log.
by Alexandre Julliard 14 Aug '18

14 Aug '18

Module: tools Branch: master Commit: d01cf933329f5865ed97c204ed368ac8d7e0bf5a URL: https://source.winehq.org/git/tools.git/?a=commit;h=d01cf933329f5865ed97c20… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Aug 10 20:09:25 2018 +0200 testbot: A couple of indentation fixes in WineTestBot::Log. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Log.pm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/testbot/lib/WineTestBot/Log.pm b/testbot/lib/WineTestBot/Log.pm index 2876b99..c39a557 100644 --- a/testbot/lib/WineTestBot/Log.pm +++ b/testbot/lib/WineTestBot/Log.pm @@ -102,15 +102,15 @@ sub Time() sub Elapsed($) { - my ($Start) = @_; - return sprintf("%0.2f", Time()-$Start); + my ($Start) = @_; + return sprintf("%0.2f", Time() - $Start); } sub PrettyElapsed($) { - my ($Start) = @_; - require WineTestBot::Utils; - return WineTestBot::Utils::DurationToString(Time()-$Start); + my ($Start) = @_; + require WineTestBot::Utils; + return WineTestBot::Utils::DurationToString(Time() - $Start); } 1;

1 0

Józef Kucia : tests: Add test for incompletely initialized pixel shader outputs.
by Alexandre Julliard 14 Aug '18

14 Aug '18

Module: vkd3d Branch: master Commit: 185c0b412dc4bb9e32874854deded186336b0289 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=185c0b412dc4bb9e3287485… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Aug 1 15:34:45 2018 +0200 tests: Add test for incompletely initialized pixel shader outputs. 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 | 78 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 78 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index dfc3da7..a018595 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -7512,6 +7512,83 @@ static void test_shader_interstage_interface(void) destroy_test_context(&context); } +static void test_incompletely_initialized_shader_outputs(void) +{ + static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; + ID3D12GraphicsCommandList *command_list; + struct test_context_desc desc; + struct test_context context; + ID3D12CommandQueue *queue; + unsigned int i; + + static const DWORD ps_code[] = + { +#if 0 + float3 color; + + void main(out float4 o : SV_Target) + { + o.xyz = color; + } +#endif + 0x43425844, 0xb5d86526, 0xc6c2455a, 0x8d02fe46, 0x5932818b, 0x00000001, 0x000000bc, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, + 0x0000080f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000044, 0x00000050, 0x00000011, + 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x00102072, 0x00000000, + 0x06000036, 0x00102072, 0x00000000, 0x00208246, 0x00000000, 0x00000000, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE ps = {ps_code, sizeof(ps_code)}; + static struct + { + struct vec4 input; + struct vec4 output; + } + tests[] = + { + {{0.0f, 0.0f, 0.0f, 0.0f}, {0.0f, 0.0f, 0.0f, 0.0f}}, + {{1.0f, 1.0f, 1.0f, 1.0f}, {1.0f, 1.0f, 1.0f, 0.0f}}, + {{1.0f, 2.0f, 3.0f, 4.0f}, {1.0f, 2.0f, 3.0f, 0.0f}}, + }; + + memset(&desc, 0, sizeof(desc)); + desc.rt_format = DXGI_FORMAT_R32G32B32A32_FLOAT; + desc.no_root_signature = true; + if (!init_test_context(&context, &desc)) + return; + command_list = context.list; + queue = context.queue; + + context.root_signature = create_32bit_constants_root_signature(context.device, + 0, 4, D3D12_SHADER_VISIBILITY_PIXEL); + context.pipeline_state = create_pipeline_state(context.device, + context.root_signature, desc.rt_format, NULL, &ps, NULL); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + 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_SetGraphicsRoot32BitConstants(command_list, 0, 4, &tests[i].input, 0); + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 4, 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, &tests[i].output, 0); + + 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); + } + + destroy_test_context(&context); +} + static void check_descriptor_range_(unsigned int line, const D3D12_DESCRIPTOR_RANGE *range, const D3D12_DESCRIPTOR_RANGE *expected_range) { @@ -17992,6 +18069,7 @@ START_TEST(d3d12) run_test(test_shader_instructions); run_test(test_discard_instruction); run_test(test_shader_interstage_interface); + run_test(test_incompletely_initialized_shader_outputs); run_test(test_root_signature_byte_code); run_test(test_cs_constant_buffer); run_test(test_constant_buffer_relative_addressing);

1 0

Józef Kucia : libs/vkd3d-shader: Zero-initialize unused shader output components.
by Alexandre Julliard 14 Aug '18

14 Aug '18

Module: vkd3d Branch: master Commit: da8eb496cf5bfb44745638dea9ff246a2d5eaae2 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=da8eb496cf5bfb44745638d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Aug 1 15:34:44 2018 +0200 libs/vkd3d-shader: Zero-initialize unused shader output components. 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-shader/spirv.c | 67 ++++++++++++++++++++++++++++++++++------------- 1 file changed, 49 insertions(+), 18 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index f3344c4..a5dae19 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1863,7 +1863,7 @@ struct vkd3d_dxbc_compiler bool after_declarations_section; const struct vkd3d_shader_signature *input_signature; const struct vkd3d_shader_signature *output_signature; - struct + struct vkd3d_shader_output_info { uint32_t id; enum vkd3d_component_type component_type; @@ -2129,11 +2129,17 @@ static uint32_t vkd3d_dxbc_compiler_get_constant_float(struct vkd3d_dxbc_compile return vkd3d_dxbc_compiler_get_constant(compiler, VKD3D_TYPE_FLOAT, 1, (uint32_t *)&value); } +static uint32_t vkd3d_dxbc_compiler_get_constant_vector(struct vkd3d_dxbc_compiler *compiler, + enum vkd3d_component_type component_type, unsigned int component_count, uint32_t value) +{ + const uint32_t values[] = {value, value, value, value}; + return vkd3d_dxbc_compiler_get_constant(compiler, component_type, component_count, values); +} + static uint32_t vkd3d_dxbc_compiler_get_constant_uint_vector(struct vkd3d_dxbc_compiler *compiler, uint32_t value, unsigned int component_count) { - const uint32_t values[] = {value, value, value, value}; - return vkd3d_dxbc_compiler_get_constant(compiler, VKD3D_TYPE_UINT, component_count, values); + return vkd3d_dxbc_compiler_get_constant_vector(compiler, VKD3D_TYPE_UINT, component_count, value); } static uint32_t vkd3d_dxbc_compiler_get_constant_float_vector(struct vkd3d_dxbc_compiler *compiler, @@ -6259,14 +6265,50 @@ void vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler } } +static void vkd3d_dxbc_compiler_emit_store_shader_output(struct vkd3d_dxbc_compiler *compiler, + const struct vkd3d_shader_signature_element *output, + const struct vkd3d_shader_output_info *output_info, uint32_t val_id) +{ + struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + uint32_t write_mask, use_mask, uninit_mask, swizzle; + unsigned int component_count; + uint32_t type_id, zero_id; + + write_mask = output->mask & 0xff; + use_mask = (output->mask >> 8) & 0xff; + swizzle = get_shader_output_swizzle(compiler, output->register_index); + val_id = vkd3d_dxbc_compiler_emit_swizzle(compiler, + val_id, VKD3D_TYPE_FLOAT, swizzle, write_mask); + + component_count = vkd3d_write_mask_component_count(write_mask); + + if (output_info->component_type != VKD3D_TYPE_FLOAT) + { + type_id = vkd3d_spirv_get_type_id(builder, output_info->component_type, component_count); + val_id = vkd3d_spirv_build_op_bitcast(builder, type_id, val_id); + } + + uninit_mask = write_mask & use_mask; + if (uninit_mask) + { + /* Set values to 0 for not initialized shader output components. */ + zero_id = vkd3d_dxbc_compiler_get_constant_vector(compiler, + output_info->component_type, VKD3D_VEC4_SIZE, 0); + val_id = vkd3d_dxbc_compiler_emit_vector_shuffle(compiler, + val_id, zero_id, uninit_mask, output_info->component_type, component_count); + } + + vkd3d_spirv_build_op_store(builder, output_info->id, val_id, SpvMemoryAccessMaskNone); +} + static void vkd3d_dxbc_compiler_emit_output_setup_function(struct vkd3d_dxbc_compiler *compiler) { - uint32_t void_id, type_id, ptr_type_id, function_type_id, function_id, val_id; uint32_t param_type_id[MAX_REG_OUTPUT + 1], param_id[MAX_REG_OUTPUT + 1] = {}; const struct vkd3d_shader_signature *signature = compiler->output_signature; + uint32_t void_id, type_id, ptr_type_id, function_type_id, function_id; struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; - DWORD write_mask, swizzle, variable_idx; unsigned int i, count; + DWORD variable_idx; function_id = compiler->output_setup_function_id; @@ -6309,19 +6351,8 @@ static void vkd3d_dxbc_compiler_emit_output_setup_function(struct vkd3d_dxbc_com if (!param_id[variable_idx]) continue; - write_mask = signature->elements[i].mask & 0xff; - swizzle = get_shader_output_swizzle(compiler, signature->elements[i].register_index); - val_id = vkd3d_dxbc_compiler_emit_swizzle(compiler, - param_id[variable_idx], VKD3D_TYPE_FLOAT, swizzle, write_mask); - - if (compiler->output_info[i].component_type != VKD3D_TYPE_FLOAT) - { - type_id = vkd3d_spirv_get_type_id(builder, compiler->output_info[i].component_type, - vkd3d_write_mask_component_count(write_mask)); - val_id = vkd3d_spirv_build_op_bitcast(builder, type_id, val_id); - } - - vkd3d_spirv_build_op_store(builder, compiler->output_info[i].id, val_id, SpvMemoryAccessMaskNone); + vkd3d_dxbc_compiler_emit_store_shader_output(compiler, + &signature->elements[i], &compiler->output_info[i], param_id[variable_idx]); } vkd3d_spirv_build_op_return(&compiler->spirv_builder);

1 0

Józef Kucia : libs/vkd3d-shader: Factor out vkd3d_dxbc_compiler_emit_vector_shuffle().
by Alexandre Julliard 14 Aug '18

14 Aug '18

Module: vkd3d Branch: master Commit: bde5dafe5bbcbc04f100df73ff60d522d5b8a550 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=bde5dafe5bbcbc04f100df7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Aug 1 15:34:43 2018 +0200 libs/vkd3d-shader: Factor out vkd3d_dxbc_compiler_emit_vector_shuffle(). 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-shader/spirv.c | 43 ++++++++++++++++++++++++++++--------------- 1 file changed, 28 insertions(+), 15 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 142993a..f3344c4 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2475,6 +2475,30 @@ static uint32_t vkd3d_dxbc_compiler_emit_swizzle(struct vkd3d_dxbc_compiler *com val_id, VKD3DSP_WRITEMASK_ALL, component_type, swizzle, write_mask); } +static uint32_t vkd3d_dxbc_compiler_emit_vector_shuffle(struct vkd3d_dxbc_compiler *compiler, + uint32_t vector1_id, uint32_t vector2_id, uint32_t write_mask, + enum vkd3d_component_type component_type, unsigned int component_count) +{ + struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + uint32_t components[VKD3D_VEC4_SIZE]; + unsigned int i, component_idx; + uint32_t type_id; + + assert(component_count <= ARRAY_SIZE(components)); + + for (i = 0, component_idx = 0; i < component_count; ++i) + { + if (write_mask & (VKD3DSP_WRITEMASK_0 << i)) + components[i] = VKD3D_VEC4_SIZE + component_idx++; + else + components[i] = i; + } + + type_id = vkd3d_spirv_get_type_id(builder, component_type, component_count); + return vkd3d_spirv_build_op_vector_shuffle(builder, + type_id, vector1_id, vector2_id, components, component_count); +} + static uint32_t vkd3d_dxbc_compiler_emit_load_constant(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_register *reg, DWORD swizzle, DWORD write_mask) { @@ -2700,9 +2724,8 @@ static void vkd3d_dxbc_compiler_emit_store_reg(struct vkd3d_dxbc_compiler *compi const struct vkd3d_shader_register *reg, DWORD write_mask, uint32_t val_id) { struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; - unsigned int i, component_idx, component_count; - uint32_t components[VKD3D_VEC4_SIZE]; - uint32_t reg_id; + uint32_t reg_id, type_id, reg_val_id; + unsigned int component_count; assert(reg->type != VKD3DSPR_IMMCONST); assert(write_mask); @@ -2722,21 +2745,11 @@ static void vkd3d_dxbc_compiler_emit_store_reg(struct vkd3d_dxbc_compiler *compi if (component_count != VKD3D_VEC4_SIZE) { - uint32_t type_id, reg_val_id; - type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_FLOAT, VKD3D_VEC4_SIZE); reg_val_id = vkd3d_spirv_build_op_load(builder, type_id, reg_id, SpvMemoryAccessMaskNone); - for (i = 0, component_idx = 0; i < ARRAY_SIZE(components); ++i) - { - if (write_mask & (VKD3DSP_WRITEMASK_0 << i)) - components[i] = VKD3D_VEC4_SIZE + component_idx++; - else - components[i] = i; - } - - val_id = vkd3d_spirv_build_op_vector_shuffle(builder, - type_id, reg_val_id, val_id, components, ARRAY_SIZE(components)); + val_id = vkd3d_dxbc_compiler_emit_vector_shuffle(compiler, + reg_val_id, val_id, write_mask, VKD3D_TYPE_FLOAT, VKD3D_VEC4_SIZE); } vkd3d_spirv_build_op_store(builder, reg_id, val_id, SpvMemoryAccessMaskNone);

1 0

Józef Kucia : libs/vkd3d-shader: Determine shader output component count based on shader signature.
by Alexandre Julliard 14 Aug '18

14 Aug '18

Module: vkd3d Branch: master Commit: 410e105ac54a1fc9316e84366caaf3f22dff847a URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=410e105ac54a1fc9316e843… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Aug 1 15:34:42 2018 +0200 libs/vkd3d-shader: Determine shader output component count based on shader signature. 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-shader/spirv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 0549fb9..142993a 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -3247,13 +3247,13 @@ 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; - output_component_count = component_count; + output_component_count = vkd3d_write_mask_component_count(signature_element->mask & 0xff); } assert(component_count <= output_component_count); storage_class = SpvStorageClassOutput; id = vkd3d_dxbc_compiler_emit_variable(compiler, &builder->global_stream, - storage_class, component_type, component_count); + storage_class, component_type, output_component_count); vkd3d_spirv_add_iface_variable(builder, id); if (builtin) {

1 0

Józef Kucia : libs/vkd3d-shader: Fix vkd3d_find_signature_element_for_reg().
by Alexandre Julliard 14 Aug '18

14 Aug '18

Module: vkd3d Branch: master Commit: 07ffccd1869ed3f892327315c60f0f9da5112a21 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=07ffccd1869ed3f89232731… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Aug 1 15:34:41 2018 +0200 libs/vkd3d-shader: Fix vkd3d_find_signature_element_for_reg(). The exact match of write masks between a shader signature and dcl_input/dcl_output instructions isn't required. 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-shader/spirv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 26052f2..0549fb9 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -3016,7 +3016,7 @@ static const struct vkd3d_shader_signature_element *vkd3d_find_signature_element for (signature_idx = 0; signature_idx < signature->element_count; ++signature_idx) { if (signature->elements[signature_idx].register_index == reg_idx - && (signature->elements[signature_idx].mask & 0xff) == write_mask) + && (signature->elements[signature_idx].mask & write_mask) == write_mask) { if (signature_element_index) *signature_element_index = signature_idx;

1 0

Józef Kucia : tests: Add tests for indexable temporary registers.
by Alexandre Julliard 14 Aug '18

14 Aug '18

Module: vkd3d Branch: master Commit: 1bb21f0ea0a9b40af98e839e43697a0a57626000 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=1bb21f0ea0a9b40af98e839… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Aug 1 15:34:40 2018 +0200 tests: Add tests for indexable temporary registers. 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 | 85 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 85 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index e61fd3b..dfc3da7 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -5677,6 +5677,76 @@ static void test_shader_instructions(void) 0x0000d000, 0x001020c2, 0x00000000, 0x00208406, 0x00000000, 0x00000000, 0x0100003e, }; static const D3D12_SHADER_BYTECODE ps_sincos = {ps_sincos_code, sizeof(ps_sincos_code)}; + static const DWORD ps_indexable_temp_code[] = + { +#if 0 + float index; + + float4 main() : SV_Target + { + float4 colors[] = + { + float4(1.0f, 0.0f, 0.0f, 1.0f), + float4(0.0f, 1.0f, 0.0f, 1.0f), + float4(0.0f, 0.0f, 1.0f, 1.0f), + }; + return colors[index]; + } +#endif + 0x43425844, 0x82c65bbb, 0x5b713473, 0xa16ebe60, 0xdcc329be, 0x00000001, 0x00000170, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, + 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x000000f8, 0x00000050, 0x0000003e, + 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, + 0x02000068, 0x00000001, 0x04000069, 0x00000000, 0x00000003, 0x00000004, 0x09000036, 0x00203072, + 0x00000000, 0x00000000, 0x00004002, 0x3f800000, 0x00000000, 0x00000000, 0x00000000, 0x09000036, + 0x00203072, 0x00000000, 0x00000001, 0x00004002, 0x00000000, 0x3f800000, 0x00000000, 0x00000000, + 0x09000036, 0x00203072, 0x00000000, 0x00000002, 0x00004002, 0x00000000, 0x00000000, 0x3f800000, + 0x00000000, 0x0600001c, 0x00100012, 0x00000000, 0x0020800a, 0x00000000, 0x00000000, 0x07000036, + 0x00102072, 0x00000000, 0x04203246, 0x00000000, 0x0010000a, 0x00000000, 0x05000036, 0x00102082, + 0x00000000, 0x00004001, 0x3f800000, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE ps_indexable_temp = {ps_indexable_temp_code, sizeof(ps_indexable_temp_code)}; + static const DWORD ps_indexable_temp2_code[] = + { +#if 0 + float index; + + float4 main() : SV_Target + { + uint remap[] = {0, 1, 2, 2, 1, 0, 1, 1, 2, 2}; + float4 colors[] = + { + float4(1.0f, 0.0f, 0.0f, 1.0f), + float4(0.0f, 1.0f, 0.0f, 1.0f), + float4(0.0f, 0.0f, 1.0f, 1.0f), + }; + return colors[remap[index]]; + } +#endif + 0x43425844, 0xcacc5b8f, 0x19bb905e, 0x6af8eae1, 0x80654684, 0x00000001, 0x0000028c, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, + 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000214, 0x00000050, 0x00000085, + 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, + 0x02000068, 0x00000001, 0x04000069, 0x00000000, 0x0000000a, 0x00000004, 0x04000069, 0x00000001, + 0x00000003, 0x00000004, 0x06000036, 0x00203012, 0x00000000, 0x00000000, 0x00004001, 0x00000000, + 0x06000036, 0x00203012, 0x00000000, 0x00000001, 0x00004001, 0x00000001, 0x06000036, 0x00203012, + 0x00000000, 0x00000002, 0x00004001, 0x00000002, 0x06000036, 0x00203012, 0x00000000, 0x00000003, + 0x00004001, 0x00000002, 0x06000036, 0x00203012, 0x00000000, 0x00000004, 0x00004001, 0x00000001, + 0x06000036, 0x00203012, 0x00000000, 0x00000005, 0x00004001, 0x00000000, 0x06000036, 0x00203012, + 0x00000000, 0x00000006, 0x00004001, 0x00000001, 0x06000036, 0x00203012, 0x00000000, 0x00000007, + 0x00004001, 0x00000001, 0x06000036, 0x00203012, 0x00000000, 0x00000008, 0x00004001, 0x00000002, + 0x06000036, 0x00203012, 0x00000000, 0x00000009, 0x00004001, 0x00000002, 0x09000036, 0x00203072, + 0x00000001, 0x00000000, 0x00004002, 0x3f800000, 0x00000000, 0x00000000, 0x00000000, 0x09000036, + 0x00203072, 0x00000001, 0x00000001, 0x00004002, 0x00000000, 0x3f800000, 0x00000000, 0x00000000, + 0x09000036, 0x00203072, 0x00000001, 0x00000002, 0x00004002, 0x00000000, 0x00000000, 0x3f800000, + 0x00000000, 0x0600001c, 0x00100012, 0x00000000, 0x0020800a, 0x00000000, 0x00000000, 0x07000036, + 0x00100012, 0x00000000, 0x0420300a, 0x00000000, 0x0010000a, 0x00000000, 0x07000036, 0x00102072, + 0x00000000, 0x04203246, 0x00000001, 0x0010000a, 0x00000000, 0x05000036, 0x00102082, 0x00000000, + 0x00004001, 0x3f800000, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE ps_indexable_temp2 = {ps_indexable_temp2_code, sizeof(ps_indexable_temp2_code)}; static const DWORD ps_bfi_code[] = { #if 0 @@ -6509,6 +6579,21 @@ static void test_shader_instructions(void) {&ps_sincos, {{ 0.0f, -0.0f, 0.0f, -0.0f}}, {{ 0.0f, -0.0f, 1.0f, 1.0f}}}, {&ps_sincos, {{ 0.0f, -0.0f, M_PI, -M_PI}}, {{ 0.0f, -0.0f, 1.0f, 1.0f}}}, + + {&ps_indexable_temp, {{0.0f}}, {{1.0f, 0.0f, 0.0f, 1.0f}}}, + {&ps_indexable_temp, {{1.0f}}, {{0.0f, 1.0f, 0.0f, 1.0f}}}, + {&ps_indexable_temp, {{2.0f}}, {{0.0f, 0.0f, 1.0f, 1.0f}}}, + + {&ps_indexable_temp2, {{0.0f}}, {{1.0f, 0.0f, 0.0f, 1.0f}}}, + {&ps_indexable_temp2, {{1.0f}}, {{0.0f, 1.0f, 0.0f, 1.0f}}}, + {&ps_indexable_temp2, {{2.0f}}, {{0.0f, 0.0f, 1.0f, 1.0f}}}, + {&ps_indexable_temp2, {{3.0f}}, {{0.0f, 0.0f, 1.0f, 1.0f}}}, + {&ps_indexable_temp2, {{4.0f}}, {{0.0f, 1.0f, 0.0f, 1.0f}}}, + {&ps_indexable_temp2, {{5.0f}}, {{1.0f, 0.0f, 0.0f, 1.0f}}}, + {&ps_indexable_temp2, {{6.0f}}, {{0.0f, 1.0f, 0.0f, 1.0f}}}, + {&ps_indexable_temp2, {{7.0f}}, {{0.0f, 1.0f, 0.0f, 1.0f}}}, + {&ps_indexable_temp2, {{8.0f}}, {{0.0f, 0.0f, 1.0f, 1.0f}}}, + {&ps_indexable_temp2, {{9.0f}}, {{0.0f, 0.0f, 1.0f, 1.0f}}}, }; static const struct

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2018