wine-commits April 2022

wine-commits@winehq.org

2 participants
1024 discussions

Francois Gouget : testbot/cgi: Pass a column descriptor to Generate{Header,Data}View().
by Alexandre Julliard 25 Apr '22

25 Apr '22

Module: tools Branch: master Commit: accf09eca29d131f0409084f3447e6b2ea994de2 URL: https://source.winehq.org/git/tools.git/?a=commit;h=accf09eca29d131f0409084… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Apr 25 20:50:10 2022 +0200 testbot/cgi: Pass a column descriptor to Generate{Header,Data}View(). Instead of being called for every row, DisplayProperty() is now called only once and the result is stored in the corresponding column descriptor. This also allows passing extra information such as the column index to Generate{Header,Data}View(). And this allows GenerateList() to iterate only on the properties that are actually being displayed. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/CollectionBlock.pm | 81 ++++++++++++++++---------- testbot/web/JobDetails.pl | 14 ++--- testbot/web/PatchesList.pl | 6 +- testbot/web/admin/UsersList.pl | 6 +- testbot/web/index.pl | 12 ++-- 5 files changed, 68 insertions(+), 51 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm index 03f1d18..14e3cfe 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm @@ -227,6 +227,20 @@ sub GetDetailsLink($$) Generates an HTML snippet for the column title. +The Col parameter describes the column to generate the header for. +It contains the following information: +=over 12 +=item Descriptor +The corresponding PropertyDescriptor object. + +=item Display +The value returned by DisplayProperty(), normally "ro". + +=item Index +The index of the column (see $Row->{Cols}). + +=back + The Row parameter contains the following information: =over 12 @@ -234,6 +248,10 @@ The Row parameter contains the following information: The list of item properties, including those that DisplayProperty() says should be hidden. +=item Cols +The collection block's list of columns. This excludes any hidden property. +The following relation holds: $Row->{Cols}->[$Col->{Index}] == $Col + =item DetailsPage The base link to the item details page if any. See GetDetailsPage(). @@ -253,9 +271,9 @@ The total number of rows (excluding the header). sub GenerateHeaderView($$$) { - my ($self, $_Row, $PropertyDescriptor) = @_; + my ($self, $_Row, $Col) = @_; - print $self->escapeHTML($PropertyDescriptor->GetDisplayName()); + print $self->escapeHTML($Col->{Descriptor}->GetDisplayName()); } =pod @@ -266,8 +284,8 @@ sub GenerateHeaderView($$$) Generates an HTML snippet representing the property value in a user-readable form. -The Row parameter contains the same information as for GenerateHeaderView() -plus: +See GenerateHeaderView() for a description of the Row and Col parameters. +The Row parameter has the following extra fields: =over 12 =item Row @@ -286,11 +304,11 @@ passing the row to GetDetailsLink(). sub GenerateDataView($$$) { - my ($self, $Row, $PropertyDescriptor) = @_; + my ($self, $Row, $Col) = @_; - my $PropertyName = $PropertyDescriptor->GetName(); + my $PropertyName = $Col->{Descriptor}->GetName(); my $Value = $Row->{Item}->$PropertyName; - GenerateValueHTML($self, $PropertyDescriptor, $Value); + GenerateValueHTML($self, $Col->{Descriptor}, $Value); } @@ -317,10 +335,10 @@ sub GenerateFormStart($) sub GenerateHeaderCell($$$) { - my ($self, $Row, $PropertyDescriptor) = @_; + my ($self, $Row, $Col) = @_; print "<th>"; - $self->GenerateHeaderView($Row, $PropertyDescriptor); + $self->GenerateHeaderView($Row, $Col); print "</th>\n"; } @@ -336,12 +354,9 @@ sub GenerateHeaderRow($$) GenerateMasterCheckbox("block$self->{Unique}"); print "</th>\n"; } - foreach my $PropertyDescriptor (@{$Row->{PropertyDescriptors}}) + foreach my $Col (@{$Row->{Cols}}) { - if ($self->DisplayProperty($PropertyDescriptor)) - { - $self->GenerateHeaderCell($Row, $PropertyDescriptor); - } + $self->GenerateHeaderCell($Row, $Col); } print "</tr>\n"; } @@ -356,16 +371,16 @@ sub SelName($$) sub GenerateDataCell($$$) { - my ($self, $Row, $PropertyDescriptor) = @_; + my ($self, $Row, $Col) = @_; print "<td>"; my $CloseLink; - if ($Row->{DetailsPage} and $PropertyDescriptor->GetIsKey()) + if ($Row->{DetailsPage} and $Col->{Descriptor}->GetIsKey()) { print "<a href='", $self->escapeHTML($self->GetDetailsLink($Row)), "'>"; $CloseLink = "</a>"; } - $self->GenerateDataView($Row, $PropertyDescriptor); + $self->GenerateDataView($Row, $Col); print "$CloseLink</td>\n"; } @@ -380,12 +395,9 @@ sub GenerateDataRow($$) print "<td><input name='", $self->SelName($Row->{Item}->GetKey()), "' type='checkbox' cbgroup='block$self->{Unique}'/></td>\n"; } - foreach my $PropertyDescriptor (@{$Row->{PropertyDescriptors}}) + foreach my $Col (@{$Row->{Cols}}) { - if ($self->DisplayProperty($PropertyDescriptor)) - { - $self->GenerateDataCell($Row, $PropertyDescriptor); - } + $self->GenerateDataCell($Row, $Col); } print "</tr>\n"; } @@ -403,18 +415,22 @@ sub GenerateList($) my $Collection = $self->{Collection}; my $PropertyDescriptors = $Collection->GetPropertyDescriptors(); + my $ColIndex = 0; + my (@Cols, $HasDT); + foreach my $PropertyDescriptor (@$PropertyDescriptors) + { + my $Display = $self->DisplayProperty($PropertyDescriptor); + next if (!$Display); + push @Cols, {Descriptor => $PropertyDescriptor, + Display => $Display, + Index => $ColIndex++}; + $HasDT ||= ($PropertyDescriptor->GetClass() eq "Basic" and + $PropertyDescriptor->GetType() eq "DT"); + } my $Items = $self->{Collection}->GetSortedItems(); - if (@$Items != 0) + if ($HasDT and @$Items != 0) { - foreach my $PropertyDescriptor (@$PropertyDescriptors) - { - if ($PropertyDescriptor->GetClass() eq "Basic" and - $PropertyDescriptor->GetType() eq "DT") - { - $self->{EnclosingPage}->GenerateImportJS(GetDateTimeJSFile()); - last; - } - } + $self->{EnclosingPage}->GenerateImportJS(GetDateTimeJSFile()); } print "<div class='CollectionBlock'>\n"; @@ -427,6 +443,7 @@ sub GenerateList($) print "<thead>\n"; my $Row = { PropertyDescriptors => $PropertyDescriptors, + Cols => \@Cols, DetailsPage => $self->GetDetailsPage(), ItemActions => $self->{RW} ? $self->GetItemActions() : [], Row => 0, # 0 for the header ---> 1 for the first line diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index e39df41..591a47e 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -60,9 +60,9 @@ sub DisplayProperty($$) sub GenerateHeaderView($$$) { - my ($self, $Row, $PropertyDescriptor) = @_; + my ($self, $Row, $Col) = @_; - my $PropertyName = $PropertyDescriptor->GetName(); + my $PropertyName = $Col->{Descriptor}->GetName(); if ($PropertyName eq "CmdLineArg") { print "Arguments / <span class='MissionHeader'>Missions</span>"; @@ -73,16 +73,16 @@ sub GenerateHeaderView($$$) } else { - $self->SUPER::GenerateHeaderView($Row, $PropertyDescriptor); + $self->SUPER::GenerateHeaderView($Row, $Col); } } sub GenerateDataView($$$) { - my ($self, $Row, $PropertyDescriptor) = @_; + my ($self, $Row, $Col) = @_; my $StepTask = $Row->{Item}; - my $PropertyName = $PropertyDescriptor->GetName(); + my $PropertyName = $Col->{Descriptor}->GetName(); if ($PropertyName eq "VM") { print "<a href='#k", $self->escapeHTML($Row->{Item}->GetKey()), "'>"; @@ -103,7 +103,7 @@ sub GenerateDataView($$$) } else { - $self->SUPER::GenerateDataView($Row, $PropertyDescriptor); + $self->SUPER::GenerateDataView($Row, $Col); } } elsif ($PropertyName eq "CmdLineArg") @@ -144,7 +144,7 @@ sub GenerateDataView($$$) } else { - $self->SUPER::GenerateDataView($Row, $PropertyDescriptor); + $self->SUPER::GenerateDataView($Row, $Col); } } diff --git a/testbot/web/PatchesList.pl b/testbot/web/PatchesList.pl index a1c5171..30cfc75 100644 --- a/testbot/web/PatchesList.pl +++ b/testbot/web/PatchesList.pl @@ -46,9 +46,9 @@ sub DisplayProperty($$) sub GenerateDataView($$$) { - my ($self, $Row, $PropertyDescriptor) = @_; + my ($self, $Row, $Col) = @_; - if ($PropertyDescriptor->GetName() eq "Disposition" and + if ($Col->{Descriptor}->GetName() eq "Disposition" and $Row->{Item}->Disposition =~ /job ([0-9]+)$/) { my $JobId = $1; @@ -56,7 +56,7 @@ sub GenerateDataView($$$) } else { - $self->SUPER::GenerateDataView($Row, $PropertyDescriptor); + $self->SUPER::GenerateDataView($Row, $Col); } } diff --git a/testbot/web/admin/UsersList.pl b/testbot/web/admin/UsersList.pl index ec6d282..5f9f47b 100644 --- a/testbot/web/admin/UsersList.pl +++ b/testbot/web/admin/UsersList.pl @@ -47,9 +47,9 @@ sub DisplayProperty($$) sub GenerateDataView($$$) { - my ($self, $Row, $PropertyDescriptor) = @_; + my ($self, $Row, $Col) = @_; - if ($PropertyDescriptor->GetName() eq "Status") + if ($Col->{Descriptor}->GetName() eq "Status") { my $User = $Row->{Item}; my $Status = $User->Status; @@ -87,7 +87,7 @@ sub GenerateDataView($$$) } else { - $self->SUPER::GenerateDataView($Row, $PropertyDescriptor); + $self->SUPER::GenerateDataView($Row, $Col); } } diff --git a/testbot/web/index.pl b/testbot/web/index.pl index 1c506c9..331ee85 100644 --- a/testbot/web/index.pl +++ b/testbot/web/index.pl @@ -51,9 +51,9 @@ sub DisplayProperty($$) sub GenerateHeaderView($$$) { - my ($self, $Row, $PropertyDescriptor) = @_; + my ($self, $Row, $Col) = @_; - my $PropertyName = $PropertyDescriptor->GetName(); + my $PropertyName = $Col->{Descriptor}->GetName(); if ($PropertyName eq "Priority") { print "<a class='title' title='Higher values indicate a lower priority'>Nice</a>"; @@ -64,16 +64,16 @@ sub GenerateHeaderView($$$) } else { - $self->SUPER::GenerateHeaderView($Row, $PropertyDescriptor); + $self->SUPER::GenerateHeaderView($Row, $Col); } } sub GenerateDataView($$$) { - my ($self, $Row, $PropertyDescriptor) = @_; + my ($self, $Row, $Col) = @_; my $Job = $Row->{Item}; - my $PropertyName = $PropertyDescriptor->GetName(); + my $PropertyName = $Col->{Descriptor}->GetName(); if ($PropertyName eq "User") { if (defined $Job->Patch and defined $Job->Patch->FromName and @@ -166,7 +166,7 @@ sub GenerateDataView($$$) } else { - $self->SUPER::GenerateDataView($Row, $PropertyDescriptor); + $self->SUPER::GenerateDataView($Row, $Col); } }

