March 2022 - Wine-Commits - list.winehq.org

Alexandre Julliard : kernelbase: Reimplement IsValidLocaleName() using the locale.nls data.
by Alexandre Julliard March 24, 2022

March 24, 2022

Module: wine Branch: master Commit: da125003e6cf5522c1f97246c96c3a754b5b4f66 URL: https://source.winehq.org/git/wine.git/?a=commit;h=da125003e6cf5522c1f97246… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 24 16:45:24 2022 +0100 kernelbase: Reimplement IsValidLocaleName() using the locale.nls data. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 37 ++++++++++++++++++++++++++++++++++--- 1 file changed, 34 insertions(+), 3 deletions(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index cb5441f755e..318fe24d10a 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -729,6 +729,38 @@ done: } +static int compare_locale_names( const WCHAR *n1, const WCHAR *n2 ) +{ + for (;;) + { + WCHAR ch1 = *n1++; + WCHAR ch2 = *n2++; + if (ch1 >= 'a' && ch1 <= 'z') ch1 -= 'a' - 'A'; + else if (ch1 == '_') ch1 = '-'; + if (ch2 >= 'a' && ch2 <= 'z') ch2 -= 'a' - 'A'; + else if (ch2 == '_') ch2 = '-'; + if (!ch1 || ch1 != ch2) return ch1 - ch2; + } +} + + +static const NLS_LOCALE_LCNAME_INDEX *find_lcname_entry( const WCHAR *name ) +{ + int min = 0, max = locale_table->nb_lcnames - 1; + + while (min <= max) + { + int res, pos = (min + max) / 2; + const WCHAR *str = locale_strings + lcnames_index[pos].name; + res = compare_locale_names( name, str + 1 ); + if (res < 0) max = pos - 1; + else if (res > 0) min = pos + 1; + else return &lcnames_index[pos]; + } + return NULL; +} + + /*********************************************************************** * init_locale */ @@ -5190,9 +5222,8 @@ BOOL WINAPI DECLSPEC_HOTPATCH IsValidLocale( LCID lcid, DWORD flags ) */ BOOL WINAPI DECLSPEC_HOTPATCH IsValidLocaleName( const WCHAR *locale ) { - LCID lcid; - - return !RtlLocaleNameToLcid( locale, &lcid, 2 ); + if (locale == LOCALE_NAME_USER_DEFAULT) return FALSE; + return !!find_lcname_entry( locale ); }

1 0

Jan Sikorski : wined3d: Flush on texture download to avoid stalling on readout.
by Alexandre Julliard March 24, 2022

March 24, 2022

Module: wine Branch: master Commit: a7815d352c1165be2073cb5ba4bb4de0520c373c URL: https://source.winehq.org/git/wine.git/?a=commit;h=a7815d352c1165be2073cb5b… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Wed Mar 23 17:31:58 2022 +0100 wined3d: Flush on texture download to avoid stalling on readout. Fixes a stall during a map operation in The Evil Within. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index fdd2c70c667..ebe770af0d2 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -5163,6 +5163,8 @@ static void wined3d_texture_vk_download_data(struct wined3d_context *context, VK_CALL(vkCmdPipelineBarrier(vk_command_buffer, VK_PIPELINE_STAGE_TRANSFER_BIT, bo_stage_flags, 0, 0, NULL, 1, &vk_barrier, 0, NULL)); + /* Start the download so we don't stall waiting for the result. */ + wined3d_context_vk_submit_command_buffer(context_vk, 0, NULL, NULL, 0, NULL); } }

1 0

Eric Pouech : ntdll/tests: Finalize migration to long types.
by Alexandre Julliard March 24, 2022

March 24, 2022

Module: wine Branch: master Commit: 55b45d00efeb8330c6cf87ab9feb74050df50de3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=55b45d00efeb8330c6cf87ab… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Mar 24 09:57:52 2022 +0100 ntdll/tests: Finalize migration to long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/Makefile.in | 1 - dlls/ntdll/tests/atom.c | 1 - dlls/ntdll/tests/change.c | 1 - dlls/ntdll/tests/directory.c | 1 - dlls/ntdll/tests/env.c | 1 - dlls/ntdll/tests/error.c | 1 - dlls/ntdll/tests/exception.c | 1 - dlls/ntdll/tests/file.c | 1 - dlls/ntdll/tests/info.c | 1 - dlls/ntdll/tests/large_int.c | 1 - dlls/ntdll/tests/om.c | 1 - dlls/ntdll/tests/path.c | 1 - dlls/ntdll/tests/pipe.c | 1 - dlls/ntdll/tests/port.c | 1 - dlls/ntdll/tests/reg.c | 1 - dlls/ntdll/tests/rtl.c | 1 - dlls/ntdll/tests/rtlbitmap.c | 1 - dlls/ntdll/tests/rtlstr.c | 1 - dlls/ntdll/tests/string.c | 1 - dlls/ntdll/tests/sync.c | 1 - dlls/ntdll/tests/thread.c | 1 - dlls/ntdll/tests/threadpool.c | 1 - dlls/ntdll/tests/time.c | 1 - dlls/ntdll/tests/virtual.c | 1 - dlls/ntdll/tests/wow64.c | 1 - 25 files changed, 25 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=55b45d00efeb8330c6cf…

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard March 24, 2022

