March 2019 - Wine-Devel - list.winehq.org

[PATCH] testbot/WineRunReconfig: Fix error handling.
by Francois Gouget March 29, 2019

March 29, 2019

It only makes sense to defer errors until we have retrieved the reconfiguration log, at which point we either clear errors if it indicates success, or handle any previous error. Retrieving any binaries and data files should come after that. This avoids using an undefined $NewStatus when connection errors occur. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineRunReconfig.pl | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 2c8acdd6..dcf36f8a 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -413,6 +413,16 @@ elsif (!defined $TAError) $TAError = "An error occurred while retrieving the reconfig log: ". $TA->GetLastError(); } +# Report the reconfig errors even though they may have been caused by +# TestAgent trouble. +LogTaskError($ErrMessage) if (defined $ErrMessage); +FatalTAError(undef, $TAError) if (defined $TAError); + + +# +# Grab the test executables and reference files +# + if ($NewStatus eq "completed") { use File::Copy; @@ -427,7 +437,7 @@ if ($NewStatus eq "completed") } elsif (!defined $TAError) { - $TAError = "An error occurred while retrieving the $Bitness bit TestLauncher: ". $TA->GetLastError(); + FatalTAError($TA, "An error occurred while retrieving the $Bitness bit TestLauncher"); } } } @@ -441,18 +451,13 @@ if ($NewStatus eq "completed") } elsif (!defined $TAError) { - $TAError = "An error occurred while retrieving '$TaskDir/$FileName': ". $TA->GetLastError(); + FatalTAError($TA, "An error occurred while retrieving '$TaskDir/$FileName'"); } } } $TA->Disconnect(); -# Report the reconfig errors even though they may have been caused by -# TestAgent trouble. -LogTaskError($ErrMessage) if (defined $ErrMessage); -FatalTAError(undef, $TAError) if (defined $TAError); - # # Update the build VM's snapshot -- 2.20.1

1 0

[PATCH 1/4] include: Add IMFMediaStream definition.
by Nikolay Sivov March 29, 2019

