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

Francois Gouget : testbot/build: Log the wine commit id the patch is tested on.
by Alexandre Julliard 14 Aug '18

14 Aug '18

Module: tools Branch: master Commit: 0495d06ffd5a8a1b2d4292e9aaf83bf23ad5edd5 URL: https://source.winehq.org/git/tools.git/?a=commit;h=0495d06ffd5a8a1b2d4292e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Aug 10 20:11:08 2018 +0200 testbot/build: Log the wine commit id the patch is tested on. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/build/Build.pl | 4 +++- testbot/bin/build/WineTest.pl | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl index da14583..920fc82 100755 --- a/testbot/bin/build/Build.pl +++ b/testbot/bin/build/Build.pl @@ -93,7 +93,9 @@ sub ApplyPatch($) my ($PatchFile) = @_; InfoMsg "Applying patch\n"; - system("cd '$DataDir/wine' && set -x && ". + system("cd '$DataDir/wine' && ". + "echo wine:HEAD=`git rev-parse HEAD` && ". + "set -x && ". "git apply --verbose ". ShQuote($PatchFile) ." && ". "git add -A"); if ($? != 0) diff --git a/testbot/bin/build/WineTest.pl b/testbot/bin/build/WineTest.pl index 5ef8e61..1fa59c2 100755 --- a/testbot/bin/build/WineTest.pl +++ b/testbot/bin/build/WineTest.pl @@ -90,7 +90,9 @@ sub ApplyPatch($) my ($PatchFile) = @_; InfoMsg "Applying patch\n"; - system("cd '$DataDir/wine' && set -x && ". + system("cd '$DataDir/wine' && ". + "echo wine:HEAD=`git rev-parse HEAD` && ". + "set -x && ". "git apply --verbose ". ShQuote($PatchFile) ." && ". "git add -A"); if ($? != 0)

1 0

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

14 Aug '18

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: 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

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

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

14 Aug '18

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: Add support for more formats.
by Alexandre Julliard 14 Aug '18

14 Aug '18

Module: vkd3d Branch: master Commit: f883c265244fac840834e4b306d0c355ad5908fc URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=f883c265244fac840834e4b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Aug 1 15:34:33 2018 +0200 libs/vkd3d: Add support for more formats. 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/utils.c | 103 ++++++++++++++++++++++++++++------------------------- 1 file changed, 54 insertions(+), 49 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=f883c265244fac84083…

1 0

Józef Kucia : libs/vkd3d-shader: Translate round_ne instructions.
by Alexandre Julliard 14 Aug '18

14 Aug '18

