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

Francois Gouget : testbot/web: Allow hiding the full log with a double-click.
by Alexandre Julliard 30 Aug '18

30 Aug '18

Module: tools Branch: master Commit: d08a2d2583992f3b22151c119d60cdd0e4beb477 URL: https://source.winehq.org/git/tools.git/?a=commit;h=d08a2d2583992f3b22151c1… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Aug 30 01:59:08 2018 +0200 testbot/web: Allow hiding the full log with a double-click. This saves the user from having to search for the hard to find start of the (build) log. Special care is taken to not disable word-based selection when double-clicking on the log text itself. To switch back to the summary view one must therefore double-click to the right of the end-of-line. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/JobDetails.pl | 41 +++++++++++++++++++++++++++++++++++------ 1 file changed, 35 insertions(+), 6 deletions(-) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 37185eb..51fb2e9 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -252,7 +252,7 @@ sub InitMoreInfo($) } } -sub GenerateMoreInfoLink($$$;$) +sub GetMoreInfoLink($$$$;$) { my ($self, $LinkKey, $Label, $Set, $Value) = @_; @@ -295,6 +295,14 @@ sub GenerateMoreInfoLink($$$;$) } } $Url .= "#k" . uri_escape($LinkKey); + return ($Action, $Url); +} + +sub GenerateMoreInfoLink($$$$;$) +{ + my ($self, $LinkKey, $Label, $Set, $Value) = @_; + + my ($Action, $Url) = $self->GetMoreInfoLink($LinkKey, $Label, $Set, $Value); my $Html = "<a href='". $self->CGI->escapeHTML($Url) ."'>$Action $Label</a>"; if ($Action eq "Hide") @@ -309,9 +317,9 @@ sub GetErrorCategory($) return "error"; } -sub GenerateFullLog($$;$) +sub GenerateFullLog($$$;$) { - my ($self, $FileName, $Header) = @_; + my ($self, $FileName, $HideLog, $Header) = @_; my $GetCategory = $FileName =~ /\.err$/ ? \&GetErrorCategory : $FileName =~ /\.report$/ ? \&GetReportLineCategory : @@ -326,7 +334,7 @@ sub GenerateFullLog($$;$) if ($IsEmpty) { print $Header if (defined $Header); - print "<pre><code>"; + print "<pre$HideLog><code>"; $IsEmpty = 0; } @@ -353,6 +361,23 @@ sub GenerateBody($) $self->InitMoreInfo(); + print <<EOF; +<script type='text/javascript'> + +</script> +EOF + print "<div class='Content'>\n"; my $Keys = $self->SortKeys(undef, $self->{Collection}->GetKeys()); foreach my $Key (@$Keys) @@ -397,7 +422,11 @@ sub GenerateBody($) # Show this log in full, highlighting the important lines # - my $LogIsEmpty = $self->GenerateFullLog("$TaskDir/$MoreInfo->{Full}"); + my ($Action, $Url) = $self->GetMoreInfoLink($Key, GetLogLabel($MoreInfo->{Full}), "Full", $MoreInfo->{Full}); + $Url = $self->CGI->escapeHTML($Url); + my $HideLog = $Action eq "Hide" ? " ondblclick='HideLog(event, \"$Url\")'" : ""; + + my $LogIsEmpty = $self->GenerateFullLog("$TaskDir/$MoreInfo->{Full}", $HideLog); my $EmptyDiag; if ($LogIsEmpty) { @@ -420,7 +449,7 @@ sub GenerateBody($) my $ErrHeader = $MoreInfo->{Full} =~ /\.report/ ? "report" : "task"; $ErrHeader = "old $ErrHeader" if ($MoreInfo->{Full} =~ /^old_/); $ErrHeader = "<div class='HrTitle'>". ucfirst($ErrHeader) ." errors<div class='HrLine'></div></div>"; - my $ErrIsEmpty = $self->GenerateFullLog("$TaskDir/$MoreInfo->{Full}.err", $ErrHeader); + my $ErrIsEmpty = $self->GenerateFullLog("$TaskDir/$MoreInfo->{Full}.err", $HideLog, $ErrHeader); print $EmptyDiag if ($ErrIsEmpty and defined $EmptyDiag); } else