March 24, 2022

Module: wine Branch: master Commit: 0726870f7c21a6aab1f37b525b6d868542871c10 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0726870f7c21a6aab1f37b52… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Thu Mar 24 09:07:16 2022 +0200 po: Update Finnish translation. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fi.po | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/po/fi.po b/po/fi.po index f7bb8b6c8f0..585aac2ebe2 100644 --- a/po/fi.po +++ b/po/fi.po @@ -3966,13 +3966,11 @@ msgstr "" #: dlls/jscript/jscript.rc:74 msgid "Cyclic __proto__ value" -msgstr "" +msgstr "Syklinen __proto__" #: dlls/jscript/jscript.rc:75 -#, fuzzy -#| msgid "Cannot define property '|': object is not extensible" msgid "Cannot create property for a non-extensible object" -msgstr "Ominaisuutta '|' ei voi määritellä: objekti ei ole laajennettava" +msgstr "Ominaisuutta ei voi määritellä, koska objekti ei ole laajennettava" #: dlls/jscript/jscript.rc:76 msgid "Cannot define property '|': object is not extensible"

1 0

Tatsuyuki Ishi : winegcc: Identify ar files through signature.
by Alexandre Julliard March 24, 2022

March 24, 2022

Module: wine Branch: master Commit: 510cfd2762238e50e7524bb309905d2da9416890 URL: https://source.winehq.org/git/wine.git/?a=commit;h=510cfd2762238e50e7524bb3… Author: Tatsuyuki Ishi <ishitatsuyuki(a)gmail.com> Date: Thu Mar 24 11:54:36 2022 +0900 winegcc: Identify ar files through signature. Rust uses the ".rlib" extension for intermediate libraries which it passes to the linker. Detect them through signature so that winegcc will not try to compile it. Signed-off-by: Tatsuyuki Ishi <ishitatsuyuki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/utils.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/winegcc/utils.c b/tools/winegcc/utils.c index 409ae26cd82..4b4498a59fa 100644 --- a/tools/winegcc/utils.c +++ b/tools/winegcc/utils.c @@ -63,6 +63,7 @@ file_type get_file_type(const char* filename) /* see tools/winebuild/res32.c: check_header for details */ static const char res_sig[] = { 0,0,0,0, 32,0,0,0, 0xff,0xff, 0,0, 0xff,0xff, 0,0, 0,0,0,0, 0,0, 0,0, 0,0,0,0, 0,0,0,0 }; static const char elf_sig[4] = "\177ELF"; + static const char ar_sig[8] = "!<arch>\n"; char buf[sizeof(res_sig)]; int fd, cnt; @@ -83,6 +84,7 @@ file_type get_file_type(const char* filename) if (strendswith(filename, ".spec")) return file_spec; if (strendswith(filename, ".rc")) return file_rc; if (cnt >= sizeof(elf_sig) && !memcmp(buf, elf_sig, sizeof(elf_sig))) return file_so; /* ELF lib */ + if (cnt >= sizeof(ar_sig) && !memcmp(buf, ar_sig, sizeof(ar_sig))) return file_arh; if (cnt >= sizeof(unsigned int) && (*(unsigned int *)buf == 0xfeedface || *(unsigned int *)buf == 0xcefaedfe || *(unsigned int *)buf == 0xfeedfacf || *(unsigned int *)buf == 0xcffaedfe))

1 0

Francois Gouget : ncrypt: Fix the spelling of a FIXME() message.
by Alexandre Julliard March 24, 2022

March 24, 2022

