June 2022 - Wine-Devel - list.winehq.org

[PATCH vkd3d 1/7] tests: Test dot() intrinsic.

by Giovanni Mascellani

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- Makefile.am | 1 + tests/hlsl-dot.shader_test | 94 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 95 insertions(+) create mode 100644 tests/hlsl-dot.shader_test diff --git a/Makefile.am b/Makefile.am index ad6a0a41..400e79e1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -68,6 +68,7 @@ vkd3d_shader_tests = \ tests/hlsl-clamp.shader_test \ tests/hlsl-comma.shader_test \ tests/hlsl-cross.shader_test \ + tests/hlsl-dot.shader_test \ tests/hlsl-duplicate-modifiers.shader_test \ tests/hlsl-for.shader_test \ tests/hlsl-function.shader_test \ diff --git a/tests/hlsl-dot.shader_test b/tests/hlsl-dot.shader_test new file mode 100644 index 00000000..123ee73e --- /dev/null +++ b/tests/hlsl-dot.shader_test @@ -0,0 +1,94 @@ +[pixel shader] +uniform float4 x; +uniform float4 y; + +float4 main() : SV_TARGET +{ + return dot(x, y); +} + +[test] +uniform 0 float4 2.0 3.0 4.0 5.0 +uniform 4 float4 10.0 11.0 12.0 13.0 +todo draw quad +probe all rgba (166.0, 166.0, 166.0, 166.0) + +[pixel shader] +uniform float2 x; +uniform float4 y; + +float4 main() : SV_TARGET +{ + return dot(x, y); +} + +[test] +uniform 0 float4 2.0 3.0 0.0 0.0 +uniform 4 float4 10.0 11.0 12.0 13.0 +todo draw quad +probe all rgba (53.0, 53.0, 53.0, 53.0) + +[pixel shader] +uniform float x; +uniform float4 y; + +float4 main() : SV_TARGET +{ + return dot(x, y); +} + +[test] +uniform 0 float4 2.0 0.0 0.0 0.0 +uniform 4 float4 10.0 11.0 12.0 13.0 +todo draw quad +probe all rgba (92.0, 92.0, 92.0, 92.0) + +[pixel shader] +uniform float x; +uniform float y; + +float4 main() : SV_TARGET +{ + return dot(x, y); +} + +[test] +uniform 0 float4 2.0 3.0 0.0 0.0 +todo draw quad +probe all rgba (6.0, 6.0, 6.0, 6.0) + +[pixel shader fail] +uniform float1x1 x; +uniform float4 y; + +float4 main() : SV_TARGET +{ + return dot(x, y); +} + +[pixel shader fail] +uniform float1x4 x; +uniform float4 y; + +float4 main() : SV_TARGET +{ + return dot(x, y); +} + +[pixel shader fail] +uniform float4x1 x; +uniform float4 y; + +float4 main() : SV_TARGET +{ + return dot(x, y); +} + +[pixel shader fail] +uniform float4x4 x; +uniform float4 y; + +float4 main() : SV_TARGET +{ + return dot(x, y); +} -- 2.36.1

June 23, 2022

Re: [PATCH 0/1] MR296: nsiproxy.sys: Add static ARP entries which are always present on Windows.

by Huw Davies (＠huw)

On Thu Jun 23 06:36:08 2022 +0000, Huw Davies wrote: > Rather than using `if_nametoindex()` please use `nsi_enumerate_all()` to > get the `NSI_NDIS_IFINFO_TABLE` table. Also, let's add a comment above the start of this block explaining what we're doing. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/296#note_2530

June 23, 2022

Re: [PATCH 0/1] MR296: nsiproxy.sys: Add static ARP entries which are always present on Windows.

by Huw Davies (＠huw)