1 0

Francois Gouget : testbot/WineSendLog: Report TestBot errors to the mailing list too.
by Alexandre Julliard 30 Aug '18

30 Aug '18

Module: tools Branch: master Commit: 3920a8357fa228c63f1ecfd0749cfe5e3ec9d6d0 URL: https://source.winehq.org/git/tools.git/?a=commit;h=3920a8357fa228c63f1ecfd… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Aug 30 01:59:53 2018 +0200 testbot/WineSendLog: Report TestBot errors to the mailing list too. TestBot errors may or may not be caused by the patch but either way they make it impossible to know if there are new errors. Thus the patch requires extra scrutiny anyway. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineSendLog.pl | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index b0efa8c..a4b1c82 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -279,13 +279,10 @@ EOF my $StepTask = $StepsTasks->GetItem($Key); my $TaskDir = $StepTask->GetTaskDir(); - if ($StepTask->Status eq "boterror") - { - # TestBot errors are not the developer's fault and prevent us from - # identifying new errors. So skip. - Error "A Task error was found in '$TaskDir/log.err'\n"; - next; - } + # Note: We could check $StepTask->Status for TestBot errors. However, + # whether they are caused by the patch or not, they prevent the TestBot + # from checking for new errors which justifies sending an email to the + # mailing list so that the patch receives greater scrutiny. foreach my $LogName (@{$JobErrors->{$Key}->{LogNames}}) {

1 0

Francois Gouget : testbot/web: Highlight new errors on the JobDetails page.
by Alexandre Julliard 30 Aug '18

30 Aug '18