March 29, 2019

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- include/mfidl.idl | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/include/mfidl.idl b/include/mfidl.idl index 22a22a8535..ac59e0cb69 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -525,6 +525,26 @@ interface IMFMediaSource : IMFMediaEventGenerator HRESULT Shutdown(); } +[ + object, + uuid(d182108f-4ec6-443f-aa42-a71106ec825f), +] +interface IMFMediaStream : IMFMediaEventGenerator +{ + HRESULT GetMediaSource( + [out] IMFMediaSource **source); + + HRESULT GetStreamDescriptor( + [out] IMFStreamDescriptor **descriptor); + + [local] + HRESULT RequestSample( + [in] IUnknown *token); + + [call_as(RequestSample)] + HRESULT RemoteRequestSample(); +} + interface IMFStreamSink; [ -- 2.20.1

1 3

[PATCH] po: Update Finnish translation.
by Lauri Kenttä March 29, 2019

March 29, 2019

Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> --- po/fi.po | 62 ++++---------------------------------------------------- 1 file changed, 4 insertions(+), 58 deletions(-) diff --git a/po/fi.po b/po/fi.po index ee79051ea4..f9975481b9 100644 --- a/po/fi.po +++ b/po/fi.po @@ -10871,10 +10871,6 @@ msgstr "" "Niitä ei voi käyttää yhdessä." #: winmm.rc:128 -#, fuzzy -#| msgid "" -#| "The specified MIDI port is already in use. Wait until it is free; then " -#| "try again." msgid "" "The specified MIDI port is already in use. Wait until it is free, and then " "try again." @@ -10895,10 +10891,6 @@ msgid "An error occurred with the specified port." msgstr "Annetun portin käytössä tapahtui virhe." #: winmm.rc:133 -#, fuzzy -#| msgid "" -#| "All multimedia timers are being used by other applications. Quit one of " -#| "these applications; then, try again." msgid "" "All multimedia timers are being used by other applications. Quit one of " "these applications, and then try again." @@ -15207,10 +15199,6 @@ msgid "Drive configuration" msgstr "Asemien asetukset" #: winecfg.rc:233 -#, fuzzy -#| msgid "" -#| "Failed to connect to the mount manager, the drive configuration cannot be " -#| "edited." msgid "" "Failed to connect to the mount manager; the drive configuration cannot be " "edited." @@ -15499,12 +15487,6 @@ msgid "System drive" msgstr "Järjestelmäasema" #: winecfg.rc:76 -#, fuzzy -#| msgid "" -#| "Are you sure you want to delete drive C?\n" -#| "\n" -#| "Most Windows applications expect drive C to exist, and will die messily " -#| "if it doesn't. If you proceed remember to recreate it!" msgid "" "Are you sure you want to delete drive C?\n" "\n" @@ -15513,8 +15495,8 @@ msgid "" msgstr "" "Oletko varma, että haluat poistaa C-aseman?\n" "\n" -"Useimmat Windows-ohjelmat odottavat, että C-asema on olemassa, ja kokevat " -"kurjan kuoleman, jos sitä ei ole. Jos jatkat, muista luoda se uudelleen!" +"Monet Windows-ohjelmat olettavat, että C-asema on olemassa, ja saattavat " +"kaatua oudosti, jos sitä ei ole. Jos jatkat, muista luoda uusi C-asema!" #: winecfg.rc:77 msgctxt "Drive letter" @@ -16790,42 +16772,6 @@ msgid "D" msgstr "H" #: xcopy.rc:81 -#, fuzzy -#| msgid "" -#| "XCOPY - Copies source files or directory trees to a destination.\n" -#| "\n" -#| "Syntax:\n" -#| "XCOPY source [destination] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n" -#| "\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n" -#| "\n" -#| "Where:\n" -#| "\n" -#| "[/I] Assume directory if destination does not exist and copying two or\n" -#| "\tmore files.\n" -#| "[/S] Copy directories and subdirectories.\n" -#| "[/E] Copy directories and subdirectories, including any empty ones.\n" -#| "[/Q] Do not list names during copy, that is be quiet.\n" -#| "[/F] Show full source and destination names during copy.\n" -#| "[/L] Simulate operation, showing names which would be copied.\n" -#| "[/W] Prompts before beginning the copy operation.\n" -#| "[/T] Creates empty directory structure but does not copy files.\n" -#| "[/Y] Suppress prompting when overwriting files.\n" -#| "[/-Y] Enable prompting when overwriting files.\n" -#| "[/P] Prompts on each source file before copying.\n" -#| "[/N] Copy using short names.\n" -#| "[/U] Copy only files which already exist in destination.\n" -#| "[/R] Overwrite any read only files.\n" -#| "[/H] Include hidden and system files in the copy.\n" -#| "[/C] Continue even if an error occurs during the copy.\n" -#| "[/A] Only copy files with archive attribute set.\n" -#| "[/M] Only copy files with archive attribute set, removes the\n" -#| "\tarchive attribute.\n" -#| "[/K] Copy file attributes, without this attributes are not preserved.\n" -#| "[/D | /D:m-d-y] Copy new files or those modified after the supplied " -#| "date.\n" -#| "\t\tIf no date is supplied, only copy if destination is older\n" -#| "\t\tthan source.\n" -#| "\n" msgid "" "XCOPY - Copies source files or directory trees to a destination.\n" "\n" @@ -16872,7 +16818,7 @@ msgstr "" "[/I] Oleta hakemisto, jos kohdetta ei ole ja kopioidaan useampi tiedosto.\n" "[/S] Kopioi hakemistot ja alihakemistot.\n" "[/E] Kopioi hakemistot ja alihakemistot, myös tyhjät.\n" -"[/Q] Älä listaa nimiä kopioitaessa eli toimi hiljaa.\n" +"[/Q] Älä listaa nimiä kopioitaessa vaan toimi hiljaa.\n" "[/F] Näytä koko lähde- ja kohdenimet, kun kopioidaan.\n" "[/L] Simuloi toiminto ja näytä nimet, jotka kopioitaisiin.\n" "[/W] Kysy ennen kopioinnin aloittamista.\n" @@ -16882,7 +16828,7 @@ msgstr "" "[/P] Kysy jokaisesta lähdetiedostosta ennen kopiointia.\n" "[/N] Kopioi käyttäen lyhyitä nimiä.\n" "[/U] Kopioi vain tiedostot, jotka ovat jo olemassa kohteessa.\n" -"[/R] Kirjoita yli, jos kohdetiedostolla on vain luku -attribuutti.\n" +"[/R] Kirjoita yli, vaikka kohdetiedostolla olisi vain luku -attribuutti.\n" "[/H] Sisällytä kopioon piilotetut ja järjestelmätiedostot.\n" "[/C] Jatka, vaikka kopioinnin aikana tulisi virhe.\n" "[/A] Kopioi vain tiedostot, joilla on arkistointiattribuutti.\n" -- 2.21.0

1 0

[PATCH] TestBot/TestAgent: Old Net::OpenSSH versions don't have disconnect().
by Francois Gouget March 29, 2019

March 29, 2019

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/TestAgent.pm | 1 - 1 file changed, 1 deletion(-) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index 3e0e099a..15da924f 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -130,7 +130,6 @@ sub Disconnect($) { # This may close the SSH channel ($self->{fd}) as a side-effect, # which will avoid undue delays. - $self->{ssh}->disconnect(); $self->{ssh} = undef; waitpid($self->{sshpid}, 0); $self->{sshpid} = undef; -- 2.20.1

1 0

[PATCH] progman: Add missing apostrophe to IDS_SAVE_GROUP_AS_s string.
by Isira Seneviratne March 29, 2019

March 29, 2019

1 0

GSoC Proposal: Parsing a software package to determine its level of support
by Daniel A. March 28, 2019

March 28, 2019

Hello, I'm a computer science student currently in 3rd year in prospect of drafting a Summer Code proposal for this year and so: Wouldn't it be nice if Wine could parse a folder containing a software and output a guessed rating without running it listing the unsupported libraries? For example, let's take a MMO game as example, it does not work initially because it uses an anti-hack software currently unsupported by Wine; so people will stop there and give it a Garbage rating. But finding a fix for it might not make it runnable still, there may be another thing inside that prevents it from running but it wasn't documented because no one got past the initial issue. Hence, a tool that provides an evaluation of everything that would be currently unsupported by Wine could be valuable. Initial ideas could be: * Tie folder names into known software in the database * Analyze .dll files to determine whether unsupported functions are present For example, it'd be able to start from the following: "A good chunk of those APIs has been implemented but a lot is still missing, such as: some math functions (what's left is mostly about spherical harmonics and precomputed radiance transfer) some mesh functions (D3DXComputeNormals(), D3DXOptimizeVertices(), ...) a few texture functions quite a few ID3DXConstantTable methods effect framework bits and pieces drawing text in ID3DXFont" and determine if a software is not supported because it uses these. What do you think?

3 2

RFC: Junction Point/NT Symlink Support
by Erich E. Hoover March 28, 2019

March 28, 2019

A number of years ago I put together a patchset for Junction Points that was rejected for two very good reasons: 1) there was no mechanism to atomically replace a directory with a Unix Symlink 2) there was no way to tell the difference between Junction Points and NT Symlinks The first issue has been addressed in the kernel by the implementation of renameat2 with the RENAME_EXCHANGE flag. I've actually been maintaining a version of my patches with support for this for a few years, but renameat2 kernel support has only recently been included in long-term releases of the major distributions and it wasn't added to glibc until late last year (2.28). So, this issue is finally resolvable. It's the second issue that has been more of a problem. The major difference between Junction Points and NT Symlinks is that JPs are resolved by the "server" system and NT Symlinks are resolved by the "client" system. For Wine this doesn't matter so much, since we never have a "server" situation, so both can be treated as Unix Symlinks. The problem with this approach is that many applications that create and use Junction Points and NT Symlinks _do_ care what type they are. If such an application creates a Junction Point, reads it back, and we report an NT Symlink then the application can have a variety of issues (the struct returned by FSCTL_GET_REPARSE_POINT is completely different between the two object types). So, it seems that we cannot properly implement either Junction Points or NT Symlinks until we have a way to implement both. Proposed Solution: Since the operating system treats symlinks as special files, we do not have the ability to apply extended attributes, access controls, or permissions* to these files. This severely restricts our options, and for a number of years I have been struggling with finding solutions that don't involve some sort of brittle record keeping. However, I recently realized that the OS does "keep track of" file access and modification times for Unix Symlinks and that they are never updated when they are "accessed" or moved (the file times are only changed when the link itself is changed, as one would expect). So, I would like to propose that we store the "ReparseTag" in the st_atime for the link (since the modification time is reported by "ls") and the additional NT Symlink-specific flags in the OS-specific tv_usec/tv_nsec portion of the access time (in microseconds, for greatest portability). This solution provides a variety of benefits: 1) the type of link (JP/Symlink) is retained when the link is moved 2) no additional record keeping on Wine's part is required 3) the link behaves correctly outside of Wine (it's not a special text file, or something similar) 4) the "ls" command still reports the "correct" time for the link But has one downside: 1) tar-ing/untar-ing does not retain the type of the link (to my knowledge, tar has no way to store access times) Another choice, of course, is to use the modification time instead of the access time. This has the benefit of having tar retain the link type with the downside of "ls" reporting an "incorrect" time for the link. This option may be a better choice, since it allows tar-ing/untar-ing prefixes without losing the link type. So, I have some questions for the group: 1) Does this approach seem reasonable in general? 2) Should the information be stored in the access time (correct "ls" behavior) or the modification time (correct "tar" behavior)? 3) Is there anything else that I'm missing? Best, Erich *Some Unix systems apparently allow different permissions on symlinks (and ignore them), but Linux does not.

3 9

[PATCH] testbot/TestAgent: Use Net::OpenSSH instead of Net::SSH2.
by Francois Gouget March 28, 2019

March 28, 2019

Net::SSH2 just suffers from too many compatiblity issues with OpenSSH servers. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This should fix the TestBot! testbot/lib/WineTestBot/TestAgent.pm | 148 +++++---------------------- 1 file changed, 26 insertions(+), 122 deletions(-) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index 21bb534d..3e0e099a 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -3,7 +3,7 @@ # to run scripts. # # Copyright 2009 Ge van Geldorp -# Copyright 2012-2016 Francois Gouget +# Copyright 2012-2019 Francois Gouget # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -101,9 +101,7 @@ sub new($$$;$) my $self = { agenthost => $Hostname, - host => $Hostname, agentport => $Port, - port => $Port, connection => "$Hostname:$Port", ctimeout => 20, cattempts => 3, @@ -114,9 +112,9 @@ sub new($$$;$) err => undef}; if ($Tunnel) { - $self->{host} = $Tunnel->{sshhost} || $Hostname; - $self->{port} = $Tunnel->{sshport} || 22; - $self->{connection} = "$self->{host}:$self->{port}:$self->{connection}"; + $Tunnel->{sshhost} ||= $Hostname; + $Tunnel->{sshport} ||= 22; + $self->{connection} = "$Tunnel->{sshhost}:$Tunnel->{sshport}:$self->{connection}"; $self->{tunnel} = $Tunnel; } @@ -134,12 +132,8 @@ sub Disconnect($) # which will avoid undue delays. $self->{ssh}->disconnect(); $self->{ssh} = undef; - $self->{nc} = undef; - } - if ($self->{sshfd}) - { - close($self->{sshfd}); - $self->{sshfd} = undef; + waitpid($self->{sshpid}, 0); + $self->{sshpid} = undef; } if ($self->{fd}) { @@ -210,39 +204,7 @@ sub _SetError($$$) $self->{err} = $Msg; # And disconnect on fatal errors since the connection is unusable anyway - if ($Level == $FATAL) - { - if ($self->{ssh}) - { - # Try to capture the netcat exit code and error message as - # they may provide important clues as to what went wrong - my $rc = $self->{fd}->exit_status(); - if ($rc) - { - my $ncerr; - eval - { - local $SIG{ALRM} = sub { die "timeout" }; - alarm(2); - $self->{fd}->read($ncerr, 1024, 1); - alarm(0); - }; - $ncerr = $rc if (!$ncerr); - $ncerr = "the \"$self->{nc}\" command returned $ncerr"; - if ($self->{agentversion}) - { - $self->{err} .= "\n$ncerr"; - } - else - { - # The real issue is that we failed to connect so - # ignore the _RecvString('AgentVersion') error message - $self->{err} = "$ncerr ($self->{rpc})"; - } - } - } - $self->Disconnect(); - } + $self->Disconnect() if ($Level == $FATAL); } elsif (!$self->{err}) { @@ -888,8 +850,7 @@ if ($@) sub _ssherror($) { my ($self) = @_; - my @List = $self->{ssh}->error(); - return $List[2]; + return $self->{ssh}->error(); } sub _Connect($) @@ -910,102 +871,45 @@ sub _Connect($) $self->{deadline} = $self->{ctimeout} ? time() + $self->{ctimeout} : undef; $self->_SetAlarm(); - $Step = "create_socket"; - $self->{fd} = &$create_socket(PeerHost => $self->{host}, - PeerPort => $self->{port}, - Type => SOCK_STREAM); - if (!$self->{fd}) - { - alarm(0); - $self->_SetError($FATAL, $!); - return; # out of eval - } - if ($self->{tunnel}) { # We are in fact connected to the SSH server. # Now forward that connection to the TestAgent server. $Step = "tunnel_connect"; - $self->{sshfd} = $self->{fd}; - $self->{fd} = undef; - require Net::SSH2; - $self->{ssh} = Net::SSH2->new(); - $self->{ssh}->debug(1) if ($Debug > 1); - - # Set up compression - $self->{ssh}->method('COMP_CS', 'zlib', 'none'); - $self->{ssh}->method('COMP_SC', 'zlib', 'none'); - - if (!$self->{ssh}->connect($self->{sshfd})) + require Net::OpenSSH; + $Net::OpenSSH::debug = ~0 if ($Debug > 1); + $self->{ssh} = Net::OpenSSH->new($self->{tunnel}->{sshhost}, + port => $self->{tunnel}->{sshport}, + user => $self->{tunnel}->{username}, + key_path => $self->{tunnel}->{privatekey}, + batch_mode => 1); + if ($self->_ssherror()) { alarm(0); $self->_SetError($FATAL, "Unable to connect to the SSH server: " . $self->_ssherror()); return; # out of eval } - # Authenticate ourselves - $Step = "tunnel_auth"; - my $Tunnel = $self->{tunnel}; - my %AuthOptions=(username => $Tunnel->{username} || $ENV{USER}); - foreach my $Key ("username", "password", "publickey", "privatekey", - "hostname", "local_username") - { - $AuthOptions{$Key} = $Tunnel->{$Key} if (defined $Tunnel->{$Key}); - } - # Old versions of Net::SSH2 won't automatically find DSA keys, - # and new ones still won't automatically find RSA ones. - if (defined $ENV{HOME} and !exists $AuthOptions{"privatekey"} and - !exists $AuthOptions{"publickey"}) - { - foreach my $key ("id_dsa", "id_rsa") - { - if (-f "$ENV{HOME}/.ssh/$key" and -f "$ENV{HOME}/.ssh/$key.pub") - { - $AuthOptions{"privatekey"} = "$ENV{HOME}/.ssh/$key"; - $AuthOptions{"publickey"} = "$ENV{HOME}/.ssh/$key.pub"; - last; - } - } - } - # Interactive authentication makes no sense with automatic reconnects - $AuthOptions{interact} = 0; - if (!$self->{ssh}->auth(%AuthOptions)) - { - alarm(0); - # auth() returns no error of any sort :-( - $self->_SetError($FATAL, "Unable to authenticate to the SSH server"); - return; # out of eval - } - $Step = "tunnel_channel"; - $self->{fd} = $self->{ssh}->channel(); + ($self->{fd}, $self->{sshpid}) = $self->{ssh}->open_tunnel($self->{agenthost}, $self->{agentport}); if (!$self->{fd}) { alarm(0); $self->_SetError($FATAL, "Unable to create the SSH channel: " . $self->_ssherror()); return; # out of eval } - - # Check that the agent hostname and port won't mess with quoting. - if ($self->{agenthost} !~ /^[-a-zA-Z0-9.]*$/ or - $self->{agentport} !~ /^[a-zA-Z0-9]*$/) - { - alarm(0); - $self->_SetError($FATAL, "The agent hostname or port is invalid"); - return; # out of eval - } - - # Use netcat to forward the connection from the SSH server to the - # TestAgent server. Note that we won't know about netcat errors at - # this point. - $Step = "tunnel_netcat"; - $self->{nc} = "nc -q0 '$self->{agenthost}' '$self->{agentport}'"; - debug("Tunneling command: $self->{nc}\n"); - if (!$self->{fd}->exec($self->{nc})) + } + else + { + $Step = "create_socket"; + $self->{fd} = &$create_socket(PeerHost => $self->{host}, + PeerPort => $self->{port}, + Type => SOCK_STREAM); + if (!$self->{fd}) { alarm(0); - $self->_SetError($FATAL, "Unable to start netcat ($self->{rpc}): " . $self->_ssherror()); + $self->_SetError($FATAL, $!); return; # out of eval } } -- 2.20.1

1 0

[PATCH vkd3d 4/7] vkd3d: Use dedicated allocation for committed resources.
by Józef Kucia March 28, 2019

March 28, 2019

From: Józef Kucia <jkucia(a)codeweavers.com> Dedicated allocations may improve the performance. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/device.c | 2 + libs/vkd3d/resource.c | 90 ++++++++++++++++++++++++++++++++++---- libs/vkd3d/vkd3d_private.h | 9 +++- libs/vkd3d/vulkan_procs.h | 14 +++++- 4 files changed, 102 insertions(+), 13 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index bc5f370ba635..8676434213ea 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -126,6 +126,8 @@ static const char * const required_device_extensions[] = static const struct vkd3d_optional_extension_info optional_device_extensions[] = { + {VK_KHR_DEDICATED_ALLOCATION_EXTENSION_NAME, offsetof(struct vkd3d_vulkan_info, KHR_dedicated_allocation)}, + {VK_KHR_GET_MEMORY_REQUIREMENTS_2_EXTENSION_NAME, offsetof(struct vkd3d_vulkan_info, KHR_get_memory_requirements2)}, {VK_KHR_PUSH_DESCRIPTOR_EXTENSION_NAME, offsetof(struct vkd3d_vulkan_info, KHR_push_descriptor)}, {VK_EXT_DEBUG_MARKER_EXTENSION_NAME, offsetof(struct vkd3d_vulkan_info, EXT_debug_marker)}, {VK_EXT_TRANSFORM_FEEDBACK_EXTENSION_NAME, diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 1cfc9b318d5d..8e16a854c65b 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -74,7 +74,9 @@ static unsigned int vkd3d_select_memory_type(struct d3d12_device *device, uint32 static HRESULT vkd3d_allocate_device_memory(struct d3d12_device *device, const D3D12_HEAP_PROPERTIES *heap_properties, D3D12_HEAP_FLAGS heap_flags, - const VkMemoryRequirements *memory_requirements, VkDeviceMemory *vk_memory, uint32_t *vk_memory_type) + const VkMemoryRequirements *memory_requirements, + const VkMemoryDedicatedAllocateInfo *dedicated_allocate_info, + VkDeviceMemory *vk_memory, uint32_t *vk_memory_type) { const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; VkMemoryAllocateInfo allocate_info; @@ -84,7 +86,7 @@ static HRESULT vkd3d_allocate_device_memory(struct d3d12_device *device, memory_requirements->size, memory_requirements->alignment); allocate_info.sType = VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO; - allocate_info.pNext = NULL; + allocate_info.pNext = dedicated_allocate_info; allocate_info.allocationSize = memory_requirements->size; allocate_info.memoryTypeIndex = vkd3d_select_memory_type(device, memory_requirements->memoryTypeBits, heap_properties, heap_flags); @@ -404,7 +406,7 @@ static HRESULT d3d12_heap_init(struct d3d12_heap *heap, } if (FAILED(hr = vkd3d_allocate_device_memory(device, &heap->desc.Properties, - heap->desc.Flags, &memory_requirements, &heap->vk_memory, &heap->vk_memory_type))) + heap->desc.Flags, &memory_requirements, NULL, &heap->vk_memory, &heap->vk_memory_type))) { vkd3d_private_store_destroy(&heap->private_store); pthread_mutex_destroy(&heap->mutex); @@ -673,13 +675,48 @@ HRESULT vkd3d_allocate_buffer_memory(struct d3d12_device *device, VkBuffer vk_bu VkDeviceMemory *vk_memory) { const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; - VkMemoryRequirements memory_requirements; + VkMemoryDedicatedAllocateInfo *dedicated_allocation = NULL; + VkMemoryDedicatedRequirements dedicated_requirements; + VkMemoryDedicatedAllocateInfo dedicated_info; + VkMemoryRequirements2 memory_requirements2; + VkMemoryRequirements *memory_requirements; + VkBufferMemoryRequirementsInfo2 info; VkResult vr; HRESULT hr; - VK_CALL(vkGetBufferMemoryRequirements(device->vk_device, vk_buffer, &memory_requirements)); + memory_requirements = &memory_requirements2.memoryRequirements; + + if (device->vk_info.KHR_dedicated_allocation) + { + info.sType = VK_STRUCTURE_TYPE_BUFFER_MEMORY_REQUIREMENTS_INFO_2; + info.pNext = NULL; + info.buffer = vk_buffer; + + dedicated_requirements.sType = VK_STRUCTURE_TYPE_MEMORY_DEDICATED_REQUIREMENTS; + dedicated_requirements.pNext = NULL; + + memory_requirements2.sType = VK_STRUCTURE_TYPE_MEMORY_REQUIREMENTS_2; + memory_requirements2.pNext = &dedicated_requirements; + + VK_CALL(vkGetBufferMemoryRequirements2KHR(device->vk_device, &info, &memory_requirements2)); + + if (dedicated_requirements.prefersDedicatedAllocation) + { + dedicated_allocation = &dedicated_info; + + dedicated_info.sType = VK_STRUCTURE_TYPE_MEMORY_DEDICATED_ALLOCATE_INFO; + dedicated_info.pNext = NULL; + dedicated_info.image = VK_NULL_HANDLE; + dedicated_info.buffer = vk_buffer; + } + } + else + { + VK_CALL(vkGetBufferMemoryRequirements(device->vk_device, vk_buffer, memory_requirements)); + } + if (FAILED(hr = vkd3d_allocate_device_memory(device, heap_properties, heap_flags, - &memory_requirements, vk_memory, NULL))) + memory_requirements, dedicated_allocation, vk_memory, NULL))) return hr; if ((vr = VK_CALL(vkBindBufferMemory(device->vk_device, vk_buffer, *vk_memory, 0))) < 0) @@ -697,13 +734,48 @@ static HRESULT vkd3d_allocate_image_memory(struct d3d12_device *device, VkImage VkDeviceMemory *vk_memory) { const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; - VkMemoryRequirements memory_requirements; + VkMemoryDedicatedAllocateInfo *dedicated_allocation = NULL; + VkMemoryDedicatedRequirements dedicated_requirements; + VkMemoryDedicatedAllocateInfo dedicated_info; + VkMemoryRequirements2 memory_requirements2; + VkMemoryRequirements *memory_requirements; + VkImageMemoryRequirementsInfo2 info; VkResult vr; HRESULT hr; - VK_CALL(vkGetImageMemoryRequirements(device->vk_device, vk_image, &memory_requirements)); + memory_requirements = &memory_requirements2.memoryRequirements; + + if (device->vk_info.KHR_dedicated_allocation) + { + info.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_REQUIREMENTS_INFO_2; + info.pNext = NULL; + info.image = vk_image; + + dedicated_requirements.sType = VK_STRUCTURE_TYPE_MEMORY_DEDICATED_REQUIREMENTS; + dedicated_requirements.pNext = NULL; + + memory_requirements2.sType = VK_STRUCTURE_TYPE_MEMORY_REQUIREMENTS_2; + memory_requirements2.pNext = &dedicated_requirements; + + VK_CALL(vkGetImageMemoryRequirements2KHR(device->vk_device, &info, &memory_requirements2)); + + if (dedicated_requirements.prefersDedicatedAllocation) + { + dedicated_allocation = &dedicated_info; + + dedicated_info.sType = VK_STRUCTURE_TYPE_MEMORY_DEDICATED_ALLOCATE_INFO; + dedicated_info.pNext = NULL; + dedicated_info.image = vk_image; + dedicated_info.buffer = VK_NULL_HANDLE; + } + } + else + { + VK_CALL(vkGetImageMemoryRequirements(device->vk_device, vk_image, memory_requirements)); + } + if (FAILED(hr = vkd3d_allocate_device_memory(device, heap_properties, heap_flags, - &memory_requirements, vk_memory, NULL))) + memory_requirements, dedicated_allocation, vk_memory, NULL))) return hr; if ((vr = VK_CALL(vkBindImageMemory(device->vk_device, vk_image, *vk_memory, 0))) < 0) diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index ab6629112383..babe5db23363 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -83,11 +83,16 @@ HRESULT hresult_from_vkd3d_result(int vkd3d_result) DECLSPEC_HIDDEN; struct vkd3d_vulkan_info { - /* instance extensions */ + /* KHR instance extensions */ bool KHR_get_physical_device_properties2; + /* EXT instance extensions */ bool EXT_debug_report; - /* device extensions */ + + /* KHR device extensions */ + bool KHR_dedicated_allocation; + bool KHR_get_memory_requirements2; bool KHR_push_descriptor; + /* EXT device extensions */ bool EXT_debug_marker; bool EXT_transform_feedback; bool EXT_vertex_attribute_divisor; diff --git a/libs/vkd3d/vulkan_procs.h b/libs/vkd3d/vulkan_procs.h index b62af4e2e50d..d176f2417441 100644 --- a/libs/vkd3d/vulkan_procs.h +++ b/libs/vkd3d/vulkan_procs.h @@ -46,9 +46,11 @@ VK_INSTANCE_PFN(vkGetPhysicalDeviceMemoryProperties) VK_INSTANCE_PFN(vkGetPhysicalDeviceProperties) VK_INSTANCE_PFN(vkGetPhysicalDeviceQueueFamilyProperties) VK_INSTANCE_PFN(vkGetPhysicalDeviceSparseImageFormatProperties) + /* VK_KHR_get_physical_device_properties2 */ VK_INSTANCE_EXT_PFN(vkGetPhysicalDeviceFeatures2KHR) VK_INSTANCE_EXT_PFN(vkGetPhysicalDeviceProperties2KHR) + /* VK_EXT_debug_report */ VK_INSTANCE_EXT_PFN(vkCreateDebugReportCallbackEXT) VK_INSTANCE_EXT_PFN(vkDestroyDebugReportCallbackEXT) @@ -174,10 +176,18 @@ VK_DEVICE_PFN(vkSetEvent) VK_DEVICE_PFN(vkUnmapMemory) VK_DEVICE_PFN(vkUpdateDescriptorSets) VK_DEVICE_PFN(vkWaitForFences) -/* VK_EXT_debug_marker */ -VK_DEVICE_EXT_PFN(vkDebugMarkerSetObjectNameEXT) + +/* VK_KHR_get_memory_requirements2 */ +VK_DEVICE_EXT_PFN(vkGetBufferMemoryRequirements2KHR) +VK_DEVICE_EXT_PFN(vkGetImageMemoryRequirements2KHR) +VK_DEVICE_EXT_PFN(vkGetImageSparseMemoryRequirements2KHR) + /* VK_KHR_push_descriptor */ VK_DEVICE_EXT_PFN(vkCmdPushDescriptorSetKHR) + +/* VK_EXT_debug_marker */ +VK_DEVICE_EXT_PFN(vkDebugMarkerSetObjectNameEXT) + /* VK_EXT_transform_feedback */ VK_DEVICE_EXT_PFN(vkCmdBeginQueryIndexedEXT) VK_DEVICE_EXT_PFN(vkCmdBeginTransformFeedbackEXT) -- 2.19.2

2 1

[PATCH vkd3d 7/7] tests: Add simple test for 2D NULL SRVs.
by Józef Kucia March 28, 2019

March 28, 2019

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 168 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 168 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index edd1f5954688..1eca3b9c6063 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -15801,6 +15801,173 @@ static void test_null_cbv(void) destroy_test_context(&context); } +static void test_null_srv(void) +{ + D3D12_SHADER_RESOURCE_VIEW_DESC srv_desc; + ID3D12GraphicsCommandList *command_list; + struct test_context_desc desc; + struct test_context context; + ID3D12DescriptorHeap *heap; + ID3D12CommandQueue *queue; + struct uvec4 location; + ID3D12Device *device; + unsigned int i, j; + + static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; + static const DWORD ps_sample_code[] = + { +#if 0 + Texture2D t; + SamplerState s; + + float4 main(float4 position : SV_Position) : SV_Target + { + return t.Sample(s, float2(position.x / 32.0f, position.y / 32.0f)); + } +#endif + 0x43425844, 0xe096fa11, 0xeb01c081, 0x961588d4, 0x27c031af, 0x00000001, 0x00000140, 0x00000003, + 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000030f, 0x505f5653, 0x7469736f, 0x006e6f69, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, + 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x000000a4, 0x00000050, + 0x00000029, 0x0100086a, 0x0300005a, 0x00106000, 0x00000000, 0x04001858, 0x00107000, 0x00000000, + 0x00005555, 0x04002064, 0x00101032, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, + 0x02000068, 0x00000001, 0x0a000038, 0x00100032, 0x00000000, 0x00101046, 0x00000000, 0x00004002, + 0x3d000000, 0x3d000000, 0x00000000, 0x00000000, 0x8b000045, 0x800000c2, 0x00155543, 0x001020f2, + 0x00000000, 0x00100046, 0x00000000, 0x00107e46, 0x00000000, 0x00106000, 0x00000000, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE ps_sample = {ps_sample_code, sizeof(ps_sample_code)}; + static const DWORD ps_ld_code[] = + { +#if 0 + Texture2D t; + + uint4 location; + + float4 main(float4 position : SV_Position) : SV_Target + { + return t.Load(location.xyz); + } +#endif + 0x43425844, 0xfa13670e, 0x291af510, 0xc253cc12, 0x9474950b, 0x00000001, 0x00000100, 0x00000003, + 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x505f5653, 0x7469736f, 0x006e6f69, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, + 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000064, 0x00000050, + 0x00000019, 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x04001858, 0x00107000, + 0x00000000, 0x00005555, 0x03000065, 0x001020f2, 0x00000000, 0x8a00002d, 0x800000c2, 0x00155543, + 0x001020f2, 0x00000000, 0x00208a46, 0x00000000, 0x00000000, 0x00107e46, 0x00000000, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE ps_ld = {ps_ld_code, sizeof(ps_ld_code)}; + static const DXGI_FORMAT formats[] = + { + DXGI_FORMAT_R32_FLOAT, + DXGI_FORMAT_R32_UINT, + DXGI_FORMAT_R8G8B8A8_UNORM, + }; + /* component mapping is ignored for NULL SRVs */ + static const unsigned int component_mappings[] = + { + D3D12_DEFAULT_SHADER_4_COMPONENT_MAPPING, + D3D12_ENCODE_SHADER_4_COMPONENT_MAPPING( + D3D12_SHADER_COMPONENT_MAPPING_FORCE_VALUE_1, + D3D12_SHADER_COMPONENT_MAPPING_FORCE_VALUE_1, + D3D12_SHADER_COMPONENT_MAPPING_FORCE_VALUE_1, + D3D12_SHADER_COMPONENT_MAPPING_FORCE_VALUE_1), + }; + + memset(&desc, 0, sizeof(desc)); + desc.no_root_signature = true; + if (!init_test_context(&context, &desc)) + return; + command_list = context.list; + queue = context.queue; + device = context.device; + + context.root_signature = create_texture_root_signature(context.device, + D3D12_SHADER_VISIBILITY_PIXEL, 4, 0); + + context.pipeline_state = create_pipeline_state(context.device, + context.root_signature, context.render_target_desc.Format, NULL, &ps_sample, NULL); + + heap = create_gpu_descriptor_heap(device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 16); + + for (i = 0; i < ARRAY_SIZE(formats); ++i) + { + for (j = 0; j < ARRAY_SIZE(component_mappings); ++j) + { + vkd3d_test_set_context("format %#x, component mapping %#x", formats[i], component_mappings[j]); + + memset(&srv_desc, 0, sizeof(srv_desc)); + srv_desc.Format = formats[i]; + srv_desc.ViewDimension = D3D12_SRV_DIMENSION_TEXTURE2D; + srv_desc.Shader4ComponentMapping = component_mappings[j]; + srv_desc.Texture2D.MipLevels = 1; + ID3D12Device_CreateShaderResourceView(device, NULL, &srv_desc, + ID3D12DescriptorHeap_GetCPUDescriptorHandleForHeapStart(heap)); + + 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_SetPipelineState(command_list, context.pipeline_state); + ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, 1, &heap); + ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(command_list, 0, + ID3D12DescriptorHeap_GetGPUDescriptorHandleForHeapStart(heap)); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); + + transition_sub_resource_state(command_list, context.render_target, 0, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + check_sub_resource_uint(context.render_target, 0, queue, command_list, 0x00000000, 0); + + reset_command_list(command_list, context.allocator); + transition_sub_resource_state(command_list, context.render_target, 0, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + } + } + vkd3d_test_set_context(NULL); + + ID3D12PipelineState_Release(context.pipeline_state); + context.pipeline_state = create_pipeline_state(context.device, + context.root_signature, context.render_target_desc.Format, NULL, &ps_ld, NULL); + + memset(&srv_desc, 0, sizeof(srv_desc)); + srv_desc.Format = DXGI_FORMAT_R32G32B32A32_FLOAT; + srv_desc.ViewDimension = D3D12_SRV_DIMENSION_TEXTURE2D; + srv_desc.Shader4ComponentMapping = D3D12_DEFAULT_SHADER_4_COMPONENT_MAPPING; + srv_desc.Texture2D.MipLevels = 1; + ID3D12Device_CreateShaderResourceView(device, NULL, &srv_desc, + ID3D12DescriptorHeap_GetCPUDescriptorHandleForHeapStart(heap)); + + 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_SetPipelineState(command_list, context.pipeline_state); + ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, 1, &heap); + ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(command_list, 0, + ID3D12DescriptorHeap_GetGPUDescriptorHandleForHeapStart(heap)); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + location.x = 10; + location.y = 20; + location.z = 0; + location.w = 0; + ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, 1, 4, &location, 0); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); + + transition_sub_resource_state(command_list, context.render_target, 0, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + check_sub_resource_uint(context.render_target, 0, queue, command_list, 0x00000000, 0); + + ID3D12DescriptorHeap_Release(heap); + destroy_test_context(&context); +} + #define check_copyable_footprints(a, b, c, d, e, f, g, h) \ check_copyable_footprints_(__LINE__, a, b, c, d, e, f, g, h) static void check_copyable_footprints_(unsigned int line, const D3D12_RESOURCE_DESC *desc, @@ -26674,6 +26841,7 @@ START_TEST(d3d12) run_test(test_descriptors_visibility); run_test(test_create_null_descriptors); run_test(test_null_cbv); + run_test(test_null_srv); run_test(test_get_copyable_footprints); run_test(test_depth_stencil_sampling); run_test(test_depth_load); -- 2.19.2

2 1