September 2019 - Wine-commits

Henri Verbeet : wined3d: Use wined3d_resource_gl_legacy_map_flags() in wined3d_buffer_gl_map().
by Alexandre Julliard 23 Sep '19

23 Sep '19

Module: wine Branch: master Commit: 8b780d2d8c207224837471875e78e4d160287ca0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8b780d2d8c20722483747187… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 23 15:12:14 2019 +0330 wined3d: Use wined3d_resource_gl_legacy_map_flags() in wined3d_buffer_gl_map(). For consistency with the ARB_map_buffer_range path. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index d3fcdd41fe..8d72b782df 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1045,7 +1045,7 @@ static HRESULT wined3d_buffer_gl_map(struct wined3d_buffer_gl *buffer_gl, if (buffer_gl->b.flags & WINED3D_BUFFER_APPLESYNC) wined3d_buffer_gl_sync_apple(buffer_gl, flags, gl_info); buffer_gl->b.map_ptr = GL_EXTCALL(glMapBuffer(buffer_gl->buffer_type_hint, - GL_READ_WRITE)); + wined3d_resource_gl_legacy_map_flags(flags))); checkGLcall("glMapBuffer"); }

1 0

Henri Verbeet : wined3d: Derive the GL bind point for buffer object maps from the bind flags.
by Alexandre Julliard 23 Sep '19

23 Sep '19

Module: wine Branch: master Commit: 2bc6941ab06bc5243eb77a5bcf26d482a58c40ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=2bc6941ab06bc5243eb77a5b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 23 15:12:15 2019 +0330 wined3d: Derive the GL bind point for buffer object maps from the bind flags. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 20 ++++++++++++++++---- dlls/wined3d/adapter_vk.c | 4 ++-- dlls/wined3d/buffer.c | 8 +++++--- dlls/wined3d/directx.c | 4 ++-- dlls/wined3d/surface.c | 23 +++++++++++------------ dlls/wined3d/texture.c | 10 ++++------ dlls/wined3d/wined3d_private.h | 14 ++++++++------ 7 files changed, 48 insertions(+), 35 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2bc6941ab06bc5243eb7…

1 0

Henri Verbeet : wined3d: Use explicit flushing in wined3d_context_gl_unmap_bo_address().
by Alexandre Julliard 23 Sep '19

23 Sep '19

Module: wine Branch: master Commit: c2f0ae50b4dd70aa9d364ec6a7dd728e65370d8b URL: https://source.winehq.org/git/wine.git/?a=commit;h=c2f0ae50b4dd70aa9d364ec6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 23 15:12:16 2019 +0330 wined3d: Use explicit flushing in wined3d_context_gl_unmap_bo_address(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 6 +++--- dlls/wined3d/adapter_vk.c | 4 ++-- dlls/wined3d/context.c | 25 +++++++++++++++++++------ dlls/wined3d/directx.c | 4 ++-- dlls/wined3d/surface.c | 19 ++++++++++++++----- dlls/wined3d/texture.c | 15 +++++++++++---- dlls/wined3d/wined3d_private.h | 26 ++++++++++++++------------ 7 files changed, 65 insertions(+), 34 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c2f0ae50b4dd70aa9d36…

1 0

Henri Verbeet : wined3d: Move the "buffer_object" field from struct wined3d_buffer_gl to struct wined3d_buffer.
by Alexandre Julliard 23 Sep '19

23 Sep '19

Module: wine Branch: master Commit: 179c8cc86faab506bc7589a74f92e033869ddc40 URL: https://source.winehq.org/git/wine.git/?a=commit;h=179c8cc86faab506bc7589a7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 23 15:12:17 2019 +0330 wined3d: Move the "buffer_object" field from struct wined3d_buffer_gl to struct wined3d_buffer. We'll want to use this for Vulkan buffers as well. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 2 +- dlls/wined3d/buffer.c | 24 ++++++++++++++---------- dlls/wined3d/context.c | 6 +++--- dlls/wined3d/state.c | 14 ++++---------- dlls/wined3d/view.c | 7 +++---- dlls/wined3d/wined3d_private.h | 2 +- 6 files changed, 26 insertions(+), 29 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=179c8cc86faab506bc75…