1 0

Francisco Casas : tests: Test matrix initialization.
by Alexandre Julliard 25 Apr '22

25 Apr '22

Module: vkd3d Branch: master Commit: 535bbfa6f8aa3b41bf7d667866859eaf416a7e67 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=535bbfa6f8aa3b41bf7d667… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Fri Apr 22 12:25:04 2022 +0200 tests: Test matrix initialization. Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 1 + tests/hlsl-initializer-matrix.shader_test | 72 +++++++++++++++++++++++++++++++ 2 files changed, 73 insertions(+) diff --git a/Makefile.am b/Makefile.am index 3e113dc7..26aa3f84 100644 --- a/Makefile.am +++ b/Makefile.am @@ -79,6 +79,7 @@ vkd3d_shader_tests = \ tests/hlsl-initializer-local-array.shader_test \ tests/hlsl-initializer-nested.shader_test \ tests/hlsl-initializer-numeric.shader_test \ + tests/hlsl-initializer-matrix.shader_test \ tests/hlsl-initializer-static-array.shader_test \ tests/hlsl-initializer-struct.shader_test \ tests/hlsl-intrinsic-override.shader_test \ diff --git a/tests/hlsl-initializer-matrix.shader_test b/tests/hlsl-initializer-matrix.shader_test new file mode 100644 index 00000000..c4fafea7 --- /dev/null +++ b/tests/hlsl-initializer-matrix.shader_test @@ -0,0 +1,72 @@ +[pixel shader] +float4 main() : SV_TARGET +{ + float4x3 mat = {11, 12, 13, 21, 22, 23, 31, 32, 33, 41, 42, 43}; + return float4(mat[1], 0); +} + +[test] +todo draw quad +probe all rgba (21, 22, 23, 0) + + +[pixel shader] +float4 main() : SV_TARGET +{ + row_major float4x3 mat = {11, 12, 13, 21, 22, 23, 31, 32, 33, 41, 42, 43}; + return float4(mat[1], 0); +} + +[test] +todo draw quad +probe all rgba (21, 22, 23, 0) + + +[pixel shader] +float4 main() : SV_TARGET +{ + float3x4 mat = {11, 12, 13, 14, 21, 22, 23, 24, 31, 32, 33, 34}; + return float4(mat[1]); +} + +[test] +todo draw quad +probe all rgba (21, 22, 23, 24) + + +[pixel shader] +float4 main() : SV_TARGET +{ + row_major float3x2 mat = {11, 12, 21, 22, 31, 32}; + return float4(mat[1], mat[2]); +} + +[test] +todo draw quad +probe all rgba (21, 22, 31, 32) + + +[pixel shader] +float4 main() : SV_TARGET +{ + row_major float3x2 mat; + mat = float3x2(11, 12, 21, 22, 31, 32); + return float4(mat[1], mat[2]); +} + +[test] +todo draw quad +probe all rgba (21, 22, 31, 32) + + +[pixel shader] +float4 main() : SV_TARGET +{ + float4 x = float4(12, 21, 22, 31); + float3x2 mat = float3x2(11, x, 32); + return float4(mat[1], mat[2]); +} + +[test] +todo draw quad +probe all rgba (21, 22, 31, 32)

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Do not handle vector types in major_size() and minor_size().
by Alexandre Julliard 25 Apr '22

