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

Nikolay Sivov : mfplat: Add some more attributes for tracing.
by Alexandre Julliard 02 Aug '21

02 Aug '21

Module: wine Branch: master Commit: 4df04dbdd6bd7ccc8492e6dda14332165d69c792 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4df04dbdd6bd7ccc8492e6dd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Aug 1 18:24:28 2021 +0300 mfplat: Add some more attributes for tracing. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 3 +++ include/mftransform.idl | 3 +++ 2 files changed, 6 insertions(+) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index bcad90c29da..7fd713261fc 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -1687,6 +1687,7 @@ const char *debugstr_attr(const GUID *guid) X(MF_BYTESTREAM_DLNA_PROFILE_ID), X(MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_AUDCAP_ROLE), X(MF_MT_MAJOR_TYPE), + X(MF_SA_REQUIRED_SAMPLE_COUNT_PROGRESSIVE), X(MF_MT_IN_BAND_PARAMETER_SET), X(MF_EVENT_SOURCE_CHARACTERISTICS), X(MF_EVENT_SOURCE_CHARACTERISTICS_OLD), @@ -1717,6 +1718,7 @@ const char *debugstr_attr(const GUID *guid) X(MF_EVENT_STREAM_METADATA_KEYDATA), X(MF_READER_WRITER_D3D_MANAGER), X(MFSampleExtension_3DVideo), + X(MF_SA_MINIMUM_OUTPUT_SAMPLE_COUNT_PROGRESSIVE), X(MF_MT_H264_USAGE), X(MF_MEDIA_ENGINE_EME_CALLBACK), X(MF_EVENT_SOURCE_FAKE_START), @@ -1775,6 +1777,7 @@ const char *debugstr_attr(const GUID *guid) X(MF_EVENT_START_PRESENTATION_TIME_AT_OUTPUT), X(MFSampleExtension_DecodeTimestamp), X(MF_MEDIA_ENGINE_COMPATIBILITY_MODE), + X(MF_SA_MINIMUM_OUTPUT_SAMPLE_COUNT), X(MF_MT_VIDEO_H264_NO_FMOASO), X(MF_MT_AVG_BIT_ERROR_RATE), X(MF_MT_VIDEO_PRIMARIES), diff --git a/include/mftransform.idl b/include/mftransform.idl index e49c7200185..0dd83a70f7d 100644 --- a/include/mftransform.idl +++ b/include/mftransform.idl @@ -208,6 +208,9 @@ cpp_quote("EXTERN_GUID(MF_SA_D3D11_SHARED, 0x7b8f32c3, 0x6d96, 0x4 cpp_quote("EXTERN_GUID(MF_SA_D3D11_SHARED_WITHOUT_MUTEX, 0x39dbd44d, 0x2e44, 0x4931, 0xa4, 0xc8, 0x35, 0x2d, 0x3d, 0xc4, 0x21, 0x15);") cpp_quote("EXTERN_GUID(MF_SA_D3D11_USAGE, 0xe85fe442, 0x2ca3, 0x486e, 0xa9, 0xc7, 0x10, 0x9d, 0xda, 0x60, 0x98, 0x80);") cpp_quote("EXTERN_GUID(MF_SA_REQUIRED_SAMPLE_COUNT, 0x18802c61, 0x324b, 0x4952, 0xab, 0xd0, 0x17, 0x6f, 0xf5, 0xc6, 0x96, 0xff);") +cpp_quote("EXTERN_GUID(MF_SA_REQUIRED_SAMPLE_COUNT_PROGRESSIVE, 0xb172d58e, 0xfa77, 0x4e48, 0x8d, 0x2a, 0x1d, 0xf2, 0xd8, 0x50, 0xea, 0xc2);") +cpp_quote("EXTERN_GUID(MF_SA_MINIMUM_OUTPUT_SAMPLE_COUNT, 0x851745d5, 0xc3d6, 0x476d, 0x95, 0x27, 0x49, 0x8e, 0xf2, 0xd1, 0x0d, 0x18);") +cpp_quote("EXTERN_GUID(MF_SA_MINIMUM_OUTPUT_SAMPLE_COUNT_PROGRESSIVE, 0x0f5523a5, 0x1cb2, 0x47c5, 0xa5, 0x50, 0x2e, 0xeb, 0x84, 0xb4, 0xd1, 0x4a);") cpp_quote("EXTERN_GUID(MF_TRANSFORM_ASYNC, 0xf81a699a, 0x649a, 0x497d, 0x8c, 0x73, 0x29, 0xf8, 0xfe, 0xd6, 0xad, 0x7a);") cpp_quote("EXTERN_GUID(MF_TRANSFORM_ASYNC_UNLOCK, 0xe5666d6b, 0x3422, 0x4eb6, 0xa4, 0x21, 0xda, 0x7d, 0xb1, 0xf8, 0xe2, 0x07);") cpp_quote("EXTERN_GUID(MF_TRANSFORM_CATEGORY_Attribute, 0xceabba49, 0x506d, 0x4757, 0xa6, 0xff, 0x66, 0xc1, 0x84, 0x98, 0x7e, 0x4e);")

1 0

Huw Davies : nsiproxy: Implement IPv4 forward enumerate_all.
by Alexandre Julliard 02 Aug '21

02 Aug '21

Module: wine Branch: master Commit: f1793fd8bc851d58cafa9f57dfdd31b44f0f4ca4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f1793fd8bc851d58cafa9f57… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Aug 2 09:19:04 2021 +0100 nsiproxy: Implement IPv4 forward enumerate_all. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/nsi/tests/nsi.c | 117 +++++++++++++++ dlls/nsiproxy.sys/ip.c | 268 +++++++++++++++++++++++++++++++++++ dlls/nsiproxy.sys/nsiproxy_private.h | 38 +++++ include/netioapi.h | 2 + include/wine/nsi.h | 62 ++++++++ 5 files changed, 487 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f1793fd8bc851d58cafa…

1 0

Huw Davies : iphlpapi: Implement GetIpForwardTable2().
by Alexandre Julliard 02 Aug '21

02 Aug '21

Module: wine Branch: master Commit: 8f207fe7a85bae2476cac2b02daa9d179de45b34 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8f207fe7a85bae2476cac2b0… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Aug 2 09:19:05 2021 +0100 iphlpapi: Implement GetIpForwardTable2(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/iphlpapi_main.c | 128 ++++++++++++++++++++++++++++++++++++++---- dlls/nsi/tests/nsi.c | 2 - 2 files changed, 117 insertions(+), 13 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index b2d597fd9ab..f53c77ba434 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -2229,6 +2229,123 @@ DWORD WINAPI GetIpForwardTable(PMIB_IPFORWARDTABLE pIpForwardTable, PULONG pdwSi return ret; } +static void forward_row2_fill( MIB_IPFORWARD_ROW2 *row, USHORT fam, void *key, struct nsi_ip_forward_rw *rw, + void *dyn, struct nsi_ip_forward_static *stat ) +{ + struct nsi_ipv4_forward_key *key4 = (struct nsi_ipv4_forward_key *)key; + struct nsi_ipv6_forward_key *key6 = (struct nsi_ipv6_forward_key *)key; + struct nsi_ipv4_forward_dynamic *dyn4 = (struct nsi_ipv4_forward_dynamic *)dyn; + struct nsi_ipv6_forward_dynamic *dyn6 = (struct nsi_ipv6_forward_dynamic *)dyn; + + if (fam == WS_AF_INET) + { + row->InterfaceLuid = key4->luid; + row->DestinationPrefix.Prefix.Ipv4.sin_family = fam; + row->DestinationPrefix.Prefix.Ipv4.sin_port = 0; + row->DestinationPrefix.Prefix.Ipv4.sin_addr = key4->prefix; + memset( &row->DestinationPrefix.Prefix.Ipv4.sin_zero, 0, sizeof(row->DestinationPrefix.Prefix.Ipv4.sin_zero) ); + row->DestinationPrefix.PrefixLength = key4->prefix_len; + row->NextHop.Ipv4.sin_family = fam; + row->NextHop.Ipv4.sin_port = 0; + row->NextHop.Ipv4.sin_addr = key4->next_hop; + memset( &row->NextHop.Ipv4.sin_zero, 0, sizeof(row->NextHop.Ipv4.sin_zero) ); + + row->Age = dyn4->age; + } + else + { + row->InterfaceLuid = key6->luid; + + row->DestinationPrefix.Prefix.Ipv6.sin6_family = fam; + row->DestinationPrefix.Prefix.Ipv6.sin6_port = 0; + row->DestinationPrefix.Prefix.Ipv6.sin6_flowinfo = 0; + row->DestinationPrefix.Prefix.Ipv6.sin6_addr = key6->prefix; + row->DestinationPrefix.Prefix.Ipv6.sin6_scope_id = 0; + row->DestinationPrefix.PrefixLength = key6->prefix_len; + row->NextHop.Ipv6.sin6_family = fam; + row->NextHop.Ipv6.sin6_port = 0; + row->NextHop.Ipv6.sin6_flowinfo = 0; + row->NextHop.Ipv6.sin6_addr = key6->next_hop; + row->NextHop.Ipv6.sin6_scope_id = 0; + + row->Age = dyn6->age; + } + + row->InterfaceIndex = stat->if_index; + + row->SitePrefixLength = rw->site_prefix_len; + row->ValidLifetime = rw->valid_lifetime; + row->PreferredLifetime = rw->preferred_lifetime; + row->Metric = rw->metric; + row->Protocol = rw->protocol; + row->Loopback = rw->loopback; + row->AutoconfigureAddress = rw->autoconf; + row->Publish = rw->publish; + row->Immortal = rw->immortal; + + row->Origin = stat->origin; +} + +/****************************************************************** + * GetIpForwardTable2 (IPHLPAPI.@) + */ +DWORD WINAPI GetIpForwardTable2( ADDRESS_FAMILY family, MIB_IPFORWARD_TABLE2 **table ) +{ + void *key[2] = { NULL, NULL }; + struct nsi_ip_forward_rw *rw[2] = { NULL, NULL }; + void *dyn[2] = { NULL, NULL }; + struct nsi_ip_forward_static *stat[2] = { NULL, NULL }; + static const USHORT fam[2] = { WS_AF_INET, WS_AF_INET6 }; + static const DWORD key_size[2] = { sizeof(struct nsi_ipv4_forward_key), sizeof(struct nsi_ipv6_forward_key) }; + static const DWORD dyn_size[2] = { sizeof(struct nsi_ipv4_forward_dynamic), sizeof(struct nsi_ipv6_forward_dynamic) }; + DWORD err = ERROR_SUCCESS, i, size, count[2] = { 0, 0 }; + + TRACE( "%u, %p\n", family, table ); + + if (!table || (family != WS_AF_INET && family != WS_AF_INET6 && family != WS_AF_UNSPEC)) + return ERROR_INVALID_PARAMETER; + + for (i = 0; i < 2; i++) + { + if (family != WS_AF_UNSPEC && family != fam[i]) continue; + + err = NsiAllocateAndGetTable( 1, ip_module_id( fam[i] ), NSI_IP_FORWARD_TABLE, key + i, key_size[i], + (void **)rw + i, sizeof(**rw), dyn + i, dyn_size[i], + (void **)stat + i, sizeof(**stat), count + i, 0 ); + if (err) count[i] = 0; + } + + size = FIELD_OFFSET(MIB_IPFORWARD_TABLE2, Table[ count[0] + count[1] ]); + *table = heap_alloc( size ); + if (!*table) + { + err = ERROR_NOT_ENOUGH_MEMORY; + goto err; + } + + (*table)->NumEntries = count[0] + count[1]; + for (i = 0; i < count[0]; i++) + { + MIB_IPFORWARD_ROW2 *row = (*table)->Table + i; + struct nsi_ipv4_forward_key *key4 = (struct nsi_ipv4_forward_key *)key[0]; + struct nsi_ipv4_forward_dynamic *dyn4 = (struct nsi_ipv4_forward_dynamic *)dyn[0]; + + forward_row2_fill( row, fam[0], key4 + i, rw[0] + i, dyn4 + i, stat[0] + i ); + } + + for (i = 0; i < count[1]; i++) + { + MIB_IPFORWARD_ROW2 *row = (*table)->Table + count[0] + i; + struct nsi_ipv6_forward_key *key6 = (struct nsi_ipv6_forward_key *)key[1]; + struct nsi_ipv6_forward_dynamic *dyn6 = (struct nsi_ipv6_forward_dynamic *)dyn[1]; + + forward_row2_fill( row, fam[1], key6 + i, rw[1] + i, dyn6 + i, stat[1] + i ); + } + +err: + for (i = 0; i < 2; i++) NsiFreeTable( key[i], rw[i], dyn[i], stat[i] ); + return err; +} /****************************************************************** * GetIpNetTable (IPHLPAPI.@) @@ -3556,17 +3673,6 @@ char *WINAPI IPHLP_if_indextoname( NET_IFINDEX index, char *name ) return name; } -/****************************************************************** - * GetIpForwardTable2 (IPHLPAPI.@) - */ -DWORD WINAPI GetIpForwardTable2(ADDRESS_FAMILY family, PMIB_IPFORWARD_TABLE2 *table) -{ - static int once; - - if (!once++) FIXME("(%u %p): stub\n", family, table); - return ERROR_NOT_SUPPORTED; -} - /****************************************************************** * GetIpNetTable2 (IPHLPAPI.@) */ diff --git a/dlls/nsi/tests/nsi.c b/dlls/nsi/tests/nsi.c index 9f6349bd0e7..c689aca6754 100644 --- a/dlls/nsi/tests/nsi.c +++ b/dlls/nsi/tests/nsi.c @@ -531,9 +531,7 @@ todo_wine_if (family == AF_INET6) dyn_size = dyn_sizes[i]; err = GetIpForwardTable2( family, &table ); -todo_wine ok( !err, "got %d\n", err ); - if (err) { winetest_pop_context(); return; } ok( table->NumEntries == count, "table entries %d count %d\n", table->NumEntries, count ); for (i = 0; i < count; i++)

1 0

Huw Davies : iphlpapi: Implement GetIpForwardTable() on top of nsi.
by Alexandre Julliard 02 Aug '21

02 Aug '21

Module: wine Branch: master Commit: 0515480d89e334fba11ecf0b02179e8677569afd URL: https://source.winehq.org/git/wine.git/?a=commit;h=0515480d89e334fba11ecf0b… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Aug 2 09:19:06 2021 +0100 iphlpapi: Implement GetIpForwardTable() on top of nsi. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/iphlpapi_main.c | 107 ++++++++++++++++++++++++++----------- dlls/iphlpapi/tests/iphlpapi.c | 116 ++++++++++++++++++++++++----------------- 2 files changed, 146 insertions(+), 77 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0515480d89e334fba11e…

1 0

Huw Davies : iphlpapi: Implement AllocateAndGetIpForwardTable() on top of GetIpForwardTable().
by Alexandre Julliard 02 Aug '21

02 Aug '21

Module: wine Branch: master Commit: 413eeaead5c584335c979766100f952b1e2f8cd0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=413eeaead5c584335c979766… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Aug 2 09:19:07 2021 +0100 iphlpapi: Implement AllocateAndGetIpForwardTable() on top of GetIpForwardTable(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/iphlpapi_main.c | 37 ++++++ dlls/iphlpapi/ipstats.c | 265 ------------------------------------------ 2 files changed, 37 insertions(+), 265 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=413eeaead5c584335c97…

1 0

Martin Storsjo : winebuild: Spell out "x30" instead of "lr" for arm64.
by Alexandre Julliard 02 Aug '21

02 Aug '21

Module: wine Branch: master Commit: 9d619b1fb069d0c189e8ae85425c3b3c55f7b744 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d619b1fb069d0c189e8ae85… Author: Martin Storsjo <martin(a)martin.st> Date: Mon Aug 2 12:00:44 2021 +0300 winebuild: Spell out "x30" instead of "lr" for arm64. This fixes building with older binutils versions. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/import.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 064ab1b4768..ef12b5fa4b0 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1772,14 +1772,14 @@ static void output_syscall_dispatcher(void) output( "\tstp x4, x5, [sp, #32]\n" ); output( "\tstp x6, x7, [sp, #48]\n" ); output( "\tstp x8, x9, [sp, #64]\n" ); - output( "\tstr lr, [sp, #80]\n" ); + output( "\tstr x30, [sp, #80]\n" ); output( "\tbl %s\n", asm_name("NtCurrentTeb") ); output( "\tmov x18, x0\n" ); output( "\tldp x2, x3, [sp, #16]\n" ); output( "\tldp x4, x5, [sp, #32]\n" ); output( "\tldp x6, x7, [sp, #48]\n" ); output( "\tldp x8, x9, [sp, #64]\n" ); - output( "\tldr lr, [sp, #80]\n" ); + output( "\tldr x30, [sp, #80]\n" ); output( "\tldp x0, x1, [sp], #96\n" ); output( "\tldr x10, [x18, #0x2f8]\n" ); /* arm64_thread_data()->syscall_frame */ @@ -1792,7 +1792,7 @@ static void output_syscall_dispatcher(void) output( "\tmov x19, sp\n" ); output( "\tstp x9, x19, [x10, #0xf0]\n" ); output( "\tmrs x9, NZCV\n" ); - output( "\tstp lr, x9, [x10, #0x100]\n" ); + output( "\tstp x30, x9, [x10, #0x100]\n" ); output( "\tstr xzr, [x10, #0x110]\n" ); /* frame->restore_flags */ output( "\tmrs x9, FPCR\n" ); output( "\tstr w9, [x10, #0x118]\n" );

1 0

Alexandre Julliard : packaging: Remove Ubuntu 20.10.
by Alexandre Julliard 02 Aug '21

02 Aug '21

Module: tools Branch: master Commit: f35517d71ba71dbe7ab82f583afa696babc17e6d URL: https://source.winehq.org/git/tools.git/?a=commit;h=f35517d71ba71dbe7ab82f5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jul 31 17:56:37 2021 +0200 packaging: Remove Ubuntu 20.10. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- packaging/obs/apt-mirror.cfg | 4 ---- packaging/obs/obs-sync | 3 +-- packaging/obs/rsync-filter | 1 - 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/packaging/obs/apt-mirror.cfg b/packaging/obs/apt-mirror.cfg index 4f8757b..0962e2f 100644 --- a/packaging/obs/apt-mirror.cfg +++ b/packaging/obs/apt-mirror.cfg @@ -30,10 +30,6 @@ deb-amd64 https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUb deb-i386 https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_… ./ deb-src https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_… ./ -deb-amd64 https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_… ./ -deb-i386 https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_… ./ -deb-src https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_… ./ - deb-amd64 https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_… ./ deb-i386 https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_… ./ deb-src https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_… ./ diff --git a/packaging/obs/obs-sync b/packaging/obs/obs-sync index ce24e4d..17e0448 100755 --- a/packaging/obs/obs-sync +++ b/packaging/obs/obs-sync @@ -181,7 +181,7 @@ publish_files () cd $basedir -distros="33 34 buster bullseye bionic focal groovy hirsute" +distros="33 34 buster bullseye bionic focal hirsute" dry_run= while [ $# -ge 1 ] @@ -221,7 +221,6 @@ do bullseye) add_deb debian bullseye Debian_Testing_standard testing ;; bionic) add_deb ubuntu bionic xUbuntu_18.04 ;; focal) add_deb ubuntu focal xUbuntu_20.04 ;; - groovy) add_deb ubuntu groovy xUbuntu_20.10 ;; hirsute) add_deb ubuntu hirsute xUbuntu_21.04 ;; *) echo "Unknown distro $i"; exit 1 ;; esac diff --git a/packaging/obs/rsync-filter b/packaging/obs/rsync-filter index f3ae9bc..64aa612 100644 --- a/packaging/obs/rsync-filter +++ b/packaging/obs/rsync-filter @@ -16,7 +16,6 @@ + /ubuntu/dists + /ubuntu/dists/bionic + /ubuntu/dists/focal -+ /ubuntu/dists/groovy + /ubuntu/dists/hirsute - /ubuntu/dists/* - /ubuntu/*

1 0

Conor McCarthy : vkd3d: Resolve D3D12_DESCRIPTOR_RANGE_OFFSET_APPEND during table parsing.
by Alexandre Julliard 02 Aug '21

02 Aug '21

Module: vkd3d Branch: master Commit: 6d5e71f5b86bc9ee64d38d0ca4904fdf8994f9d3 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=6d5e71f5b86bc9ee64d38d0… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri Jul 30 14:03:14 2021 +1000 vkd3d: Resolve D3D12_DESCRIPTOR_RANGE_OFFSET_APPEND during table parsing. Simplifies the code path for handling array bindings and unbounded ranges. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/command.c | 6 +----- libs/vkd3d/state.c | 26 +++++++++++++++++++++----- 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 7150c59..8bed730 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -2674,7 +2674,6 @@ static void d3d12_command_list_update_descriptor_table(struct d3d12_command_list descriptor_table = root_signature_get_descriptor_table(root_signature, index); - descriptor = base_descriptor; descriptor_count = 0; current_descriptor_write = descriptor_writes; current_image_info = image_infos; @@ -2682,10 +2681,7 @@ static void d3d12_command_list_update_descriptor_table(struct d3d12_command_list { range = &descriptor_table->ranges[i]; - if (range->offset != D3D12_DESCRIPTOR_RANGE_OFFSET_APPEND) - { - descriptor = base_descriptor + range->offset; - } + descriptor = base_descriptor + range->offset; for (j = 0; j < range->descriptor_count; ++j, ++descriptor) { diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index a381679..588036d 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -591,6 +591,8 @@ static HRESULT d3d12_root_signature_init_root_descriptor_tables(struct d3d12_roo for (i = 0; i < desc->NumParameters; ++i) { const D3D12_ROOT_PARAMETER *p = &desc->pParameters[i]; + unsigned int offset = 0; + if (p->ParameterType != D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE) continue; @@ -604,6 +606,25 @@ static HRESULT d3d12_root_signature_init_root_descriptor_tables(struct d3d12_roo if (!(table->ranges = vkd3d_calloc(table->range_count, sizeof(*table->ranges)))) return E_OUTOFMEMORY; + for (j = 0; j < range_count; ++j) + { + range = &p->u.DescriptorTable.pDescriptorRanges[j]; + + if (range->OffsetInDescriptorsFromTableStart != D3D12_DESCRIPTOR_RANGE_OFFSET_APPEND) + offset = range->OffsetInDescriptorsFromTableStart; + + table->ranges[j].offset = offset; + table->ranges[j].descriptor_count = range->NumDescriptors; + table->ranges[j].descriptor_magic = vkd3d_descriptor_magic_from_d3d12(range->RangeType); + table->ranges[j].register_space = range->RegisterSpace; + table->ranges[j].base_register_idx = range->BaseShaderRegister; + + TRACE("Descriptor table %u, range %u, offset %u, type %#x, count %u.\n", i, j, + offset, range->RangeType, range->NumDescriptors); + + offset += range->NumDescriptors; + } + for (j = 0; j < range_count; ++j) { range = &p->u.DescriptorTable.pDescriptorRanges[j]; @@ -638,12 +659,7 @@ static HRESULT d3d12_root_signature_init_root_descriptor_tables(struct d3d12_roo ++cur_binding; } - table->ranges[j].offset = range->OffsetInDescriptorsFromTableStart; - table->ranges[j].descriptor_count = range->NumDescriptors; table->ranges[j].binding = vk_binding; - table->ranges[j].descriptor_magic = vkd3d_descriptor_magic_from_d3d12(range->RangeType); - table->ranges[j].register_space = range->RegisterSpace; - table->ranges[j].base_register_idx = range->BaseShaderRegister; } }

1 0

Conor McCarthy : vkd3d: Include descriptor indexing in the shader extensions if the device supports it.
by Alexandre Julliard 02 Aug '21

02 Aug '21

Module: vkd3d Branch: master Commit: 6fe884a02cfe245a4b01c3fbbd0a6df4c23c81e2 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=6fe884a02cfe245a4b01c3f… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri Jul 30 14:03:17 2021 +1000 vkd3d: Include descriptor indexing in the shader extensions if the device supports it. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/device.c | 4 ++++ libs/vkd3d/vkd3d_private.h | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index be0bf2f..0fadb52 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1457,6 +1457,10 @@ static HRESULT vkd3d_init_device_caps(struct d3d12_device *device, vulkan_info->shader_extensions[0] = VKD3D_SHADER_SPIRV_EXTENSION_EXT_DEMOTE_TO_HELPER_INVOCATION; } + if (vulkan_info->EXT_descriptor_indexing) + vulkan_info->shader_extensions[vulkan_info->shader_extension_count++] + = VKD3D_SHADER_SPIRV_EXTENSION_EXT_DESCRIPTOR_INDEXING; + /* Disable unused Vulkan features. */ features->shaderTessellationAndGeometryPointSize = VK_FALSE; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 76a07c3..70e3248 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -51,7 +51,7 @@ #define VKD3D_MAX_COMPATIBLE_FORMAT_COUNT 6u #define VKD3D_MAX_QUEUE_FAMILY_COUNT 3u -#define VKD3D_MAX_SHADER_EXTENSIONS 1u +#define VKD3D_MAX_SHADER_EXTENSIONS 2u #define VKD3D_MAX_SHADER_STAGES 5u #define VKD3D_MAX_VK_SYNC_OBJECTS 4u #define VKD3D_MAX_DESCRIPTOR_SETS 2u

1 0

Conor McCarthy : vkd3d: Pass target info to vkd3d-shader for compute pipelines.
by Alexandre Julliard 02 Aug '21

02 Aug '21

Module: vkd3d Branch: master Commit: 112ed83ddeab614404b05e2c5263f1ae78fb3714 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=112ed83ddeab614404b05e2… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri Jul 30 14:03:18 2021 +1000 vkd3d: Pass target info to vkd3d-shader for compute pipelines. Required for enabling extensions, e.g. descriptor indexing. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/state.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 588036d..7a3759e 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1547,6 +1547,7 @@ static HRESULT d3d12_pipeline_state_init_compute(struct d3d12_pipeline_state *st struct vkd3d_shader_scan_descriptor_info shader_info; struct vkd3d_shader_interface_info shader_interface; const struct d3d12_root_signature *root_signature; + struct vkd3d_shader_spirv_target_info target_info; VkPipelineLayout vk_pipeline_layout; HRESULT hr; int ret; @@ -1578,8 +1579,14 @@ static HRESULT d3d12_pipeline_state_init_compute(struct d3d12_pipeline_state *st } vkd3d_shader_free_scan_descriptor_info(&shader_info); + memset(&target_info, 0, sizeof(target_info)); + target_info.type = VKD3D_SHADER_STRUCTURE_TYPE_SPIRV_TARGET_INFO; + target_info.environment = VKD3D_SHADER_SPIRV_ENVIRONMENT_VULKAN_1_0; + target_info.extensions = device->vk_info.shader_extensions; + target_info.extension_count = device->vk_info.shader_extension_count; + shader_interface.type = VKD3D_SHADER_STRUCTURE_TYPE_INTERFACE_INFO; - shader_interface.next = NULL; + shader_interface.next = &target_info; shader_interface.bindings = root_signature->descriptor_mapping; shader_interface.binding_count = root_signature->binding_count; shader_interface.push_constant_buffers = root_signature->root_constants;

1 0