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

Francois Gouget : testbot: Only send an email when a job is really done.
by Alexandre Julliard Aug. 14, 2018

Aug. 14, 2018

Module: tools Branch: master Commit: 891d048b168fcd04b2f5f2984bf65873028d56c0 URL: https://source.winehq.org/git/tools.git/?a=commit;h=891d048b168fcd04b2f5f29… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Aug 10 20:11:20 2018 +0200 testbot: Only send an email when a job is really done. In particular don't send a report if it is requeued or was canceled. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/Engine.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index 464b6db..4478d47 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -307,7 +307,7 @@ sub HandleJobStatusChange($$$) LogMsg "Invalid JobKey $JobKey in jobstatuschange message\n"; } - if ($OldStatus eq "running" && $NewStatus ne "running") + if ($OldStatus eq "running" and $NewStatus !~ /^(?:canceled|queued|running)$/) { my $Pid = fork; if (!defined $Pid)

1 0

Francois Gouget : testbot: Use List::Util::max() instead of reimplementing it.
by Alexandre Julliard Aug. 14, 2018

Aug. 14, 2018

Module: tools Branch: master Commit: 159e4e4294f5f5df7d04e10d65fed8c8567f01fb URL: https://source.winehq.org/git/tools.git/?a=commit;h=159e4e4294f5f5df7d04e10… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Aug 10 20:09:43 2018 +0200 testbot: Use List::Util::max() instead of reimplementing it. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Activity.pm | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/testbot/lib/WineTestBot/Activity.pm b/testbot/lib/WineTestBot/Activity.pm index b3e576a..a8885a4 100644 --- a/testbot/lib/WineTestBot/Activity.pm +++ b/testbot/lib/WineTestBot/Activity.pm @@ -28,7 +28,9 @@ WineTestBot::Activity - reconstruct the TestBot's activity from its history rec use Exporter 'import'; our @EXPORT = qw(GetActivity GetStatistics); +use List::Util qw(max); use Scalar::Util qw(weaken); + use WineTestBot::Config; use WineTestBot::Jobs; use WineTestBot::RecordGroups; @@ -40,12 +42,6 @@ sub _UpdateMin($$) $_[0] = $_[1] if (!defined $_[0] or $_[1] < $_[0]); } -sub max($$) -{ - my ($a, $b) = @_; - return $a > $b ? $a : $b; -} - =pod =over 12 @@ -442,8 +438,7 @@ sub GetStatistics($;$) # Of course this only works for statistics about VM operations and running # tasks (so running.time, reverting.time, etc) not for those about idle or # off VMs (idle.time, etc.). - $ActivitySeconds = $Seconds + 60 + - ($SuiteTimeout > $ReconfigTimeout ? $SuiteTimeout : $ReconfigTimeout); + $ActivitySeconds = $Seconds + 60 + max($SuiteTimeout, $ReconfigTimeout); } my ($Activity, $Counters) = GetActivity($VMs, $ActivitySeconds); $GlobalStats->{"recordgroups.count"} = $Counters->{recordgroups};

1 0

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

Aug. 14, 2018

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 Aug. 14, 2018

Aug. 14, 2018

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 Aug. 14, 2018

Aug. 14, 2018

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: Determine shader output component count based on shader signature.
by Alexandre Julliard Aug. 14, 2018

Aug. 14, 2018

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 Aug. 14, 2018

Aug. 14, 2018

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 : libs/vkd3d-shader: Translate partial derivative instructions.
by Alexandre Julliard Aug. 14, 2018

Aug. 14, 2018