Module: tools Branch: master Commit: afe56cb39e47f6337c8eba808a17f5710a4bcfd4 URL: https://source.winehq.org/git/tools.git/?a=commit;h=afe56cb39e47f6337c8eba8… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Aug 30 02:00:22 2018 +0200 testbot/web: Highlight new errors on the JobDetails page. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunBuild.pl | 31 +++++++++++++++++++++++++++++++ testbot/bin/WineSendLog.pl | 2 +- testbot/lib/WineTestBot/LogUtils.pm | 21 +++++++++++++-------- testbot/lib/WineTestBot/Steps.pm | 16 +++++++++++----- testbot/lib/WineTestBot/StepsTasks.pm | 16 +++++++++++----- testbot/web/JobDetails.pl | 24 +++++++++++++++++++++++- testbot/web/WineTestBot.css | 1 + 7 files changed, 91 insertions(+), 20 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index 117b065..11b41c6 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -472,6 +472,37 @@ $TA->Disconnect(); # +# Grab a copy of the reference logs +# + +# Note that this may be a bit inaccurate right after a Wine commit. +# See WineSendLog.pl for more details. +my $LatestDir = "$DataDir/latest"; +foreach my $TestStep (@{$Job->Steps->GetItems()}) +{ + if (($TestStep->PreviousNo || 0) == $Step->No and + $TestStep->FileType =~ /^exe/) + { + foreach my $TestTask (@{$TestStep->Tasks->GetItems()}) + { + my $RefReport = $TestTask->VM->Name ."_". $TestStep->FileType .".report"; + for my $Suffix ("", ".err") + { + if (-f "$LatestDir/$RefReport$Suffix") + { + unlink "$StepDir/$RefReport$Suffix"; + if (!link "$LatestDir/$RefReport$Suffix", "$StepDir/$RefReport$Suffix") + { + Error "Could not link '$RefReport$Suffix': $!\n"; + } + } + } + } + } +} + + +# # Wrap up # diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index a4b1c82..36d47c3 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -288,7 +288,7 @@ EOF { my $LogErrors = $JobErrors->{$Key}->{$LogName}; my $RefFileName = "$DataDir/latest". $StepTask->VM->Name ."_$LogName"; - my ($NewGroups, $NewErrors) = GetNewLogErrors($RefFileName, $LogErrors->{Groups}, $LogErrors->{Errors}); + my ($NewGroups, $NewErrors, $_NewIndices) = GetNewLogErrors($RefFileName, $LogErrors->{Groups}, $LogErrors->{Errors}); if (!$NewGroups) { # There was no reference log (typical of build logs) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 17b9093..5120217 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -781,8 +781,9 @@ sub _GetLineKey($) Compares the specified errors to the reference log and returns only the ones that are new. -Returns a list of error groups containing new errors and a hashtable containing -the list of new errors for each group. +Returns a list of error groups containing new errors, a hashtable containing +the list of new errors for each group, and a hashtable containing the indices +of the new errors in the input errors list for each group. =back =cut @@ -791,10 +792,10 @@ sub GetNewLogErrors($$$) { my ($RefFileName, $Groups, $Errors) = @_; - my ($_Dummy, $RefErrors, $NoLog) = GetLogErrors($RefFileName); - return (undef, undef) if ($NoLog); + my ($RefGroups, $RefErrors) = GetLogErrors($RefFileName); + return (undef, undef) if (!$RefGroups); - my (@NewGroups, %NewErrors); + my (@NewGroups, %NewErrors, %NewIndices); foreach my $GroupName (@$Groups) { if ($RefErrors->{$GroupName}) @@ -802,7 +803,7 @@ sub GetNewLogErrors($$$) my $Diff = Algorithm::Diff->new($RefErrors->{$GroupName}, $Errors->{$GroupName}, { keyGen => \&_GetLineKey }); - my $CurrentGroup; + my ($CurrentGroup, $CurrentIndices); while ($Diff->Next()) { # Skip if there are no new lines @@ -812,20 +813,24 @@ sub GetNewLogErrors($$$) { push @NewGroups, $GroupName; $CurrentGroup = $NewErrors{$GroupName} = []; + $CurrentIndices = $NewIndices{$GroupName} = {}; } push @$CurrentGroup, $Diff->Items(2); + $CurrentIndices->{$_} = 1 for ($Diff->Range(2)); } } else { - # This module did not have errors before, so every error is new + # This group did not have errors before, so every error is new push @NewGroups, $GroupName; $NewErrors{$GroupName} = $Errors->{$GroupName}; + $NewIndices{$GroupName} = {}; my $Last = @{$Errors->{$GroupName}} - 1; + $NewIndices{$GroupName}->{$_} = 1 for (0..$Last); } } - return (\@NewGroups, \%NewErrors); + return (\@NewGroups, \%NewErrors, \%NewIndices); } 1; diff --git a/testbot/lib/WineTestBot/Steps.pm b/testbot/lib/WineTestBot/Steps.pm index 2f5bdb0..ae1180c 100644 --- a/testbot/lib/WineTestBot/Steps.pm +++ b/testbot/lib/WineTestBot/Steps.pm @@ -146,16 +146,22 @@ sub RmTree($) rmtree($Dir); } -sub GetFullFileName($) +sub GetFullFileName($;$) { - my ($self) = @_; + my ($self, $FileName) = @_; - return undef if (!defined $self->FileName); + $FileName = $self->FileName if (!defined $FileName); + return undef if (!defined $FileName); my ($JobId, $StepNo) = @{$self->GetMasterKey()}; my $Path = "$DataDir/jobs/$JobId/"; - $Path .= $self->PreviousNo ."/" if ($self->PreviousNo); - return $Path . $self->FileName; + foreach my $StepNo ($StepNo, $self->PreviousNo) + { + next if (!$StepNo); + my $Full = "$Path$StepNo/$FileName"; + return $Full if (-f $Full); + } + return $Path . $FileName; } sub UpdateStatus($$) diff --git a/testbot/lib/WineTestBot/StepsTasks.pm b/testbot/lib/WineTestBot/StepsTasks.pm index 4675194..a50f61a 100644 --- a/testbot/lib/WineTestBot/StepsTasks.pm +++ b/testbot/lib/WineTestBot/StepsTasks.pm @@ -40,16 +40,22 @@ sub GetStepDir($) } # See WineTestBot::Step::GetFullFileName() -sub GetFullFileName($) +sub GetFullFileName($;$) { - my ($self) = @_; + my ($self, $FileName) = @_; - return undef if (!defined $self->FileName); + $FileName = $self->FileName if (!defined $FileName); + return undef if (!defined $FileName); my ($JobId, $_StepTaskId) = @{$self->GetMasterKey()}; my $Path = "$DataDir/jobs/$JobId/"; - $Path .= $self->PreviousNo ."/" if ($self->PreviousNo); - return $Path . $self->FileName; + foreach my $StepNo ($self->StepNo, $self->PreviousNo) + { + next if (!$StepNo); + my $Full = "$Path$StepNo/$FileName"; + return $Full if (-f $Full); + } + return $Path . $FileName; } sub GetTaskDir($) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 51fb2e9..bcf3231 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -25,6 +25,7 @@ package JobDetailsPage; use ObjectModel::CGI::CollectionPage; our @ISA = qw(ObjectModel::CGI::CollectionPage); +use File::Basename; use URI::Escape; use WineTestBot::Config; @@ -484,11 +485,32 @@ EOF } my $Summary = $LogSummaries->{$LogName}; + my $New; + if ($LogName =~ /\.report$/) + { + # Identify new errors in test reports + my $RefFileName = $StepTask->GetFullFileName($VM->Name ."_$LogName"); + (my $_NewGroups, my $_NewErrors, $New) = GetNewLogErrors($RefFileName, $Summary->{Groups}, $Summary->{Errors}); + } + foreach my $GroupName (@{$Summary->{Groups}}) { print "<div class='LogDllName'>$GroupName:</div>\n" if ($GroupName); + print "<pre><code>"; - print $self->escapeHTML($_), "\n" for (@{$Summary->{Errors}->{$GroupName}}); + my $ErrIndex = 0; + foreach my $Line (@{$Summary->{Errors}->{$GroupName}}) + { + if ($New and $New->{$GroupName}->{$ErrIndex}) + { + print "<span class='log-new'>", $self->escapeHTML($Line), "</span>\n"; + } + else + { + print $self->escapeHTML($Line), "\n"; + } + $ErrIndex++; + } print "</code></pre>\n"; } } diff --git a/testbot/web/WineTestBot.css b/testbot/web/WineTestBot.css index 9656254..88badfe 100644 --- a/testbot/web/WineTestBot.css +++ b/testbot/web/WineTestBot.css @@ -379,6 +379,7 @@ pre .log-error { color: red; } .log-boterror { color: #cc0052; } .log-diag { color: #e56300; } +.log-new { color: #e56e00; font-weight: bold; } a.title { color:inherit; text-decoration: none; }