1 0

Henri Verbeet : wined3d: Use wined3d_context_map_bo_address() in wined3d_buffer_gl_map().
by Alexandre Julliard 23 Sep '19

23 Sep '19

Module: wine Branch: master Commit: 47701b7231c14c9434f2c9f3f8e7bb466deed97a URL: https://source.winehq.org/git/wine.git/?a=commit;h=47701b7231c14c9434f2c9f3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 23 15:12:18 2019 +0330 wined3d: Use wined3d_context_map_bo_address() in wined3d_buffer_gl_map(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 64 ++++++++++++++++++++------------------------------- 1 file changed, 25 insertions(+), 39 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index f483c52340..b8c5117f89 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -772,8 +772,9 @@ void * CDECL wined3d_buffer_get_parent(const struct wined3d_buffer *buffer) /* The caller provides a context and binds the buffer */ static void wined3d_buffer_gl_sync_apple(struct wined3d_buffer_gl *buffer_gl, - DWORD flags, const struct wined3d_gl_info *gl_info) + uint32_t flags, struct wined3d_context_gl *context_gl) { + const struct wined3d_gl_info *gl_info = context_gl->gl_info; enum wined3d_fence_result ret; HRESULT hr; @@ -784,6 +785,8 @@ static void wined3d_buffer_gl_sync_apple(struct wined3d_buffer_gl *buffer_gl, if (flags & WINED3D_MAP_DISCARD) { + wined3d_buffer_gl_bind(buffer_gl, context_gl); + GL_EXTCALL(glBufferData(buffer_gl->buffer_type_hint, buffer_gl->b.resource.size, NULL, buffer_gl->buffer_object_usage)); checkGLcall("glBufferData"); @@ -834,6 +837,7 @@ drop_fence: } gl_info->gl_ops.gl.p_glFinish(); + wined3d_buffer_gl_bind(buffer_gl, context_gl); GL_EXTCALL(glBufferParameteriAPPLE(buffer_gl->buffer_type_hint, GL_BUFFER_SERIALIZED_MODIFY_APPLE, GL_TRUE)); checkGLcall("glBufferParameteriAPPLE(buffer_gl->buffer_type_hint, GL_BUFFER_SERIALIZED_MODIFY_APPLE, GL_TRUE)"); buffer_gl->b.flags &= ~WINED3D_BUFFER_APPLESYNC; @@ -964,7 +968,6 @@ static HRESULT wined3d_buffer_gl_map(struct wined3d_buffer_gl *buffer_gl, unsigned int offset, unsigned int size, BYTE **data, DWORD flags) { struct wined3d_device *device = buffer_gl->b.resource.device; - struct wined3d_context_gl *context_gl; struct wined3d_context *context; LONG count; BYTE *base; @@ -976,6 +979,7 @@ static HRESULT wined3d_buffer_gl_map(struct wined3d_buffer_gl *buffer_gl, if (buffer_gl->b.buffer_object) { unsigned int dirty_offset = offset, dirty_size = size; + struct wined3d_bo_address addr; /* DISCARD invalidates the entire buffer, regardless of the specified * offset and size. Some applications also depend on the entire buffer @@ -1003,11 +1007,7 @@ static HRESULT wined3d_buffer_gl_map(struct wined3d_buffer_gl *buffer_gl, } else { - const struct wined3d_gl_info *gl_info; - context = context_acquire(device, NULL, 0); - context_gl = wined3d_context_gl(context); - gl_info = context_gl->gl_info; if (flags & WINED3D_MAP_DISCARD) wined3d_buffer_validate_location(&buffer_gl->b, WINED3D_LOCATION_BUFFER); @@ -1025,8 +1025,6 @@ static HRESULT wined3d_buffer_gl_map(struct wined3d_buffer_gl *buffer_gl, if (count == 1) { - wined3d_buffer_gl_bind(buffer_gl, context_gl); - /* Filter redundant WINED3D_MAP_DISCARD maps. The 3DMark2001 * multitexture fill rate test seems to depend on this. When * we map a buffer with GL_MAP_INVALIDATE_BUFFER_BIT, the @@ -1037,28 +1035,19 @@ static HRESULT wined3d_buffer_gl_map(struct wined3d_buffer_gl *buffer_gl, if (buffer_gl->b.flags & WINED3D_BUFFER_DISCARD) flags &= ~WINED3D_MAP_DISCARD; - if (gl_info->supported[ARB_MAP_BUFFER_RANGE]) - { - GLbitfield mapflags = wined3d_resource_gl_map_flags(flags); - buffer_gl->b.map_ptr = GL_EXTCALL(glMapBufferRange(buffer_gl->buffer_type_hint, - 0, buffer_gl->b.resource.size, mapflags)); - checkGLcall("glMapBufferRange"); - } - else - { - if (buffer_gl->b.flags & WINED3D_BUFFER_APPLESYNC) - wined3d_buffer_gl_sync_apple(buffer_gl, flags, gl_info); - buffer_gl->b.map_ptr = GL_EXTCALL(glMapBuffer(buffer_gl->buffer_type_hint, - wined3d_resource_gl_legacy_map_flags(flags))); - checkGLcall("glMapBuffer"); - } + if (buffer_gl->b.flags & WINED3D_BUFFER_APPLESYNC) + wined3d_buffer_gl_sync_apple(buffer_gl, flags, wined3d_context_gl(context)); + + addr.buffer_object = buffer_gl->b.buffer_object; + addr.addr = 0; + buffer_gl->b.map_ptr = wined3d_context_map_bo_address(context, &addr, + buffer_gl->b.resource.size, buffer_gl->b.resource.bind_flags, flags); if (((DWORD_PTR)buffer_gl->b.map_ptr) & (RESOURCE_ALIGNMENT - 1)) { WARN("Pointer %p is not %u byte aligned.\n", buffer_gl->b.map_ptr, RESOURCE_ALIGNMENT); - GL_EXTCALL(glUnmapBuffer(buffer_gl->buffer_type_hint)); - checkGLcall("glUnmapBuffer"); + wined3d_context_unmap_bo_address(context, &addr, buffer_gl->b.resource.bind_flags, 0, NULL); buffer_gl->b.map_ptr = NULL; if (buffer_gl->b.resource.usage & WINED3DUSAGE_DYNAMIC) @@ -1122,36 +1111,33 @@ static void wined3d_buffer_gl_unmap(struct wined3d_buffer_gl *buffer_gl) if (buffer_gl->b.map_ptr) { struct wined3d_device *device = buffer_gl->b.resource.device; + unsigned int range_count = buffer_gl->b.modified_areas; const struct wined3d_gl_info *gl_info; struct wined3d_context_gl *context_gl; struct wined3d_context *context; + struct wined3d_bo_address addr; context = context_acquire(device, NULL, 0); context_gl = wined3d_context_gl(context); gl_info = context_gl->gl_info; - wined3d_buffer_gl_bind(buffer_gl, context_gl); - - if (gl_info->supported[ARB_MAP_BUFFER_RANGE]) + if (buffer_gl->b.flags & WINED3D_BUFFER_APPLESYNC) { - for (i = 0; i < buffer_gl->b.modified_areas; ++i) - { - GL_EXTCALL(glFlushMappedBufferRange(buffer_gl->buffer_type_hint, - buffer_gl->b.maps[i].offset, buffer_gl->b.maps[i].size)); - checkGLcall("glFlushMappedBufferRange"); - } - } - else if (buffer_gl->b.flags & WINED3D_BUFFER_APPLESYNC) - { - for (i = 0; i < buffer_gl->b.modified_areas; ++i) + wined3d_buffer_gl_bind(buffer_gl, context_gl); + for (i = 0; i < range_count; ++i) { GL_EXTCALL(glFlushMappedBufferRangeAPPLE(buffer_gl->buffer_type_hint, buffer_gl->b.maps[i].offset, buffer_gl->b.maps[i].size)); checkGLcall("glFlushMappedBufferRangeAPPLE"); } + range_count = 0; } - GL_EXTCALL(glUnmapBuffer(buffer_gl->buffer_type_hint)); + addr.buffer_object = buffer_gl->b.buffer_object; + addr.addr = 0; + wined3d_context_unmap_bo_address(context, &addr, + buffer_gl->b.resource.bind_flags, range_count, buffer_gl->b.maps); + context_release(context); buffer_clear_dirty_areas(&buffer_gl->b);