Module: wine Branch: master Commit: 8a5140e385c7b67e77b7391f930b10f91453b14a URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a5140e385c7b67e77b7391f… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Mar 24 03:51:32 2022 +0100 ncrypt: Fix the spelling of a FIXME() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ncrypt/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ncrypt/main.c b/dlls/ncrypt/main.c index d7a79faecce..f8fb3135f56 100644 --- a/dlls/ncrypt/main.c +++ b/dlls/ncrypt/main.c @@ -171,7 +171,7 @@ SECURITY_STATUS WINAPI NCryptCreatePersistedKey(NCRYPT_PROV_HANDLE provider, NCR if (!provider) return NTE_INVALID_HANDLE; if (!algid) return HRESULT_FROM_WIN32(RPC_X_NULL_REF_POINTER); - if (name) FIXME("Persistant keys not supported\n"); + if (name) FIXME("Persistent keys are not supported\n"); if (!lstrcmpiW(algid, BCRYPT_RSA_ALGORITHM)) {

1 0

Francois Gouget : testbot/cgi: Document the CGI classes.
by Alexandre Julliard March 24, 2022

March 24, 2022

Module: tools Branch: master Commit: 0259fd144c8ad852b5588d45a34eab681c434f98 URL: https://source.winehq.org/git/tools.git/?a=commit;h=0259fd144c8ad852b5588d4… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Mar 24 16:37:53 2022 +0100 testbot/cgi: Document the CGI classes. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/CollectionBlock.pm | 87 +++++++++++- .../lib/ObjectModel/CGI/CollectionBlockForPage.pm | 4 + testbot/lib/ObjectModel/CGI/CollectionPage.pm | 8 ++ testbot/lib/ObjectModel/CGI/FormPage.pm | 158 ++++++++++++++++++++- testbot/lib/ObjectModel/CGI/ItemPage.pm | 4 +- testbot/lib/ObjectModel/CGI/Page.pm | 68 ++++++++- testbot/lib/WineTestBot/CGI/PageBase.pm | 40 +++++- 7 files changed, 359 insertions(+), 10 deletions(-) Diff: https://source.winehq.org/git/tools.git/?a=commitdiff;h=0259fd144c8ad852b55…

1 0

Francois Gouget : testbot/cgi: Group related CGI framework methods together.
by Alexandre Julliard March 24, 2022

March 24, 2022

Module: tools Branch: master Commit: 572f0fd317598cfe93dd2eb153c88ca52faa76fd URL: https://source.winehq.org/git/tools.git/?a=commit;h=572f0fd317598cfe93dd2eb… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Mar 24 16:37:41 2022 +0100 testbot/cgi: Group related CGI framework methods together. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/CollectionBlock.pm | 668 +++++++++++---------- .../lib/ObjectModel/CGI/CollectionBlockForPage.pm | 87 ++- testbot/lib/ObjectModel/CGI/CollectionPage.pm | 152 +++-- testbot/lib/ObjectModel/CGI/FormPage.pm | 331 +++++----- testbot/lib/ObjectModel/CGI/ItemPage.pm | 136 +++-- testbot/lib/ObjectModel/CGI/Page.pm | 156 ++--- testbot/lib/WineTestBot/CGI/PageBase.pm | 355 +++++------ 7 files changed, 1024 insertions(+), 861 deletions(-) Diff: https://source.winehq.org/git/tools.git/?a=commitdiff;h=572f0fd317598cfe93d…

1 0

Francois Gouget : testbot: Tweak the Collection formatting.
by Alexandre Julliard March 24, 2022

March 24, 2022

Module: tools Branch: master Commit: 2f1dfbf19cefcc43720e6b287306ce98d10b5d81 URL: https://source.winehq.org/git/tools.git/?a=commit;h=2f1dfbf19cefcc43720e6b2… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Mar 24 16:34:15 2022 +0100 testbot: Tweak the Collection formatting. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/Collection.pm | 68 +++++++---------------------------- 1 file changed, 13 insertions(+), 55 deletions(-) diff --git a/testbot/lib/ObjectModel/Collection.pm b/testbot/lib/ObjectModel/Collection.pm index 782f32c..dd0be12 100644 --- a/testbot/lib/ObjectModel/Collection.pm +++ b/testbot/lib/ObjectModel/Collection.pm @@ -195,7 +195,6 @@ sub Load($) my ($self) = @_; $self->GetBackEnd()->LoadCollection($self); - $self->{Loaded} = 1; } @@ -252,11 +251,7 @@ sub GetKeys($) { my ($self) = @_; - if (! $self->{Loaded}) - { - $self->Load(); - } - + $self->Load() if (!$self->{Loaded}); return $self->GetKeysNoLoad(); } @@ -370,16 +365,9 @@ sub ItemExists($$) { my ($self, $Key) = @_; - if (! defined($Key)) - { - return !1; - } - - if (! $self->{Loaded}) - { - $self->Load(); - } + return !1 if (!defined $Key); + $self->Load() if (!$self->{Loaded}); return exists($self->{Items}{$Key}); } @@ -399,11 +387,7 @@ sub GetItems($) { my ($self) = @_; - if (! $self->{Loaded}) - { - $self->Load(); - } - + $self->Load() if (!$self->{Loaded}); my @Items = values %{$self->{Items}}; return \@Items; } @@ -422,11 +406,7 @@ sub GetItemsCount($) { my ($self) = @_; - if (! $self->{Loaded}) - { - $self->Load(); - } - + $self->Load() if (!$self->{Loaded}); return scalar(keys %{$self->{Items}}); } @@ -444,10 +424,7 @@ sub IsEmpty($) { my ($self) = @_; - if (! $self->{Loaded}) - { - $self->Load(); - } + $self->Load() if (!$self->{Loaded}); # Even though scalar(hash) does not return the number of items in Perl 5.20 # (and cannot generally be compared to numbers), it evaluates to true for @@ -468,7 +445,6 @@ sub SplitKey($$) my ($self, $CombinedKey) = @_; my @KeyComponents = split /#@#/, $CombinedKey; - return @KeyComponents; } @@ -564,11 +540,7 @@ sub Save($) my ($self) = @_; my ($ErrKey, $ErrProperty, $ErrMessage) = $self->Validate(); - if (! defined($ErrMessage)) - { - $self->SaveNoValidate(); - } - + $self->SaveNoValidate() if (!defined $ErrMessage); return ($ErrKey, $ErrProperty, $ErrMessage); } @@ -637,16 +609,11 @@ sub DeleteItem($$) my ($self, $Item) = @_; my $ErrMessage = $Item->OnDelete(); - if (defined($ErrMessage)) - { - return $ErrMessage; - } + return $ErrMessage if (defined $ErrMessage); + my $Key = $Item->GetKey(); $ErrMessage = $self->GetBackEnd()->DeleteItem($Item); - if (defined($ErrMessage)) - { - return $ErrMessage; - } + return $ErrMessage if (defined $ErrMessage); my $FullKey = $self->GetFullKey($Key); if (defined $FullKey) @@ -663,24 +630,15 @@ sub DeleteAll($) { my ($self) = @_; - if (! $self->{Loaded}) - { - $self->Load(); - } + $self->Load() if (!$self->{Loaded}); foreach my $Item (values %{$self->{Items}}) { my $ErrMessage = $Item->OnDelete(); - if (defined($ErrMessage)) - { - return $ErrMessage; - } + return $ErrMessage if (defined $ErrMessage); } my $ErrMessage = $self->GetBackEnd()->DeleteAll($self); - if (defined($ErrMessage)) - { - return $ErrMessage; - } + return $ErrMessage if (defined $ErrMessage); my $ScopeItems = $self->{AllScopeItems}->{ref($self)}; foreach my $Key (keys %{$self->{Items}})

1 0

Conor McCarthy : vkd3d: Write a resource null descriptor to all applicable sets when one set is written.
by Alexandre Julliard March 24, 2022

March 24, 2022

Module: vkd3d Branch: master Commit: e3045090a80ef8ede7a71cb28ebae41d34b5e3d5 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=e3045090a80ef8ede7a71cb… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu Mar 24 14:36:10 2022 +1000 vkd3d: Write a resource null descriptor to all applicable sets when one set is written. Binding a shader with the wrong null descriptor type works in Windows. The introduction of Vulkan-backed heaps may cause a regression in clients which do this, because the written index will remain unpopulated in all other sets, but a shader may access it in one of them. 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/resource.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 54 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 38fd632b..68c28cd1 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -2131,6 +2131,7 @@ void vkd3d_view_decref(struct vkd3d_view *view, struct d3d12_device *device) vkd3d_view_destroy(view, device); } +/* TODO: write null descriptors to all applicable sets (invalid behaviour workaround). */ static void d3d12_descriptor_heap_write_vk_descriptor_range(struct d3d12_descriptor_heap_vk_set *descriptor_set, struct d3d12_desc_copy_location *locations, unsigned int write_count) { @@ -2178,6 +2179,47 @@ static void d3d12_descriptor_heap_write_vk_descriptor_range(struct d3d12_descrip } } +static void d3d12_desc_write_vk_heap_null_descriptor(struct d3d12_descriptor_heap *descriptor_heap, + uint32_t dst_array_element, const struct d3d12_device *device) +{ + const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; + struct d3d12_descriptor_heap_vk_set *descriptor_set; + VkBufferView vk_buffer_view = VK_NULL_HANDLE; + enum vkd3d_vk_descriptor_set_index i; + VkDescriptorBufferInfo vk_cbv_info; + + vk_cbv_info.buffer = VK_NULL_HANDLE; + vk_cbv_info.offset = 0; + vk_cbv_info.range = VK_WHOLE_SIZE; + + /* Binding a shader with the wrong null descriptor type works in Windows. + * To support that here we must write one to all applicable Vulkan sets. */ + for (i = VKD3D_SET_INDEX_UNIFORM_BUFFER; i <= VKD3D_SET_INDEX_STORAGE_IMAGE; ++i) + { + descriptor_set = &descriptor_heap->vk_descriptor_sets[i]; + descriptor_set->vk_descriptor_writes[0].dstArrayElement = dst_array_element; + descriptor_set->vk_descriptor_writes[0].descriptorCount = 1; + switch (i) + { + case VKD3D_SET_INDEX_UNIFORM_BUFFER: + descriptor_set->vk_descriptor_writes[0].pBufferInfo = &vk_cbv_info; + break; + case VKD3D_SET_INDEX_SAMPLED_IMAGE: + case VKD3D_SET_INDEX_STORAGE_IMAGE: + descriptor_set->vk_image_infos[0].imageView = VK_NULL_HANDLE; + break; + case VKD3D_SET_INDEX_UNIFORM_TEXEL_BUFFER: + case VKD3D_SET_INDEX_STORAGE_TEXEL_BUFFER: + descriptor_set->vk_descriptor_writes[0].pTexelBufferView = &vk_buffer_view; + break; + default: + assert(false); + break; + } + VK_CALL(vkUpdateDescriptorSets(device->vk_device, 1, descriptor_set->vk_descriptor_writes, 0, NULL)); + } +} + /* dst and src contain the same data unless another thread overwrites dst. The array index is * calculated from dst, and src is thread safe. */ static void d3d12_desc_write_vk_heap(const struct d3d12_desc *dst, const struct d3d12_desc *src, @@ -2186,6 +2228,7 @@ static void d3d12_desc_write_vk_heap(const struct d3d12_desc *dst, const struct struct d3d12_descriptor_heap_vk_set *descriptor_set; struct d3d12_descriptor_heap *descriptor_heap; const struct vkd3d_vk_device_procs *vk_procs; + bool is_null = false; descriptor_heap = vkd3d_gpu_descriptor_allocator_heap_from_descriptor(&device->gpu_descriptor_allocator, dst); descriptor_set = &descriptor_heap->vk_descriptor_sets[vkd3d_vk_descriptor_set_index_from_vk_descriptor_type( @@ -2201,14 +2244,16 @@ static void d3d12_desc_write_vk_heap(const struct d3d12_desc *dst, const struct { case VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER: descriptor_set->vk_descriptor_writes[0].pBufferInfo = &src->u.vk_cbv_info; + is_null = !src->u.vk_cbv_info.buffer; break; case VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE: case VK_DESCRIPTOR_TYPE_STORAGE_IMAGE: - descriptor_set->vk_image_infos[0].imageView = src->u.view_info.view->u.vk_image_view; + is_null = !(descriptor_set->vk_image_infos[0].imageView = src->u.view_info.view->u.vk_image_view); break; case VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER: case VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER: descriptor_set->vk_descriptor_writes[0].pTexelBufferView = &src->u.view_info.view->u.vk_buffer_view; + is_null = !src->u.view_info.view->u.vk_buffer_view; break; case VK_DESCRIPTOR_TYPE_SAMPLER: descriptor_set->vk_image_infos[0].sampler = src->u.view_info.view->u.vk_sampler; @@ -2217,6 +2262,14 @@ static void d3d12_desc_write_vk_heap(const struct d3d12_desc *dst, const struct ERR("Unhandled descriptor type %#x.\n", src->vk_descriptor_type); break; } + if (is_null && device->vk_info.EXT_robustness2) + { + d3d12_desc_write_vk_heap_null_descriptor(descriptor_heap, + descriptor_set->vk_descriptor_writes[0].dstArrayElement, device); + vkd3d_mutex_unlock(&descriptor_heap->vk_sets_mutex); + return; + } + VK_CALL(vkUpdateDescriptorSets(device->vk_device, 1, descriptor_set->vk_descriptor_writes, 0, NULL)); if (src->magic == VKD3D_DESCRIPTOR_MAGIC_UAV && src->u.view_info.view->vk_counter_view)

1 0