Huw Davies (@huw) commented about dlls/nsiproxy.sys/ip.c: > + if (num <= *count) > + { > + entry.addr.s_addr = inet_addr( "239.255.255.250" ); > + ipv4_neighbour_fill_entry( &entry, key_data, rw_data, dynamic_data, static_data ); > + > + if (key_data) key_data = (BYTE *)key_data + key_size; > + if (rw_data) rw_data = (BYTE *)rw_data + rw_size; > + if (dynamic_data) dynamic_data = (BYTE *)dynamic_data + dynamic_size; > + if (static_data) static_data = (BYTE *)static_data + static_size; > + } > + num++; > + } > + if_freenameindex( iface_indices ); > + } > + > if (!want_data || num <= *count) *count = num; macOS already has `239.255.255.250` on interfaces that up, so this ends up duplicating that entry. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/296#note_2529

June 23, 2022

Re: [PATCH 0/1] MR296: nsiproxy.sys: Add static ARP entries which are always present on Windows.

by Huw Davies (＠huw)

Huw Davies (@huw) commented about dlls/nsiproxy.sys/ip.c: > + if (rw_data) rw_data = (BYTE *)rw_data + rw_size; > + if (dynamic_data) dynamic_data = (BYTE *)dynamic_data + dynamic_size; > + if (static_data) static_data = (BYTE *)static_data + static_size; > + } > + num++; > + if (num <= *count) > + { > + entry.addr.s_addr = inet_addr( "239.255.255.250" ); > + ipv4_neighbour_fill_entry( &entry, key_data, rw_data, dynamic_data, static_data ); > + > + if (key_data) key_data = (BYTE *)key_data + key_size; > + if (rw_data) rw_data = (BYTE *)rw_data + rw_size; > + if (dynamic_data) dynamic_data = (BYTE *)dynamic_data + dynamic_size; > + if (static_data) static_data = (BYTE *)static_data + static_size; > + } > + num++; Adding the second entry looks a lot like the first. It should be possible to write this as a loop. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/296#note_2528

June 23, 2022

Re: [PATCH 0/1] MR296: nsiproxy.sys: Add static ARP entries which are always present on Windows.

by Huw Davies (＠huw)

Huw Davies (@huw) commented about dlls/nsiproxy.sys/ip.c: > return STATUS_NOT_IMPLEMENTED; > #endif > > + if (!want_data || num <= *count) > + { > + iface_indices = if_nameindex(); > + for (iface = iface_indices; iface->if_index; iface++) > + { > + if (num <= *count) > + { > + memset( &entry, 0, sizeof(entry) ); > + entry.if_index = iface->if_index; > + convert_index_to_luid( entry.if_index, &entry.luid ); > + entry.state = NlnsPermanent; > + entry.addr.s_addr = inet_addr( "224.0.0.22" ); Let's not use `inet_addr()`. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/296#note_2527

June 23, 2022

Re: [PATCH 0/1] MR296: nsiproxy.sys: Add static ARP entries which are always present on Windows.

by Huw Davies (＠huw)

Huw Davies (@huw) commented about dlls/nsiproxy.sys/ip.c: > return STATUS_NOT_IMPLEMENTED; > #endif > > + if (!want_data || num <= *count) > + { > + iface_indices = if_nameindex(); Rather than using `if_nametoindex()` please use `nsi_enumerate_all()` to get the `NSI_NDIS_IFINFO_TABLE` table. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/296#note_2526

June 23, 2022

Re: [PATCH 0/1] MR296: nsiproxy.sys: Add static ARP entries which are always present on Windows.

by Huw Davies (＠huw)

Huw Davies (@huw) commented about dlls/nsi/tests/nsi.c: > ok( key4->luid.Value == row->InterfaceLuid.Value, "%s vs %s\n", wine_dbgstr_longlong( key4->luid.Value ), > wine_dbgstr_longlong( row->InterfaceLuid.Value ) ); > ok( key4->luid2.Value == row->InterfaceLuid.Value, "mismatch\n" ); > + if (key4->addr.s_addr == 0x160000e0 || key4->addr.s_addr == 0xfaffffef) > + { > + ok( dyn->state == NlnsPermanent, "got state %d.\n", dyn->state ); > + ok( !dyn->flags.is_router, "is_router is set.\n" ); > + ok( !dyn->flags.is_unreachable, "is_unreachable is set.\n" ); > + } Please test these in the iphlpapi tests - perhaps by calling `GetIpNetTable2()`. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/296#note_2525