1 0

Francois Gouget : testbot/Engine: Fix recording the new sacrificed VM status.
by Alexandre Julliard 23 Sep '19

23 Sep '19

Module: tools Branch: master Commit: d1075ec8f78e9e4e928b4f7cceb15ead53b3a9ed URL: https://source.winehq.org/git/tools.git/?a=commit;h=d1075ec8f78e9e4e928b4f7… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Sep 23 19:22:00 2019 +0200 testbot/Engine: Fix recording the new sacrificed VM status. The status will not be 'dirty' if VM::RunPowerOff() failed. Recording the right status is important otherwise ScheduleJobs() will attempt to record de VM's current status in its catch-all loop, resulting in a fatal 'Could not change key' error. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Engine/Scheduler.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/Engine/Scheduler.pm b/testbot/lib/WineTestBot/Engine/Scheduler.pm index 4128e9e..530a2ee 100644 --- a/testbot/lib/WineTestBot/Engine/Scheduler.pm +++ b/testbot/lib/WineTestBot/Engine/Scheduler.pm @@ -764,10 +764,10 @@ sub _SacrificeVM($$$) $Sched->{busyvms}->{$VictimKey} = 1; $Host->{$Victim->Status}--; $Host->{dirty}++; - $Victim->RecordStatus($Sched->{records}, $Victim->Status eq "dirty" ? "dirty poweroff" : "dirty sacrifice"); $Victim->KillChild(); my $ErrMessage = $Victim->RunPowerOff(); LogMsg "$ErrMessage\n" if (defined $ErrMessage); + $Victim->RecordStatus($Sched->{records}, $Victim->Status eq "dirty" ? "dirty poweroff" : $VM->Status ." sacrifice"); return 1; }