Module: vkd3d Branch: master Commit: 92f3d33e15ef711f3aad55b66554fb55fd86c4dd URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=92f3d33e15ef711f3aad55b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Aug 1 15:34:34 2018 +0200 libs/vkd3d-shader: Translate round_ne 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 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index d236db9..a0f084c 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -4063,6 +4063,7 @@ static enum GLSLstd450 vkd3d_dxbc_compiler_map_ext_glsl_instruction( {VKD3DSIH_MAD, GLSLstd450Fma}, {VKD3DSIH_MAX, GLSLstd450NMax}, {VKD3DSIH_MIN, GLSLstd450NMin}, + {VKD3DSIH_ROUND_NE, GLSLstd450RoundEven}, {VKD3DSIH_ROUND_NI, GLSLstd450Floor}, {VKD3DSIH_ROUND_PI, GLSLstd450Ceil}, {VKD3DSIH_ROUND_Z, GLSLstd450Trunc}, @@ -5932,6 +5933,7 @@ void vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler case VKD3DSIH_MAD: case VKD3DSIH_MAX: case VKD3DSIH_MIN: + case VKD3DSIH_ROUND_NE: case VKD3DSIH_ROUND_NI: case VKD3DSIH_ROUND_PI: case VKD3DSIH_ROUND_Z:

1 0

Józef Kucia : tests: Add test for round_ne instruction.
by Alexandre Julliard 14 Aug '18

14 Aug '18

Module: vkd3d Branch: master Commit: ae1f96cc1f315b4cc68dae44c5bb9123ea3313d9 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=ae1f96cc1f315b4cc68dae4… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Aug 1 15:34:35 2018 +0200 tests: Add test for round_ne instruction. 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 | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 608ff68..83ec6c8 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -5540,6 +5540,24 @@ static void test_shader_instructions(void) 0x00000000, 0x00000000, 0x05000036, 0x00102082, 0x00000000, 0x00004001, 0x00000000, 0x0100003e, }; static const D3D12_SHADER_BYTECODE ps_round = {ps_round_code, sizeof(ps_round_code)}; + static const DWORD ps_round_ne_code[] = + { +#if 0 + float4 src0; + + void main(out float4 dst : SV_Target) + { + dst = round(src0); + } +#endif + 0x43425844, 0xa2be1ad3, 0xf1389007, 0xc8221829, 0xcbef8ed0, 0x00000001, 0x000000bc, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, + 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000044, 0x00000050, 0x00000011, + 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, + 0x06000040, 0x001020f2, 0x00000000, 0x00208e46, 0x00000000, 0x00000000, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE ps_round_ne = {ps_round_ne_code, sizeof(ps_round_ne_code)}; static const DWORD ps_frc_code[] = { #if 0 @@ -6427,6 +6445,16 @@ static void test_shader_instructions(void) {&ps_round, {{ INFINITY}}, {{ INFINITY, INFINITY, INFINITY}}}, {&ps_round, {{-INFINITY}}, {{-INFINITY, -INFINITY, -INFINITY}}}, + {&ps_round_ne, {{ 0.0f, -0.0f, 0.5f, -0.5f}}, {{ 0.0f, -0.0f, 0.0f, -0.0f}}}, + {&ps_round_ne, {{ 2.0f, 3.0f, 4.0f, 5.0f}}, {{ 2.0f, 3.0f, 4.0f, 5.0f}}}, + {&ps_round_ne, {{ 2.4f, 3.4f, 4.4f, 5.4f}}, {{ 2.0f, 3.0f, 4.0f, 5.0f}}}, + {&ps_round_ne, {{ 2.5f, 3.5f, 4.5f, 5.5f}}, {{ 2.0f, 4.0f, 4.0f, 6.0f}}}, + {&ps_round_ne, {{ 2.6f, 3.6f, 4.6f, 5.6f}}, {{ 3.0f, 4.0f, 5.0f, 6.0f}}}, + {&ps_round_ne, {{-2.5f, -3.5f, -4.5f, -5.5f}}, {{-2.0f, -4.0f, -4.0f, -6.0f}}}, + {&ps_round_ne, {{-2.4f, -3.4f, -4.4f, -5.4f}}, {{-2.0f, -3.0f, -4.0f, -5.0f}}}, + {&ps_round_ne, {{ INFINITY}}, {{ INFINITY}}}, + {&ps_round_ne, {{-INFINITY}}, {{-INFINITY}}}, + {&ps_frc, {{ 0.0f}}, {{0.0f, 0.0f}}}, {&ps_frc, {{-0.0f}}, {{0.0f, 0.0f}}}, {&ps_frc, {{ 1.0f}}, {{0.0f, 0.0f}}},

1 0

Józef Kucia : libs/vkd3d-shader: Translate sincos instructions.
by Alexandre Julliard 14 Aug '18

14 Aug '18

Module: vkd3d Branch: master Commit: b14bb73c5b1770b43e199b2fca2771a89263ea14 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=b14bb73c5b1770b43e199b2… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Aug 1 15:34:36 2018 +0200 libs/vkd3d-shader: Translate sincos 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 | 68 ++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 65 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index a0f084c..21d6a1a 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1427,12 +1427,29 @@ static void vkd3d_spirv_build_op_memory_barrier(struct vkd3d_spirv_builder *buil SpvOpMemoryBarrier, memory_id, memory_semantics_id); } +static uint32_t vkd3d_spirv_build_op_glsl_std450_tr1(struct vkd3d_spirv_builder *builder, + enum GLSLstd450 op, uint32_t result_type, uint32_t operand) +{ + uint32_t id = vkd3d_spirv_get_glsl_std450_instr_set(builder); + return vkd3d_spirv_build_op_ext_inst(builder, result_type, id, op, &operand, 1); +} + static uint32_t vkd3d_spirv_build_op_glsl_std450_fabs(struct vkd3d_spirv_builder *builder, uint32_t result_type, uint32_t operand) { - uint32_t glsl_std450_id = vkd3d_spirv_get_glsl_std450_instr_set(builder); - return vkd3d_spirv_build_op_ext_inst(builder, result_type, glsl_std450_id, - GLSLstd450FAbs, &operand, 1); + return vkd3d_spirv_build_op_glsl_std450_tr1(builder, GLSLstd450FAbs, result_type, operand); +} + +static uint32_t vkd3d_spirv_build_op_glsl_std450_sin(struct vkd3d_spirv_builder *builder, + uint32_t result_type, uint32_t operand) +{ + return vkd3d_spirv_build_op_glsl_std450_tr1(builder, GLSLstd450Sin, result_type, operand); +} + +static uint32_t vkd3d_spirv_build_op_glsl_std450_cos(struct vkd3d_spirv_builder *builder, + uint32_t result_type, uint32_t operand) +{ + return vkd3d_spirv_build_op_glsl_std450_tr1(builder, GLSLstd450Cos, result_type, operand); } static uint32_t vkd3d_spirv_build_op_glsl_std450_nclamp(struct vkd3d_spirv_builder *builder, @@ -4284,6 +4301,48 @@ static void vkd3d_dxbc_compiler_emit_rcp(struct vkd3d_dxbc_compiler *compiler, vkd3d_dxbc_compiler_emit_store_dst(compiler, dst, val_id); } +static void vkd3d_dxbc_compiler_emit_sincos(struct vkd3d_dxbc_compiler *compiler, + const struct vkd3d_shader_instruction *instruction) +{ + const struct vkd3d_shader_dst_param *dst_sin = &instruction->dst[0]; + const struct vkd3d_shader_dst_param *dst_cos = &instruction->dst[1]; + struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + const struct vkd3d_shader_src_param *src = instruction->src; + uint32_t type_id, src_id, sin_id = 0, cos_id = 0; + unsigned int component_count; + + if (dst_sin->reg.type != VKD3DSPR_NULL) + { + component_count = vkd3d_write_mask_component_count(dst_sin->write_mask); + type_id = vkd3d_spirv_get_type_id(builder, + vkd3d_component_type_from_data_type(dst_sin->reg.data_type), component_count); + + src_id = vkd3d_dxbc_compiler_emit_load_src(compiler, src, dst_sin->write_mask); + + sin_id = vkd3d_spirv_build_op_glsl_std450_sin(builder, type_id, src_id); + } + + if (dst_cos->reg.type != VKD3DSPR_NULL) + { + if (dst_sin->reg.type == VKD3DSPR_NULL || dst_cos->write_mask != dst_sin->write_mask) + { + component_count = vkd3d_write_mask_component_count(dst_cos->write_mask); + type_id = vkd3d_spirv_get_type_id(builder, + vkd3d_component_type_from_data_type(dst_cos->reg.data_type), component_count); + + src_id = vkd3d_dxbc_compiler_emit_load_src(compiler, src, dst_cos->write_mask); + } + + cos_id = vkd3d_spirv_build_op_glsl_std450_cos(builder, type_id, src_id); + } + + if (sin_id) + vkd3d_dxbc_compiler_emit_store_dst(compiler, dst_sin, sin_id); + + if (cos_id) + vkd3d_dxbc_compiler_emit_store_dst(compiler, dst_cos, cos_id); +} + static void vkd3d_dxbc_compiler_emit_imul(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_instruction *instruction) { @@ -5951,6 +6010,9 @@ void vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler case VKD3DSIH_RCP: vkd3d_dxbc_compiler_emit_rcp(compiler, instruction); break; + case VKD3DSIH_SINCOS: + vkd3d_dxbc_compiler_emit_sincos(compiler, instruction); + break; case VKD3DSIH_IMUL: vkd3d_dxbc_compiler_emit_imul(compiler, instruction); break;

1 0

Józef Kucia : tests: Add test for sincos instruction.
by Alexandre Julliard 14 Aug '18

14 Aug '18

Module: vkd3d Branch: master Commit: b3f28cbfdef4ec21271424893162c95a2831a6e9 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=b3f28cbfdef4ec212714248… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Aug 1 15:34:37 2018 +0200 tests: Add test for sincos instruction. 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 | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 83ec6c8..e61fd3b 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -5658,6 +5658,25 @@ static void test_shader_instructions(void) 0x06000081, 0x001020f2, 0x00000000, 0x00208e46, 0x00000000, 0x00000000, 0x0100003e, }; static const D3D12_SHADER_BYTECODE ps_rcp_vector = {ps_rcp_vector_code, sizeof(ps_rcp_vector_code)}; + static const DWORD ps_sincos_code[] = + { +#if 0 + float2 src0; + + void main(out float4 dst : SV_Target) + { + sincos(src0, dst.xy, dst.zw); + } +#endif + 0x43425844, 0xb47a22ec, 0xdb165106, 0xeee971d7, 0x8836fcc0, 0x00000001, 0x000000dc, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, + 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000064, 0x00000050, 0x00000019, + 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, + 0x0700004d, 0x00102032, 0x00000000, 0x0000d000, 0x00208046, 0x00000000, 0x00000000, 0x0700004d, + 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_bfi_code[] = { #if 0 @@ -6487,6 +6506,9 @@ static void test_shader_instructions(void) {&ps_rcp, {{ 2.0f}}, {{ 0.5f}}}, {&ps_rcp_vector, {{-1.0f, 1.0f, 4.0f, -4.0f}}, {{-1.0f, 1.0f, 0.25f, -0.25f}}}, + + {&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}}}, }; static const struct

1 0