25 Apr '22

Module: vkd3d Branch: master Commit: 74273ccaddf4699bd978ed3152b0166073650528 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=74273ccaddf4699bd978ed3… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Apr 22 12:25:03 2022 +0200 vkd3d-shader/hlsl: Do not handle vector types in major_size() and minor_size(). Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl_codegen.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index f22841fb..f31bfe9f 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -676,7 +676,7 @@ static bool split_struct_copies(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr static unsigned int minor_size(const struct hlsl_type *type) { - if (type->type == HLSL_CLASS_VECTOR || type->modifiers & HLSL_MODIFIER_ROW_MAJOR) + if (type->modifiers & HLSL_MODIFIER_ROW_MAJOR) return type->dimx; else return type->dimy; @@ -684,7 +684,7 @@ static unsigned int minor_size(const struct hlsl_type *type) static unsigned int major_size(const struct hlsl_type *type) { - if (type->type == HLSL_CLASS_VECTOR || type->modifiers & HLSL_MODIFIER_ROW_MAJOR) + if (type->modifiers & HLSL_MODIFIER_ROW_MAJOR) return type->dimy; else return type->dimx;

1 0

Giovanni Mascellani : tests: Test matrix copying with a non-square matrix.
by Alexandre Julliard 25 Apr '22

25 Apr '22

Module: vkd3d Branch: master Commit: 3bbb90a3cb6537babd8e5edf12a5c42b3cdad1f6 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=3bbb90a3cb6537babd8e5ed… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Apr 22 12:25:02 2022 +0200 tests: Test matrix copying with a non-square matrix. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/hlsl-matrix-indexing.shader_test | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/tests/hlsl-matrix-indexing.shader_test b/tests/hlsl-matrix-indexing.shader_test index e2103fe2..8057179e 100644 --- a/tests/hlsl-matrix-indexing.shader_test +++ b/tests/hlsl-matrix-indexing.shader_test @@ -47,18 +47,16 @@ todo draw quad probe all rgba (1.0, 5.0, 7.0, 12.0) [pixel shader] -uniform float4x4 m; +uniform float3x2 m; float4 main() : SV_TARGET { - float4x4 m2 = m; - return float4(m2[0][0], m2[1][0], m2[1][2], m2[2][3]); + float3x2 m2 = m; + return float4(m2[0][0], m2[2][0], m2[1][1], m2[2][1]); } [test] -uniform 0 float4 1.0 2.0 3.0 4.0 -uniform 4 float4 5.0 6.0 7.0 8.0 -uniform 8 float4 9.0 10.0 11.0 12.0 -uniform 12 float4 13.0 14.0 15.0 16.0 +uniform 0 float4 1.0 2.0 3.0 0.0 +uniform 4 float4 5.0 6.0 7.0 0.0 todo draw quad -probe all rgba (1.0, 2.0, 10.0, 15.0) +probe all rgba (1.0, 3.0, 6.0, 7.0)

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Update split_copy()'s introductory comment.
by Alexandre Julliard 25 Apr '22

25 Apr '22

Module: vkd3d Branch: master Commit: d2ba10a69650d45b1c4cb9adfdeaa15dfca7e2d6 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=d2ba10a69650d45b1c4cb9a… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Apr 22 12:25:01 2022 +0200 vkd3d-shader/hlsl: Update split_copy()'s introductory comment. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl_codegen.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 73e3b73f..f22841fb 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -567,8 +567,10 @@ static bool fold_redundant_casts(struct hlsl_ctx *ctx, struct hlsl_ir_node *inst return false; } -/* Helper for split_array_copies() and split_struct_copies(). Inserts new - * instructions right before "store". */ +/* Copy an element of a complex variable. Helper for + * split_array_copies(), split_struct_copies() and + * split_matrix_copies(). Inserts new instructions right before + * "store". */ static bool split_copy(struct hlsl_ctx *ctx, struct hlsl_ir_store *store, const struct hlsl_ir_load *load, const unsigned int offset, struct hlsl_type *type) {

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Add trailing dots to warning messages.
by Alexandre Julliard 25 Apr '22

25 Apr '22

Module: vkd3d Branch: master Commit: 0e8098ccfef0e9bf4e2b12e191f34f1385c72bce URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=0e8098ccfef0e9bf4e2b12e… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Apr 22 12:24:58 2022 +0200 vkd3d-shader/hlsl: Add trailing dots to warning messages. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl_constant_ops.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_constant_ops.c b/libs/vkd3d-shader/hlsl_constant_ops.c index a1551ba1..2e16577f 100644 --- a/libs/vkd3d-shader/hlsl_constant_ops.c +++ b/libs/vkd3d-shader/hlsl_constant_ops.c @@ -275,7 +275,7 @@ static bool fold_div(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, if (ctx->profile->major_version >= 4 && src2->value[k].f == 0) { hlsl_warning(ctx, &dst->node.loc, VKD3D_SHADER_WARNING_HLSL_DIVISION_BY_ZERO, - "Floating point division by zero"); + "Floating point division by zero."); } dst->value[k].f = src1->value[k].f / src2->value[k].f; if (ctx->profile->major_version < 4 && isinf(dst->value[k].f)) @@ -289,7 +289,7 @@ static bool fold_div(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, if (src2->value[k].d == 0) { hlsl_warning(ctx, &dst->node.loc, VKD3D_SHADER_WARNING_HLSL_DIVISION_BY_ZERO, - "Floating point division by zero"); + "Floating point division by zero."); } dst->value[k].d = src1->value[k].d / src2->value[k].d; break;

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Do not generate infinities in SM1.
by Alexandre Julliard 25 Apr '22

25 Apr '22

Module: vkd3d Branch: master Commit: c680b674d61aac3dbe72a5286793f61bbf873423 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=c680b674d61aac3dbe72a52… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Apr 22 12:24:57 2022 +0200 vkd3d-shader/hlsl: Do not generate infinities in SM1. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl_constant_ops.c | 9 ++++++++- tests/arithmetic-float.shader_test | 1 + 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl_constant_ops.c b/libs/vkd3d-shader/hlsl_constant_ops.c index 06b957ba..a1551ba1 100644 --- a/libs/vkd3d-shader/hlsl_constant_ops.c +++ b/libs/vkd3d-shader/hlsl_constant_ops.c @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <math.h> + #include "hlsl.h" static bool fold_cast(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, struct hlsl_ir_constant *src) @@ -270,12 +272,17 @@ static bool fold_div(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, { case HLSL_TYPE_FLOAT: case HLSL_TYPE_HALF: - if (src2->value[k].f == 0) + if (ctx->profile->major_version >= 4 && src2->value[k].f == 0) { hlsl_warning(ctx, &dst->node.loc, VKD3D_SHADER_WARNING_HLSL_DIVISION_BY_ZERO, "Floating point division by zero"); } dst->value[k].f = src1->value[k].f / src2->value[k].f; + if (ctx->profile->major_version < 4 && isinf(dst->value[k].f)) + { + hlsl_error(ctx, &dst->node.loc, VKD3D_SHADER_ERROR_HLSL_DIVISION_BY_ZERO, + "Infinities are not allowed by the shader model."); + } break; case HLSL_TYPE_DOUBLE: diff --git a/tests/arithmetic-float.shader_test b/tests/arithmetic-float.shader_test index f99b9728..6824c3f1 100644 --- a/tests/arithmetic-float.shader_test +++ b/tests/arithmetic-float.shader_test @@ -25,6 +25,7 @@ todo draw quad probe all rgba (5.0, 5.0, -5.0, 3.0) [require] +% Infinities are not allowed in SM1 shader model >= 4.0 [pixel shader]

1 0

Conor McCarthy : vkd3d: Prevent a null pointer dereference when a descriptor is not a UAV.
by Alexandre Julliard 25 Apr '22

25 Apr '22

Module: vkd3d Branch: master Commit: 6b893b597bd4a3c51cbd992a5bef55b3b676e3ed URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=6b893b597bd4a3c51cbd992… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Sat Apr 23 16:42:48 2022 +1000 vkd3d: Prevent a null pointer dereference when a descriptor is not a UAV. Fixes crashes in Shadow of the Tomb Raider, GRID 2019 and probably others. 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 0b643727..1522065f 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -3653,7 +3653,7 @@ static void d3d12_desc_buffered_copy_atomic(struct d3d12_desc *dst, const struct vkd3d_mutex_unlock(mutex); infos[set].uav_counter |= (location->src.magic == VKD3D_DESCRIPTOR_MAGIC_UAV) - & !!location->src.u.view_info.view->vk_counter_view; + && !!location->src.u.view_info.view->vk_counter_view; location->dst = dst; if (infos[set].count == ARRAY_SIZE(locations[0]))

1 0

Zebediah Figura : configure: Allow specifying the shared object name of the Vulkan library at configure time.
by Alexandre Julliard 25 Apr '22

25 Apr '22

Module: vkd3d Branch: master Commit: cab16fe9034ce6492ed7cc0a97a3ee69a4085f2a URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=cab16fe9034ce6492ed7cc0… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Apr 22 15:18:01 2022 -0500 configure: Allow specifying the shared object name of the Vulkan library at configure time. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure.ac | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 5250103c..b386104a 100644 --- a/configure.ac +++ b/configure.ac @@ -112,7 +112,10 @@ case $host_os in ;; esac -VKD3D_CHECK_VULKAN +AC_ARG_VAR([SONAME_LIBVULKAN], [shared object name for the Vulkan library]) +AS_IF([test "x$SONAME_LIBVULKAN" = "x"], + [VKD3D_CHECK_VULKAN], + [AC_DEFINE_UNQUOTED([SONAME_LIBVULKAN],["$SONAME_LIBVULKAN"],[Define to the shared object name of the Vulkan library.])]) AS_IF([test "x$with_ncurses" != "xno"], [PKG_CHECK_MODULES([NCURSES], [ncurses],

1 0

Zebediah Figura : configure: Remove the no longer used check for VULKAN_LIBS.
by Alexandre Julliard 25 Apr '22

25 Apr '22

Module: vkd3d Branch: master Commit: 99a3adcc19f2a64fad630948851616f52c00d553 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=99a3adcc19f2a64fad63094… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Apr 22 15:18:00 2022 -0500 configure: Remove the no longer used check for VULKAN_LIBS. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure.ac | 1 - m4/check-vulkan.m4 | 16 ++++++---------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/configure.ac b/configure.ac index a58e453f..5250103c 100644 --- a/configure.ac +++ b/configure.ac @@ -112,7 +112,6 @@ case $host_os in ;; esac -AC_ARG_VAR([VULKAN_LIBS], [linker flags for the Vulkan library]) VKD3D_CHECK_VULKAN AS_IF([test "x$with_ncurses" != "xno"], diff --git a/m4/check-vulkan.m4 b/m4/check-vulkan.m4 index 756f61a0..b2c3f8a1 100644 --- a/m4/check-vulkan.m4 +++ b/m4/check-vulkan.m4 @@ -1,16 +1,12 @@ dnl VKD3D_CHECK_VULKAN AC_DEFUN([VKD3D_CHECK_VULKAN],[ -VKD3D_CHECK_SONAME([vulkan], [vkGetInstanceProcAddr], - [VULKAN_LIBS="$VULKAN_LIBS -lvulkan"], +VKD3D_CHECK_SONAME([vulkan], [vkGetInstanceProcAddr],, [VKD3D_CHECK_SONAME([vulkan-1], [vkGetInstanceProcAddr], - [VULKAN_LIBS="$VULKAN_LIBS -lvulkan-1" - AC_DEFINE_UNQUOTED([SONAME_LIBVULKAN], ["$ac_cv_lib_soname_vulkan_1"])], + [AC_DEFINE_UNQUOTED([SONAME_LIBVULKAN], ["$ac_cv_lib_soname_vulkan_1"])], [VKD3D_CHECK_SONAME([MoltenVK], [vkGetInstanceProcAddr], - [VULKAN_LIBS="$VULKAN_LIBS -lMoltenVK" - AC_DEFINE_UNQUOTED([SONAME_LIBVULKAN], + [AC_DEFINE_UNQUOTED([SONAME_LIBVULKAN], ["$ac_cv_lib_soname_MoltenVK"])], - [AC_MSG_ERROR([libvulkan and libMoltenVK not found.])], - [$VULKAN_LIBS])], - [$VULKAN_LIBS])], - [$VULKAN_LIBS]) + [AC_MSG_ERROR([libvulkan and libMoltenVK not found.])]) + ]) + ]) ])

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2022