June 23, 2022

Re: [PATCH 0/1] MR296: nsiproxy.sys: Add static ARP entries which are always present on Windows.

by Huw Davies (＠huw)

Huw Davies (@huw) commented about dlls/iphlpapi/tests/iphlpapi.c: > Please add more of an explanation to the commit message, not just a bug url. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/296#note_2524

June 23, 2022

Re: [PATCH 0/1] MR296: nsiproxy.sys: Add static ARP entries which are always present on Windows.

by Huw Davies (＠huw)

Huw Davies (@huw) commented about dlls/iphlpapi/tests/iphlpapi.c: > > static void testGetIpNetTable(void) > { > - DWORD apiReturn; > + const DWORD static_addr1 = 0x160000e0, static_addr2 = 0xfaffffef; Could you use a macro or something to generate these from decimal? Also please use more meaningful variable names based on the addresses' uses (see https://en.wikipedia.org/wiki/Multicast_address#Notable_IPv4_multicast_addr…) -- https://gitlab.winehq.org/wine/wine/-/merge_requests/296#note_2523

June 23, 2022

Re: [PATCH v2] ntdll: Add RtlGetDeviceFamilyInfoEnum and RtlConvertDeviceFamilyInfoToString

by Marvin

Hi, It looks like your patch introduced the new failures shown below. Please investigate and fix them before resubmitting your patch. If they are not new, fixing them anyway would help a lot. Otherwise please ask for the known failures list to be updated. The tests also ran into some preexisting test failures. If you know how to fix them that would be helpful. See the TestBot job for the details: The full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=117459 Your paranoid android. === w10pro64_en_AE_u8 (testbot log) === WineRunTask.pl:error: The previous 1 run(s) terminated abnormally === w10pro64_ar (testbot log) === WineRunTask.pl:error: The previous 1 run(s) terminated abnormally === w1064v1507 (32 bit report) === ntdll: version.c:38: Test failed: Device form does not match Desktop value: 0 version.c:60: Test failed: Device form string is not equal to Desktop: Unknown0d8c:version: 9 tests executed (0 marked as todo, 2 failures), 0 skipped. Report validation errors: ntdll:version has no test summary line (early exit of the main process?) ntdll:version has unaccounted for failure messages === w1064v1809 (32 bit report) === ntdll: version.c:38: Test failed: Device form does not match Desktop value: 0 version.c:60: Test failed: Device form string is not equal to Desktop: Unknown1d70:version: 9 tests executed (0 marked as todo, 2 failures), 0 skipped. Report validation errors: ntdll:version has no test summary line (early exit of the main process?) ntdll:version has unaccounted for failure messages === w1064 (32 bit report) === ntdll: version.c:38: Test failed: Device form does not match Desktop value: 0 version.c:60: Test failed: Device form string is not equal to Desktop: Unknown1c88:version: 9 tests executed (0 marked as todo, 2 failures), 0 skipped. Report validation errors: ntdll:version has no test summary line (early exit of the main process?) ntdll:version has unaccounted for failure messages === w1064_tsign (32 bit report) === ntdll: version.c:38: Test failed: Device form does not match Desktop value: 0 version.c:60: Test failed: Device form string is not equal to Desktop: Unknown1e98:version: 9 tests executed (0 marked as todo, 2 failures), 0 skipped. Report validation errors: ntdll:version has no test summary line (early exit of the main process?) ntdll:version has unaccounted for failure messages === w10pro64 (32 bit report) === ntdll: version.c:38: Test failed: Device form does not match Desktop value: 0 version.c:60: Test failed: Device form string is not equal to Desktop: Unknown1e04:version: 9 tests executed (0 marked as todo, 2 failures), 0 skipped. Report validation errors: ntdll:version has no test summary line (early exit of the main process?) ntdll:version has unaccounted for failure messages === w1064v1507 (64 bit report) === ntdll: version.c:38: Test failed: Device form does not match Desktop value: 0 version.c:60: Test failed: Device form string is not equal to Desktop: Unknown0c38:version: 9 tests executed (0 marked as todo, 2 failures), 0 skipped. Report validation errors: ntdll:version has no test summary line (early exit of the main process?) ntdll:version has unaccounted for failure messages === w1064v1809 (64 bit report) === ntdll: version.c:38: Test failed: Device form does not match Desktop value: 0 version.c:60: Test failed: Device form string is not equal to Desktop: Unknown1d20:version: 9 tests executed (0 marked as todo, 2 failures), 0 skipped. Report validation errors: ntdll:version has no test summary line (early exit of the main process?) ntdll:version has unaccounted for failure messages === w1064 (64 bit report) === ntdll: version.c:38: Test failed: Device form does not match Desktop value: 0 version.c:60: Test failed: Device form string is not equal to Desktop: Unknown1d50:version: 9 tests executed (0 marked as todo, 2 failures), 0 skipped. Report validation errors: ntdll:version has no test summary line (early exit of the main process?) ntdll:version has unaccounted for failure messages === w1064_2qxl (64 bit report) === ntdll: version.c:38: Test failed: Device form does not match Desktop value: 0 version.c:60: Test failed: Device form string is not equal to Desktop: Unknown1e28:version: 9 tests executed (0 marked as todo, 2 failures), 0 skipped. Report validation errors: ntdll:version has no test summary line (early exit of the main process?) ntdll:version has unaccounted for failure messages === w1064_adm (64 bit report) === ntdll: version.c:38: Test failed: Device form does not match Desktop value: 0 version.c:60: Test failed: Device form string is not equal to Desktop: Unknown1d58:version: 9 tests executed (0 marked as todo, 2 failures), 0 skipped. Report validation errors: ntdll:version has no test summary line (early exit of the main process?) ntdll:version has unaccounted for failure messages === w1064_tsign (64 bit report) === ntdll: version.c:38: Test failed: Device form does not match Desktop value: 0 version.c:60: Test failed: Device form string is not equal to Desktop: Unknown1d8c:version: 9 tests executed (0 marked as todo, 2 failures), 0 skipped. Report validation errors: ntdll:version has no test summary line (early exit of the main process?) ntdll:version has unaccounted for failure messages === w10pro64 (64 bit report) === ntdll: version.c:38: Test failed: Device form does not match Desktop value: 0 version.c:60: Test failed: Device form string is not equal to Desktop: Unknown1df8:version: 9 tests executed (0 marked as todo, 2 failures), 0 skipped. Report validation errors: ntdll:version has no test summary line (early exit of the main process?) ntdll:version has unaccounted for failure messages === w10pro64_en_AE_u8 (64 bit report) === ntdll: version.c:38: Test failed: Device form does not match Desktop value: 0 version.c:60: Test failed: Device form string is not equal to Desktop: Unknown0e54:version: 9 tests executed (0 marked as todo, 2 failures), 0 skipped. Report validation errors: ntdll:version has no test summary line (early exit of the main process?) ntdll:version has unaccounted for failure messages === w10pro64_ar (64 bit report) === ntdll: version.c:38: Test failed: Device form does not match Desktop value: 0 version.c:60: Test failed: Device form string is not equal to Desktop: Unknown0230:version: 9 tests executed (0 marked as todo, 2 failures), 0 skipped. Report validation errors: ntdll:version has no test summary line (early exit of the main process?) ntdll:version has unaccounted for failure messages === w10pro64_ja (64 bit report) === ntdll: version.c:38: Test failed: Device form does not match Desktop value: 0 version.c:60: Test failed: Device form string is not equal to Desktop: Unknown1430:version: 9 tests executed (0 marked as todo, 2 failures), 0 skipped. Report validation errors: ntdll:version has no test summary line (early exit of the main process?) ntdll:version has unaccounted for failure messages === w10pro64_zh_CN (64 bit report) === ntdll: version.c:38: Test failed: Device form does not match Desktop value: 0 version.c:60: Test failed: Device form string is not equal to Desktop: Unknown200c:version: 9 tests executed (0 marked as todo, 2 failures), 0 skipped. Report validation errors: ntdll:version has no test summary line (early exit of the main process?) ntdll:version has unaccounted for failure messages

June 23, 2022