1 0

Francois Gouget : testbot/web: Don' t put a colon after the module name in the JobDetails page.
by Alexandre Julliard 30 Aug '18

30 Aug '18

Module: tools Branch: master Commit: e98b1419259defcd6ff8dcfb4efb28f957f2df4e URL: https://source.winehq.org/git/tools.git/?a=commit;h=e98b1419259defcd6ff8dcf… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Aug 30 02:00:29 2018 +0200 testbot/web: Don't put a colon after the module name in the JobDetails page. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/JobDetails.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index bcf3231..d10b98e 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -495,7 +495,7 @@ EOF foreach my $GroupName (@{$Summary->{Groups}}) { - print "<div class='LogDllName'>$GroupName:</div>\n" if ($GroupName); + print "<div class='LogDllName'>$GroupName</div>\n" if ($GroupName); print "<pre><code>"; my $ErrIndex = 0;

1 0

Francois Gouget : testbot/web: Make it possible to link to the top and bottom of the page.
by Alexandre Julliard 30 Aug '18

30 Aug '18

Module: tools Branch: master Commit: c0320f46739cae66337a13ab3beb05033bff95f4 URL: https://source.winehq.org/git/tools.git/?a=commit;h=c0320f46739cae66337a13a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Aug 30 02:01:14 2018 +0200 testbot/web: Make it possible to link to the top and bottom of the page. The PageTitle anchor identifies the page's title while the PageEnd one points to the bottom of the page. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/CollectionPage.pm | 2 +- testbot/lib/ObjectModel/CGI/FormPage.pm | 2 +- testbot/lib/WineTestBot/CGI/PageBase.pm | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/CollectionPage.pm b/testbot/lib/ObjectModel/CGI/CollectionPage.pm index 6593afc..194379f 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionPage.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionPage.pm @@ -63,7 +63,7 @@ sub GenerateTitle($) my $Title = $self->GetTitle(); if ($Title) { - print "<h1>", $self->escapeHTML($Title), "</h1>\n"; + print "<h1 id='PageTitle'>", $self->escapeHTML($Title), "</h1>\n"; } } diff --git a/testbot/lib/ObjectModel/CGI/FormPage.pm b/testbot/lib/ObjectModel/CGI/FormPage.pm index 3a41fe0..01f7894 100644 --- a/testbot/lib/ObjectModel/CGI/FormPage.pm +++ b/testbot/lib/ObjectModel/CGI/FormPage.pm @@ -86,7 +86,7 @@ sub GenerateTitle($) my $Title = $self->GetTitle(); if ($Title) { - print "<h1>", $self->CGI->escapeHTML($Title), "</h1>\n"; + print "<h1 id='PageTitle'>", $self->CGI->escapeHTML($Title), "</h1>\n"; } } diff --git a/testbot/lib/WineTestBot/CGI/PageBase.pm b/testbot/lib/WineTestBot/CGI/PageBase.pm index e5b2f2d..0eac6b1 100644 --- a/testbot/lib/WineTestBot/CGI/PageBase.pm +++ b/testbot/lib/WineTestBot/CGI/PageBase.pm @@ -328,7 +328,7 @@ sub GenerateFooter($) print <<EOF; </div> - <b class="rbottom"><b class="r4"> </b><b class="r3"> </b><b class="r2"> </b><b class="r1"> </b></b> + <b id="PageEnd" class="rbottom"><b class="r4"> </b><b class="r3"> </b><b class="r2"> </b><b class="r1"> </b></b> </div> </div>