Module: vkd3d Branch: master Commit: b707e36d562982cf8abee1fc00036b3a04be59f5 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=b707e36d562982cf8abee1f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Aug 1 15:34:38 2018 +0200 libs/vkd3d-shader: Translate partial derivative instructions. 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 | 65 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 21d6a1a..797ea1c 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -4954,6 +4954,63 @@ static void vkd3d_dxbc_compiler_emit_control_flow_instruction(struct vkd3d_dxbc_ } } +static void vkd3d_dxbc_compiler_emit_deriv_instruction(struct vkd3d_dxbc_compiler *compiler, + const struct vkd3d_shader_instruction *instruction) +{ + struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + const struct vkd3d_shader_dst_param *dst = instruction->dst; + const struct vkd3d_shader_src_param *src = instruction->src; + const struct instruction_info *info; + uint32_t type_id, src_id, val_id; + unsigned int component_count; + unsigned int i; + + static const struct instruction_info + { + enum VKD3D_SHADER_INSTRUCTION_HANDLER handler_idx; + SpvOp op; + bool needs_derivative_control; + } + deriv_instructions[] = + { + {VKD3DSIH_DSX, SpvOpDPdx}, + {VKD3DSIH_DSX_COARSE, SpvOpDPdxCoarse, true}, + {VKD3DSIH_DSX_FINE, SpvOpDPdxFine, true}, + {VKD3DSIH_DSY, SpvOpDPdy}, + {VKD3DSIH_DSY_COARSE, SpvOpDPdyCoarse, true}, + {VKD3DSIH_DSY_FINE, SpvOpDPdyFine, true}, + }; + + info = NULL; + for (i = 0; i < ARRAY_SIZE(deriv_instructions); ++i) + { + if (deriv_instructions[i].handler_idx == instruction->handler_idx) + { + info = &deriv_instructions[i]; + break; + } + } + if (!info) + { + ERR("Unexpected instruction %#x.\n", instruction->handler_idx); + return; + } + + if (info->needs_derivative_control) + vkd3d_spirv_enable_capability(builder, SpvCapabilityDerivativeControl); + + assert(instruction->dst_count == 1); + assert(instruction->src_count == 1); + + component_count = vkd3d_write_mask_component_count(dst->write_mask); + type_id = vkd3d_spirv_get_type_id(builder, + vkd3d_component_type_from_data_type(dst->reg.data_type), component_count); + + src_id = vkd3d_dxbc_compiler_emit_load_src(compiler, src, dst->write_mask); + val_id = vkd3d_spirv_build_op_tr1(builder, &builder->function_stream, info->op, type_id, src_id); + vkd3d_dxbc_compiler_emit_store_dst(compiler, dst, val_id); +} + struct vkd3d_shader_image { uint32_t id; @@ -6060,6 +6117,14 @@ void vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler case VKD3DSIH_TEXKILL: vkd3d_dxbc_compiler_emit_control_flow_instruction(compiler, instruction); break; + case VKD3DSIH_DSX: + case VKD3DSIH_DSX_COARSE: + case VKD3DSIH_DSX_FINE: + case VKD3DSIH_DSY: + case VKD3DSIH_DSY_COARSE: + case VKD3DSIH_DSY_FINE: + vkd3d_dxbc_compiler_emit_deriv_instruction(compiler, instruction); + break; case VKD3DSIH_LD: vkd3d_dxbc_compiler_emit_ld(compiler, instruction); break;

1 0

Józef Kucia : tests: Add test for creating heaps.
by Alexandre Julliard Aug. 14, 2018

Aug. 14, 2018

Module: vkd3d Branch: master Commit: 2f0d43a75af34f3bc82c8896e0857fc6b531752a URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=2f0d43a75af34f3bc82c889… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Aug 1 15:34:32 2018 +0200 tests: Add test for creating heaps. 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 | 173 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 173 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 83dc8f9..608ff68 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -157,6 +157,53 @@ static void check_interface_(unsigned int line, IUnknown *iface, REFIID riid, bo IUnknown_Release(unk); } +#define check_heap_properties(a, b) check_heap_properties_(__LINE__, a, b) +static void check_heap_properties_(unsigned int line, + const D3D12_HEAP_PROPERTIES *properties, const D3D12_HEAP_PROPERTIES *expected_properties) +{ + D3D12_HEAP_PROPERTIES expected = *expected_properties; + + if (!expected.CreationNodeMask) + expected.CreationNodeMask = 0x1; + if (!expected.VisibleNodeMask) + expected.VisibleNodeMask = 0x1; + + ok_(line)(properties->Type == expected.Type, + "Got type %#x, expected %#x.\n", properties->Type, expected.Type); + ok_(line)(properties->CPUPageProperty == expected.CPUPageProperty, + "Got CPU page properties %#x, expected %#x.\n", + properties->CPUPageProperty, expected.CPUPageProperty); + ok_(line)(properties->MemoryPoolPreference == expected.MemoryPoolPreference, + "Got memory pool %#x, expected %#x.\n", + properties->MemoryPoolPreference, expected.MemoryPoolPreference); + ok_(line)(properties->CreationNodeMask == expected.CreationNodeMask, + "Got creation node mask %#x, expected %#x.\n", + properties->CreationNodeMask, expected.CreationNodeMask); + ok_(line)(properties->VisibleNodeMask == expected.VisibleNodeMask, + "Got visible node mask %#x, expected %#x.\n", + properties->VisibleNodeMask, expected.VisibleNodeMask); +} + +#define check_heap_desc(a, b) check_heap_desc_(__LINE__, a, b) +static void check_heap_desc_(unsigned int line, const D3D12_HEAP_DESC *desc, + const D3D12_HEAP_DESC *expected_desc) +{ + D3D12_HEAP_DESC expected = *expected_desc; + + if (!expected.Alignment) + expected.Alignment = D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT; + + ok_(line)(desc->SizeInBytes == expected.SizeInBytes, + "Got size %"PRIu64", expected %"PRIu64".\n", + desc->SizeInBytes, expected.SizeInBytes); + check_heap_properties_(line, &desc->Properties, &expected.Properties); + ok_(line)(desc->Alignment == expected.Alignment, + "Got alignment %"PRIu64", expected %"PRIu64".\n", + desc->Alignment, expected.Alignment); + ok_(line)(desc->Flags == expected.Flags, + "Got flags %#x, expected %#x.\n", desc->Flags, expected.Flags); +} + static void uav_barrier(ID3D12GraphicsCommandList *list, ID3D12Resource *resource) { D3D12_RESOURCE_BARRIER barrier; @@ -1731,6 +1778,131 @@ static void test_create_committed_resource(void) ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount); } +static void test_create_heap(void) +{ + D3D12_FEATURE_DATA_D3D12_OPTIONS options; + D3D12_HEAP_DESC desc, result_desc; + ID3D12Device *device, *tmp_device; + unsigned int i, j; + ID3D12Heap *heap; + ULONG refcount; + HRESULT hr; + + static const struct + { + UINT64 alignment; + HRESULT expected_hr; + } + tests[] = + { + {D3D12_DEFAULT_MSAA_RESOURCE_PLACEMENT_ALIGNMENT, S_OK}, + {D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT, S_OK}, + {2 * D3D12_DEFAULT_MSAA_RESOURCE_PLACEMENT_ALIGNMENT, E_INVALIDARG}, + {2 * D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT, E_INVALIDARG}, + {D3D12_SMALL_RESOURCE_PLACEMENT_ALIGNMENT, E_INVALIDARG}, + }; + static const struct + { + D3D12_HEAP_FLAGS flags; + const char *name; + } + heap_flags[] = + { + {D3D12_HEAP_FLAG_ALLOW_ONLY_BUFFERS, "buffers"}, + {D3D12_HEAP_FLAG_ALLOW_ONLY_NON_RT_DS_TEXTURES, "textures"}, + {D3D12_HEAP_FLAG_ALLOW_ONLY_RT_DS_TEXTURES, "rt_ds_textures"}, + }; + + if (!(device = create_device())) + { + skip("Failed to create device.\n"); + return; + } + + desc.SizeInBytes = D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT; + memset(&desc.Properties, 0, sizeof(desc.Properties)); + desc.Properties.Type = D3D12_HEAP_TYPE_DEFAULT; + desc.Alignment = 0; + desc.Flags = D3D12_HEAP_FLAG_ALLOW_ONLY_NON_RT_DS_TEXTURES; + hr = ID3D12Device_CreateHeap(device, &desc, &IID_ID3D12Heap, (void **)&heap); + ok(hr == S_OK, "Failed to create heap, hr %#x.\n", hr); + + refcount = get_refcount(device); + ok(refcount == 2, "Got unexpected refcount %u.\n", (unsigned int)refcount); + hr = ID3D12Heap_GetDevice(heap, &IID_ID3D12Device, (void **)&tmp_device); + ok(hr == S_OK, "Failed to get device, hr %#x.\n", hr); + refcount = get_refcount(device); + ok(refcount == 3, "Got unexpected refcount %u.\n", (unsigned int)refcount); + refcount = ID3D12Device_Release(tmp_device); + ok(refcount == 2, "Got unexpected refcount %u.\n", (unsigned int)refcount); + + check_interface(heap, &IID_ID3D12Object, TRUE); + check_interface(heap, &IID_ID3D12DeviceChild, TRUE); + check_interface(heap, &IID_ID3D12Pageable, TRUE); + check_interface(heap, &IID_ID3D12Heap, TRUE); + + result_desc = ID3D12Heap_GetDesc(heap); + check_heap_desc(&result_desc, &desc); + + refcount = ID3D12Heap_Release(heap); + ok(!refcount, "ID3D12Heap has %u references left.\n", (unsigned int)refcount); + + desc.SizeInBytes = 0; + hr = ID3D12Device_CreateHeap(device, &desc, &IID_ID3D12Heap, (void **)&heap); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + desc.SizeInBytes = D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT; + desc.Flags = D3D12_HEAP_FLAG_ALLOW_ONLY_NON_RT_DS_TEXTURES | D3D12_HEAP_FLAG_ALLOW_DISPLAY; + hr = ID3D12Device_CreateHeap(device, &desc, &IID_ID3D12Heap, (void **)&heap); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + desc.Flags = D3D12_HEAP_FLAG_ALLOW_ONLY_RT_DS_TEXTURES | D3D12_HEAP_FLAG_ALLOW_DISPLAY; + hr = ID3D12Device_CreateHeap(device, &desc, &IID_ID3D12Heap, (void **)&heap); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + for (j = 0; j < ARRAY_SIZE(heap_flags); ++j) + { + desc.SizeInBytes = 10 * tests[i].alignment; + desc.Alignment = tests[i].alignment; + desc.Flags = heap_flags[j].flags; + hr = ID3D12Device_CreateHeap(device, &desc, &IID_ID3D12Heap, (void **)&heap); + ok(hr == tests[i].expected_hr, "Test %u, %s: Got hr %#x, expected %#x.\n", + i, heap_flags[j].name, hr, tests[i].expected_hr); + if (FAILED(hr)) + continue; + + result_desc = ID3D12Heap_GetDesc(heap); + check_heap_desc(&result_desc, &desc); + + refcount = ID3D12Heap_Release(heap); + ok(!refcount, "ID3D12Heap has %u references left.\n", (unsigned int)refcount); + } + } + + hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_D3D12_OPTIONS, &options, sizeof(options)); + ok(hr == S_OK, "Failed to check feature support, hr %#x.\n", hr); + if (options.ResourceHeapTier < D3D12_RESOURCE_HEAP_TIER_2) + { + skip("Resource heap tier %u.\n", options.ResourceHeapTier); + goto done; + } + + desc.SizeInBytes = D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT; + desc.Alignment = D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT; + desc.Flags = D3D12_HEAP_FLAG_ALLOW_ALL_BUFFERS_AND_TEXTURES; + hr = ID3D12Device_CreateHeap(device, &desc, &IID_ID3D12Heap, (void **)&heap); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + result_desc = ID3D12Heap_GetDesc(heap); + check_heap_desc(&result_desc, &desc); + refcount = ID3D12Heap_Release(heap); + ok(!refcount, "ID3D12Heap has %u references left.\n", (unsigned int)refcount); + +done: + refcount = ID3D12Device_Release(device); + ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount); +} + static void test_create_descriptor_heap(void) { D3D12_DESCRIPTOR_HEAP_DESC heap_desc; @@ -17652,6 +17824,7 @@ START_TEST(d3d12) run_test(test_create_command_list); run_test(test_create_command_queue); run_test(test_create_committed_resource); + run_test(test_create_heap); run_test(test_create_descriptor_heap); run_test(test_create_sampler); run_test(test_create_unordered_access_view);

1 0

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

Aug. 14, 2018

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