1 0

Francois Gouget : testbot/Engine: Let the caller trace VM::Run() errors.
by Alexandre Julliard 23 Sep '19

23 Sep '19

Module: tools Branch: master Commit: c52a230ef658608dd68562a466bcc670caa6a241 URL: https://source.winehq.org/git/tools.git/?a=commit;h=c52a230ef658608dd68562a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Sep 23 19:21:57 2019 +0200 testbot/Engine: Let the caller trace VM::Run() errors. Libraries are not supposed to spam the log and most callers already trace VM::Run() errors. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Engine/Scheduler.pm | 3 ++- testbot/lib/WineTestBot/VMs.pm | 5 +---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/testbot/lib/WineTestBot/Engine/Scheduler.pm b/testbot/lib/WineTestBot/Engine/Scheduler.pm index 7375337..4128e9e 100644 --- a/testbot/lib/WineTestBot/Engine/Scheduler.pm +++ b/testbot/lib/WineTestBot/Engine/Scheduler.pm @@ -766,7 +766,8 @@ sub _SacrificeVM($$$) $Host->{dirty}++; $Victim->RecordStatus($Sched->{records}, $Victim->Status eq "dirty" ? "dirty poweroff" : "dirty sacrifice"); $Victim->KillChild(); - $Victim->RunPowerOff(); + my $ErrMessage = $Victim->RunPowerOff(); + LogMsg "$ErrMessage\n" if (defined $ErrMessage); return 1; } diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index d85df1d..d240fb9 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -379,10 +379,7 @@ sub Run($$$$$$) if (defined $self->ChildPid) { - my $ErrMessage = "Cannot run ". ShArgv2Cmd(@$Args) ." because the ". $self->ChildPid ." process is already using the ". $self->Name ." VM"; - require WineTestBot::Log; - WineTestBot::Log::LogMsg("$ErrMessage\n"); - return $ErrMessage; + return "Cannot run ". ShArgv2Cmd(@$Args) ." because process ". $self->ChildPid ." is already using the ". $self->Name ." VM"; } # There are two $VM->ChildPid race conditions to avoid:

1 0

Francois Gouget : testbot/LibvirtTool: Remove _GetStateName(), it is not used anymore.
by Alexandre Julliard 23 Sep '19

23 Sep '19

Module: tools Branch: master Commit: 509752b6e6f5eed17eb72b45076dd8427c84ceb8 URL: https://source.winehq.org/git/tools.git/?a=commit;h=509752b6e6f5eed17eb72b4… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Sep 23 16:59:20 2019 +0200 testbot/LibvirtTool: Remove _GetStateName(), it is not used anymore. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LibvirtDomain.pm | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/testbot/lib/WineTestBot/LibvirtDomain.pm b/testbot/lib/WineTestBot/LibvirtDomain.pm index bb68bd0..7f462ea 100644 --- a/testbot/lib/WineTestBot/LibvirtDomain.pm +++ b/testbot/lib/WineTestBot/LibvirtDomain.pm @@ -393,23 +393,6 @@ sub IsReady($) ); } -sub _GetStateName($) -{ - my ($State) = @_; - - my %StateNames = ( - Sys::Virt::Domain::STATE_NOSTATE => "no state", - Sys::Virt::Domain::STATE_RUNNING => "running", - Sys::Virt::Domain::STATE_BLOCKED => "blocked", - Sys::Virt::Domain::STATE_PAUSED => "paused", - Sys::Virt::Domain::STATE_SHUTDOWN => "shutdown", - Sys::Virt::Domain::STATE_SHUTOFF => "shutoff", - Sys::Virt::Domain::STATE_CRASHED => "crashed", - Sys::Virt::Domain::STATE_PMSUSPENDED => "pmsuspended", - ); - return $StateNames{$State} || "unknown"; -} - sub PowerOff($) { my ($self) = @_;

1 0

Francois Gouget : testbot: Requeue the task if the VM is not ready for it.
by Alexandre Julliard 23 Sep '19

23 Sep '19

Module: tools Branch: master Commit: 89f32e99c754122a4075528803b6369ea4d82489 URL: https://source.winehq.org/git/tools.git/?a=commit;h=89f32e99c754122a4075528… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Sep 23 16:59:31 2019 +0200 testbot: Requeue the task if the VM is not ready for it. In order to run a task a VM should be in the 'running' state and powered on. If either check fails that's not the fault of the task and a second attempt may succeed. So don't end the task with a boterror. Instead requeue it and put the VM offline so its true state is evaluated (and notify the administrator of course). This implies only resetting the VM error count after successfully running a task otherwise we could get into an infinite loop putting it offline at the start of every task. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/LibvirtTool.pl | 1 - testbot/bin/WineRunBuild.pl | 32 ++++++++++++++++++++++--- testbot/bin/WineRunReconfig.pl | 37 ++++++++++++++++++++++++---- testbot/bin/WineRunTask.pl | 37 ++++++++++++++++++++++++---- testbot/bin/WineRunWineTest.pl | 41 +++++++++++++++++++++++++++----- testbot/lib/WineTestBot/LibvirtDomain.pm | 13 ++++++++++ 6 files changed, 143 insertions(+), 18 deletions(-) Diff: https://source.winehq.org/git/tools.git/?a=commitdiff;h=89f32e99c754122a407…

1 0

Francois Gouget : testbot: Fix the VM::RecordResult() documentation.
by Alexandre Julliard 23 Sep '19

23 Sep '19

Module: tools Branch: master Commit: f1ffd15cab379f632ce3c02e0b0d7b2e14b86638 URL: https://source.winehq.org/git/tools.git/?a=commit;h=f1ffd15cab379f632ce3c02… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Sep 23 17:01:54 2019 +0200 testbot: Fix the VM::RecordResult() documentation. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/VMs.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index d240fb9..37ebf9a 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -652,7 +652,7 @@ sub RecordStatus($$;$) =pod =over 12 -=item C<RecordStatus()> +=item C<RecordResult()> Adds a Record of the specified VM process result.

1 0