1 0

Francois Gouget : testbot/web: Add arrows to navigate through the job results.
by Alexandre Julliard 30 Aug '18

30 Aug '18

Module: tools Branch: master Commit: af340b505eff1d6d0adcbbb28dad52ac455a08b0 URL: https://source.winehq.org/git/tools.git/?a=commit;h=af340b505eff1d6d0adcbbb… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Aug 30 02:01:31 2018 +0200 testbot/web: Add arrows to navigate through the job results. The up / down arrows simplify navigation when the long logs are expanded. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/JobDetails.pl | 10 ++++++++-- testbot/web/WineTestBot.css | 2 ++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index d10b98e..8efe5ee 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -381,13 +381,19 @@ EOF print "<div class='Content'>\n"; my $Keys = $self->SortKeys(undef, $self->{Collection}->GetKeys()); + my $KeyIndex = 0; foreach my $Key (@$Keys) { my $StepTask = $self->{Collection}->GetItem($Key); my $TaskDir = $StepTask->GetTaskDir(); my $VM = $StepTask->VM; - print "<h2><a name='k", $self->escapeHTML($Key), "'></a>" , - $self->escapeHTML($StepTask->GetTitle()), "</h2>\n"; + + my $Prev = $KeyIndex > 0 ? "k". $Keys->[$KeyIndex-1] : "PageTitle"; + my $Next = $KeyIndex + 1 < @$Keys ? "k". $Keys->[$KeyIndex+1] : "PageEnd"; + $KeyIndex++; + print "<h2><a name='k", $self->escapeHTML($Key), "'></a>", + $self->escapeHTML($StepTask->GetTitle()), + " <span class='right'><a class='title' href='#$Prev'>↑</a><a class='title' href='#$Next'>↓</a></span></h2>\n"; print "<details><summary>", $self->CGI->escapeHTML($VM->Description || $VM->Name), "</summary>", diff --git a/testbot/web/WineTestBot.css b/testbot/web/WineTestBot.css index 88badfe..df683f8 100644 --- a/testbot/web/WineTestBot.css +++ b/testbot/web/WineTestBot.css @@ -364,6 +364,8 @@ pre background-color: red; } +.right { float: right; } + .queued { color: black; } .running { color: blue; } .success { color: green; }

1 0

Józef Kucia : vkd3d: Use vkd3d_create_vk_buffer_view( ) to create counter resource views.
by Alexandre Julliard 30 Aug '18

