Module: tools
Branch: master
Commit: 686c002eb3c3229f7f5802ebeb44b89251283e33
URL: https://gitlab.winehq.org/winehq/tools/-/commit/686c002eb3c3229f7f5802ebeb4…
Author: Francois Gouget <fgouget(a)codeweavers.com>
Date: Thu Dec 8 18:42:44 2022 +0100
testbot/LogUtils: Make the MarkAllMessagesAsNew() documentation a bit more explicit.
---
testbot/lib/WineTestBot/LogUtils.pm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm
index 4a6aa72f..e8f32f34 100644
--- a/testbot/lib/WineTestBot/LogUtils.pm
+++ b/testbot/lib/WineTestBot/LogUtils.pm
@@ -1258,13 +1258,13 @@ The $LogInfo structure is augmented with the following fields:
=over
=item New
-The total number of new messages.
+The total number of new messages of all types.
=item MsgGroups
=over
=item New
-The number of new messages in this group.
+The number of new messages of all types in this group.
=back
Module: tools
Branch: master
Commit: 5683ae9206971084b0b6827f84d6c36ee196496d
URL: https://gitlab.winehq.org/winehq/tools/-/commit/5683ae9206971084b0b6827f84d…
Author: Francois Gouget <fgouget(a)codeweavers.com>
Date: Thu Dec 8 18:44:16 2022 +0100
testbot/LogUtils: Fix counting of known new messages.
A given line can be matched by more than one known failure when it is
too generic. This resulted in the eKnownNew counter being too high which
then resulted in an invalid NewTestFailures value for the task.
This patch ensures the *KnownNew counters count each line only once.
---
testbot/lib/WineTestBot/LogUtils.pm | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm
index 07b4dcf5..4a6aa72f 100644
--- a/testbot/lib/WineTestBot/LogUtils.pm
+++ b/testbot/lib/WineTestBot/LogUtils.pm
@@ -1538,6 +1538,8 @@ sub MatchLogFailures($$)
my $NonFlakyLine = $Line;
$NonFlakyLine =~ s/Test succeeded inside flaky todo block:/Test succeeded inside todo block:/g;
$NonFlakyLine =~ s/Test marked flaky:/Test failed:/g;
+
+ my $AddToKnownNew = $Group->{IsNew}->[$MsgIndex];
foreach my $UnitFailure (@$UnitFailures)
{
my $RegExp = $UnitFailure->FailureRegExp;
@@ -1549,11 +1551,12 @@ sub MatchLogFailures($$)
my $LineFailures = $Group->{Failures}->{$MsgIndex} ||= [];
push @$LineFailures, $UnitFailure->Id;
- if ($Group->{IsNew}->[$MsgIndex])
+ if ($AddToKnownNew)
{
my $Type = $Group->{Types}->[$MsgIndex];
$Group->{"${Type}KnownNew"}++;
$LogInfo->{"${Type}KnownNew"}++;
+ $AddToKnownNew = undef;
}
my $LogFailure = $LogFailures->{Failures}->{$UnitFailure->Id};
Module: wine
Branch: master
Commit: 33d6900b35f510d17d6d5b1dc0936e7cc7136d73
URL: https://gitlab.winehq.org/wine/wine/-/commit/33d6900b35f510d17d6d5b1dc0936e…
Author: Zebediah Figura <zfigura(a)codeweavers.com>
Date: Tue Dec 13 20:42:33 2022 -0600
wined3d: Always bind to GL_ELEMENT_ARRAY_BUFFER if the bind flags include WINED3D_BIND_INDEX_BUFFER.
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53623
---
dlls/wined3d/buffer.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c
index 2f6c52ef36f..fa24f006872 100644
--- a/dlls/wined3d/buffer.c
+++ b/dlls/wined3d/buffer.c
@@ -141,7 +141,11 @@ GLenum wined3d_buffer_gl_binding_from_bind_flags(const struct wined3d_gl_info *g
if (!bind_flags)
return GL_PIXEL_UNPACK_BUFFER;
- if (bind_flags == WINED3D_BIND_INDEX_BUFFER)
+ /* We must always return GL_ELEMENT_ARRAY_BUFFER here;
+ * wined3d_device_gl_create_bo() checks the GL binding to see whether we
+ * can suballocate, and we cannot suballocate if this BO might be used for
+ * an index buffer. */
+ if (bind_flags & WINED3D_BIND_INDEX_BUFFER)
return GL_ELEMENT_ARRAY_BUFFER;
if (bind_flags & (WINED3D_BIND_SHADER_RESOURCE | WINED3D_BIND_UNORDERED_ACCESS)