30 Aug '18

Module: vkd3d Branch: master Commit: 3e33fb3212e19860ca31316f30058171a9b005d5 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=3e33fb3212e19860ca31316… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Aug 30 14:12:53 2018 +0200 vkd3d: Use vkd3d_create_vk_buffer_view() to create counter resource views. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/resource.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index d97c3db..7dc7b38 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1590,11 +1590,16 @@ static void vkd3d_create_buffer_uav(struct d3d12_desc *descriptor, struct d3d12_ if (counter_resource) { + const struct vkd3d_format *format; + assert(d3d12_resource_is_buffer(counter_resource)); assert(desc->u.Buffer.StructureByteStride); - if (!vkd3d_create_buffer_view(device, counter_resource, DXGI_FORMAT_R32_UINT, - desc->u.Buffer.CounterOffsetInBytes / sizeof(uint32_t), 1, 0, 0, &view->vk_counter_view)) + + format = vkd3d_get_format(DXGI_FORMAT_R32_UINT, false); + if (!vkd3d_create_vk_buffer_view(device, counter_resource, format, + desc->u.Buffer.CounterOffsetInBytes, sizeof(uint32_t), &view->vk_counter_view)) { + WARN("Failed to create counter buffer view.\n"); view->vk_counter_view = VK_NULL_HANDLE; d3d12_desc_destroy(descriptor, device); }

1 0

Józef Kucia : vkd3d: Create vkd3d_views in vkd3d_create_buffer_view().
by Alexandre Julliard 30 Aug '18

30 Aug '18

Module: vkd3d Branch: master Commit: d58c65aeeb9a4719fbe65a5b9eb1f2604fc9d289 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=d58c65aeeb9a4719fbe65a5… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Aug 30 14:12:54 2018 +0200 vkd3d: Create vkd3d_views in vkd3d_create_buffer_view(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/resource.c | 44 +++++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 21 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 7dc7b38..4772b3f 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1206,10 +1206,13 @@ static bool vkd3d_create_vk_buffer_view(struct d3d12_device *device, static bool vkd3d_create_buffer_view(struct d3d12_device *device, struct d3d12_resource *resource, DXGI_FORMAT view_format, unsigned int offset, unsigned int size, unsigned int structure_stride, - unsigned int flags, VkBufferView *vk_view) + unsigned int flags, struct vkd3d_view **view) { + const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; const struct vkd3d_format *format; + struct vkd3d_view *object; unsigned int element_size; + VkBufferView vk_view; if (view_format == DXGI_FORMAT_R32_TYPELESS && (flags & VKD3D_VIEW_RAW_BUFFER)) { @@ -1231,8 +1234,19 @@ static bool vkd3d_create_buffer_view(struct d3d12_device *device, return false; } - return vkd3d_create_vk_buffer_view(device, resource, format, - offset * element_size, size * element_size, vk_view); + if (!vkd3d_create_vk_buffer_view(device, resource, format, + offset * element_size, size * element_size, &vk_view)) + return false; + + if (!(object = vkd3d_view_create())) + { + VK_CALL(vkDestroyBufferView(device->vk_device, vk_view, NULL)); + return false; + } + + object->u.vk_buffer_view = vk_view; + *view = object; + return true; } static void vkd3d_set_view_swizzle_for_format(VkComponentMapping *components, @@ -1419,6 +1433,7 @@ static void vkd3d_create_buffer_srv(struct d3d12_desc *descriptor, const D3D12_SHADER_RESOURCE_VIEW_DESC *desc) { struct vkd3d_view *view; + unsigned int flags; if (!desc) { @@ -1432,18 +1447,11 @@ static void vkd3d_create_buffer_srv(struct d3d12_desc *descriptor, return; } - if (!(view = vkd3d_view_create())) - return; - + flags = vkd3d_view_flags_from_d3d12_buffer_srv_flags(desc->u.Buffer.Flags); if (!vkd3d_create_buffer_view(device, resource, desc->Format, desc->u.Buffer.FirstElement, desc->u.Buffer.NumElements, - desc->u.Buffer.StructureByteStride, - vkd3d_view_flags_from_d3d12_buffer_srv_flags(desc->u.Buffer.Flags), - &view->u.vk_buffer_view)) - { - vkd3d_free(view); + desc->u.Buffer.StructureByteStride, flags, &view)) return; - } descriptor->magic = VKD3D_DESCRIPTOR_MAGIC_SRV; descriptor->vk_descriptor_type = VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER; @@ -1555,6 +1563,7 @@ static void vkd3d_create_buffer_uav(struct d3d12_desc *descriptor, struct d3d12_ const D3D12_UNORDERED_ACCESS_VIEW_DESC *desc) { struct vkd3d_view *view; + unsigned int flags; if (!desc) { @@ -1571,18 +1580,11 @@ static void vkd3d_create_buffer_uav(struct d3d12_desc *descriptor, struct d3d12_ if (desc->u.Buffer.CounterOffsetInBytes) FIXME("Ignoring counter offset %"PRIu64".\n", desc->u.Buffer.CounterOffsetInBytes); - if (!(view = vkd3d_view_create())) - return; - + flags = vkd3d_view_flags_from_d3d12_buffer_uav_flags(desc->u.Buffer.Flags); if (!vkd3d_create_buffer_view(device, resource, desc->Format, desc->u.Buffer.FirstElement, desc->u.Buffer.NumElements, - desc->u.Buffer.StructureByteStride, - vkd3d_view_flags_from_d3d12_buffer_uav_flags(desc->u.Buffer.Flags), - &view->u.vk_buffer_view)) - { - vkd3d_free(view); + desc->u.Buffer.StructureByteStride, flags, &view)) return; - } descriptor->magic = VKD3D_DESCRIPTOR_MAGIC_UAV; descriptor->vk_descriptor_type = VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER;

1 0

Józef Kucia : vkd3d: Return bool from vkd3d_create_texture_view().
by Alexandre Julliard 30 Aug '18

30 Aug '18

Module: vkd3d Branch: master Commit: 1c7df3f50a09ce85ed4c5b84c5291d022b9987fb URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=1c7df3f50a09ce85ed4c5b8… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Aug 30 14:12:55 2018 +0200 vkd3d: Return bool from vkd3d_create_texture_view(). For consistency with vkd3d_create_buffer_view(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/resource.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 4772b3f..219b95c 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1341,7 +1341,7 @@ static bool init_default_texture_view_desc(struct vkd3d_texture_view_desc *desc, return true; } -static HRESULT vkd3d_create_texture_view(struct d3d12_device *device, +static bool vkd3d_create_texture_view(struct d3d12_device *device, struct d3d12_resource *resource, const struct vkd3d_texture_view_desc *desc, struct vkd3d_view **view) { @@ -1369,18 +1369,18 @@ static HRESULT vkd3d_create_texture_view(struct d3d12_device *device, if ((vr = VK_CALL(vkCreateImageView(device->vk_device, &view_desc, NULL, &vk_view))) < 0) { WARN("Failed to create Vulkan image view, vr %d.\n", vr); - return hresult_from_vk_result(vr); + return false; } if (!(object = vkd3d_view_create())) { VK_CALL(vkDestroyImageView(device->vk_device, vk_view, NULL)); - return E_OUTOFMEMORY; + return false; } object->u.vk_image_view = vk_view; *view = object; - return S_OK; + return true; } void d3d12_desc_create_cbv(struct d3d12_desc *descriptor, @@ -1541,7 +1541,7 @@ void d3d12_desc_create_srv(struct d3d12_desc *descriptor, } } - if (FAILED(vkd3d_create_texture_view(device, resource, &vkd3d_desc, &view))) + if (!vkd3d_create_texture_view(device, resource, &vkd3d_desc, &view)) return; descriptor->magic = VKD3D_DESCRIPTOR_MAGIC_SRV; @@ -1663,7 +1663,7 @@ static void vkd3d_create_texture_uav(struct d3d12_desc *descriptor, } } - if (FAILED(vkd3d_create_texture_view(device, resource, &vkd3d_desc, &view))) + if (!vkd3d_create_texture_view(device, resource, &vkd3d_desc, &view)) return; descriptor->magic = VKD3D_DESCRIPTOR_MAGIC_UAV; @@ -1913,7 +1913,7 @@ void d3d12_rtv_desc_create_rtv(struct d3d12_rtv_desc *rtv_desc, struct d3d12_dev vkd3d_desc.layer_count = resource->desc.DepthOrArraySize; } - if (FAILED(vkd3d_create_texture_view(device, resource, &vkd3d_desc, &view))) + if (!vkd3d_create_texture_view(device, resource, &vkd3d_desc, &view)) return; rtv_desc->magic = VKD3D_DESCRIPTOR_MAGIC_RTV; @@ -1985,7 +1985,7 @@ void d3d12_dsv_desc_create_dsv(struct d3d12_dsv_desc *dsv_desc, struct d3d12_dev } } - if (FAILED(vkd3d_create_texture_view(device, resource, &vkd3d_desc, &view))) + if (!vkd3d_create_texture_view(device, resource, &vkd3d_desc, &view)) return; dsv_desc->magic = VKD3D_DESCRIPTOR_MAGIC_DSV;

1 0

Michael Stefaniuc : vcomp: Use the ARRAY_SIZE() macro.
by Alexandre Julliard 29 Aug '18

29 Aug '18

Module: wine Branch: master Commit: ce2be144ea3ef28d4e806d71201b4ef6beb95538 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce2be144ea3ef28d4e806d71… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Aug 8 22:20:06 2018 +0200 vcomp: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vcomp/main.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/vcomp/main.c b/dlls/vcomp/main.c index ab51ef2..3a9fd22 100644 --- a/dlls/vcomp/main.c +++ b/dlls/vcomp/main.c @@ -523,7 +523,7 @@ void CDECL _vcomp_reduction_i1(unsigned int flags, char *dest, char val) _vcomp_atomic_bool_or_i1, }; unsigned int op = (flags >> 8) & 0xf; - op = min(op, sizeof(funcs)/sizeof(funcs[0]) - 1); + op = min(op, ARRAY_SIZE(funcs) - 1); funcs[op](dest, val); } @@ -617,7 +617,7 @@ void CDECL _vcomp_reduction_i2(unsigned int flags, short *dest, short val) _vcomp_atomic_bool_or_i2, }; unsigned int op = (flags >> 8) & 0xf; - op = min(op, sizeof(funcs)/sizeof(funcs[0]) - 1); + op = min(op, ARRAY_SIZE(funcs) - 1); funcs[op](dest, val); } @@ -711,7 +711,7 @@ void CDECL _vcomp_reduction_i4(unsigned int flags, int *dest, int val) _vcomp_atomic_bool_or_i4, }; unsigned int op = (flags >> 8) & 0xf; - op = min(op, sizeof(funcs)/sizeof(funcs[0]) - 1); + op = min(op, ARRAY_SIZE(funcs) - 1); funcs[op](dest, val); } @@ -807,7 +807,7 @@ void CDECL _vcomp_reduction_i8(unsigned int flags, LONG64 *dest, LONG64 val) _vcomp_atomic_bool_or_i8, }; unsigned int op = (flags >> 8) & 0xf; - op = min(op, sizeof(funcs)/sizeof(funcs[0]) - 1); + op = min(op, ARRAY_SIZE(funcs) - 1); funcs[op](dest, val); } @@ -891,7 +891,7 @@ void CDECL _vcomp_reduction_r4(unsigned int flags, float *dest, float val) _vcomp_atomic_bool_or_r4, }; unsigned int op = (flags >> 8) & 0xf; - op = min(op, sizeof(funcs)/sizeof(funcs[0]) - 1); + op = min(op, ARRAY_SIZE(funcs) - 1); funcs[op](dest, val); } @@ -975,7 +975,7 @@ void CDECL _vcomp_reduction_r8(unsigned int flags, double *dest, double val) _vcomp_atomic_bool_or_r8, }; unsigned int op = (flags >> 8) & 0xf; - op = min(op, sizeof(funcs)/sizeof(funcs[0]) - 1); + op = min(op, ARRAY_SIZE(funcs) - 1); funcs[op](dest, val); }

1 0