wine-commits February 2018

wine-commits@winehq.org

2 participants
804 discussions

Henri Verbeet : wined3d: Use more resource access flags in wined3d_texture_use_pbo().
by Alexandre Julliard 01 Feb '18

01 Feb '18

Module: wine Branch: master Commit: bfc0f3bdf12680ce498d30a10d27fc4c9a6b357e URL: https://source.winehq.org/git/wine.git/?a=commit;h=bfc0f3bdf12680ce498d30a1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 1 03:25:34 2018 +0330 wined3d: Use more resource access flags in wined3d_texture_use_pbo(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 101f9ad..f166c2a 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -32,8 +32,8 @@ WINE_DECLARE_DEBUG_CHANNEL(winediag); static BOOL wined3d_texture_use_pbo(const struct wined3d_texture *texture, const struct wined3d_gl_info *gl_info) { - return texture->resource.pool == WINED3D_POOL_DEFAULT - && texture->resource.access & WINED3D_RESOURCE_ACCESS_MAP + return (texture->resource.access & (WINED3D_RESOURCE_ACCESS_CPU + | WINED3D_RESOURCE_ACCESS_MAP)) == WINED3D_RESOURCE_ACCESS_MAP && gl_info->supported[ARB_PIXEL_BUFFER_OBJECT] && !texture->resource.format->conv_byte_count && !(texture->flags & (WINED3D_TEXTURE_PIN_SYSMEM | WINED3D_TEXTURE_COND_NP2_EMULATED));

1 0

Henri Verbeet : wined3d: Use the resource access flags in wined3d_surface_blt().
by Alexandre Julliard 01 Feb '18

01 Feb '18

Module: wine Branch: master Commit: 74c97c9a56fe76e5452a37c7b2286ed7133d75f5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=74c97c9a56fe76e5452a37c7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 1 03:25:33 2018 +0330 wined3d: Use the resource access flags in wined3d_surface_blt(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 5f34ad0..388b803 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3854,10 +3854,10 @@ HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst { TRACE("Depth/stencil blit.\n"); - if (dst_texture->resource.pool == WINED3D_POOL_SYSTEM_MEM) - dst_location = dst_texture->resource.map_binding; - else + if (dst_texture->resource.access & WINED3D_RESOURCE_ACCESS_GPU) dst_location = dst_texture->resource.draw_binding; + else + dst_location = dst_texture->resource.map_binding; context = context_acquire(device, dst_texture, dst_sub_resource_idx); valid_locations = device->blitter->ops->blitter_blit(device->blitter, @@ -3959,10 +3959,10 @@ HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst blit_op = WINED3D_BLIT_OP_RAW_BLIT; } - if (dst_texture->resource.pool == WINED3D_POOL_SYSTEM_MEM) - dst_location = dst_texture->resource.map_binding; - else + if (dst_texture->resource.access & WINED3D_RESOURCE_ACCESS_GPU) dst_location = dst_texture->resource.draw_binding; + else + dst_location = dst_texture->resource.map_binding; context = context_acquire(device, dst_texture, dst_sub_resource_idx); valid_locations = device->blitter->ops->blitter_blit(device->blitter, blit_op, context,

1 0

Henri Verbeet : wined3d: Use the resource access flags in ffp_blitter_use_cpu_clear().
by Alexandre Julliard 01 Feb '18

01 Feb '18

Module: wine Branch: master Commit: 4928e38c0a660edb66c37bdfa9e870af2efbc48c URL: https://source.winehq.org/git/wine.git/?a=commit;h=4928e38c0a660edb66c37bdf… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 1 03:25:32 2018 +0330 wined3d: Use the resource access flags in ffp_blitter_use_cpu_clear(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 5f91c21..5f34ad0 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2744,14 +2744,16 @@ static BOOL ffp_blitter_use_cpu_clear(struct wined3d_rendertarget_view *view) resource = view->resource; if (resource->type == WINED3D_RTYPE_BUFFER) - return resource->pool == WINED3D_POOL_SYSTEM_MEM; + return !(resource->access & WINED3D_RESOURCE_ACCESS_GPU); texture = texture_from_resource(resource); locations = texture->sub_resources[view->sub_resource_idx].locations; if (locations & (resource->map_binding | WINED3D_LOCATION_DISCARDED)) - return resource->pool == WINED3D_POOL_SYSTEM_MEM || (texture->flags & WINED3D_TEXTURE_PIN_SYSMEM); + return !(resource->access & WINED3D_RESOURCE_ACCESS_GPU) + || (texture->flags & WINED3D_TEXTURE_PIN_SYSMEM); - return resource->pool == WINED3D_POOL_SYSTEM_MEM && !(texture->flags & WINED3D_TEXTURE_CONVERTED); + return !(resource->access & WINED3D_RESOURCE_ACCESS_GPU) + && !(texture->flags & WINED3D_TEXTURE_CONVERTED); } static void ffp_blitter_clear(struct wined3d_blitter *blitter, struct wined3d_device *device,

1 0

Francois Gouget : testbot: Better wrap the database backend code.
by Alexandre Julliard 01 Feb '18

01 Feb '18

Module: tools Branch: master Commit: 5eae1aa1c9875e783a52603c42d1e5d61a0d46bb URL: https://source.winehq.org/git/tools.git/?a=commit;h=5eae1aa1c9875e783a52603… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jan 31 21:14:45 2018 +0100 testbot: Better wrap the database backend code. ObjectModel::BackEnd no longer exposes its global active backends variable. Also provide a way to close all database connections so the code does not have to assume we only have the 'WineTestBot' one which would defeat the point of the BackEnd module. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/Engine.pl | 4 ++-- testbot/lib/ObjectModel/BackEnd.pm | 33 +++++++++++++++++++++++++-- testbot/lib/ObjectModel/DBIBackEnd.pm | 16 ++++++------- testbot/lib/WineTestBot/VMs.pm | 4 ++-- testbot/lib/WineTestBot/WineTestBotObjects.pm | 4 ++-- 5 files changed, 45 insertions(+), 16 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index 827879c..d637564 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -309,8 +309,8 @@ sub HandleJobStatusChange($$$) if ($OldStatus eq "running" && $NewStatus ne "running") { - # Make sure the child process does not inherit the database connection - $ActiveBackEnds{'WineTestBot'}->Close(); + # Make sure the child process does not inherit the database connections + CloseAllDBBackEnds(); my $Pid = fork; if (!defined $Pid) diff --git a/testbot/lib/ObjectModel/BackEnd.pm b/testbot/lib/ObjectModel/BackEnd.pm index 6c5c813..0bb48cf 100644 --- a/testbot/lib/ObjectModel/BackEnd.pm +++ b/testbot/lib/ObjectModel/BackEnd.pm @@ -30,11 +30,11 @@ should provide. =cut -use vars qw(@ISA @EXPORT %ActiveBackEnds); +use vars qw(@ISA @EXPORT); require Exporter; @ISA = qw(Exporter); -@EXPORT = qw(%ActiveBackEnds); +@EXPORT = qw(&AddDBBackEnd &GetDBBackEnd &RemoveDBBackEnd &CloseAllDBBackEnds); sub new($@) { @@ -51,4 +51,33 @@ sub _initialize($) #my ($self) = @_; } + +my %_ActiveBackEnds; + +sub AddDBBackEnd($$) +{ + my ($Name, $BackEnd) = @_; + $_ActiveBackEnds{$Name} = $BackEnd; +} + +sub GetDBBackEnd($) +{ + my ($Name) = @_; + return $_ActiveBackEnds{$Name}; +} + +sub RemoveDBBackEnd($) +{ + my ($Name) = @_; + delete $_ActiveBackEnds{$Name}; +} + +sub CloseAllDBBackEnds() +{ + foreach my $BackEnd (values %_ActiveBackEnds) + { + $BackEnd->Close(); + } +} + 1; diff --git a/testbot/lib/ObjectModel/DBIBackEnd.pm b/testbot/lib/ObjectModel/DBIBackEnd.pm index 565d4a8..b5bb485 100644 --- a/testbot/lib/ObjectModel/DBIBackEnd.pm +++ b/testbot/lib/ObjectModel/DBIBackEnd.pm @@ -18,9 +18,6 @@ use strict; -use DBI; -use ObjectModel::BackEnd; - package ObjectModel::DBIBackEnd; =head1 NAME @@ -33,8 +30,11 @@ ObjectModel::BackEnd =cut +use DBI; use Time::Local; +use ObjectModel::BackEnd; + use vars qw(@ISA @EXPORT); require Exporter; @@ -604,12 +604,12 @@ sub Close($) } } -sub UseDBIBackEnd($$@) +sub UseDBIBackEnd($$$$$$) { - my $class = shift; - my $DbSelector = shift; + my ($class, $DbSelector, $DbSource, $DbUser, $DbPassword, $DbArgs) = @_; - $ObjectModel::BackEnd::ActiveBackEnds{$DbSelector} = $class->new(); - $ObjectModel::BackEnd::ActiveBackEnds{$DbSelector}->{ConnectArgs} = \@_; + my $BackEnd = $class->new(); + $BackEnd->{ConnectArgs} = [$DbSource, $DbUser, $DbPassword, $DbArgs]; + AddDBBackEnd($DbSelector, $BackEnd); } 1; diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index 2ba6b4b..bb9a832 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -344,8 +344,8 @@ sub Run($$$$$) # So set ChildPid in the parent and synchronize with the child so it only # starts once this is done. - # Make sure the child process will use its own database connection - $self->GetBackEnd()->Close(); + # Make sure the child process will use its own database connections + CloseAllDBBackEnds(); use Fcntl; my ($fd_read, $fd_write); diff --git a/testbot/lib/WineTestBot/WineTestBotObjects.pm b/testbot/lib/WineTestBot/WineTestBotObjects.pm index b46fa41..20ff6b1 100644 --- a/testbot/lib/WineTestBot/WineTestBotObjects.pm +++ b/testbot/lib/WineTestBot/WineTestBotObjects.pm @@ -37,7 +37,7 @@ require Exporter; sub GetBackEnd($) { #my ($self) = @_; - return $ActiveBackEnds{'WineTestBot'}; + return GetDBBackEnd('WineTestBot'); } @@ -61,7 +61,7 @@ require Exporter; sub GetBackEnd($) { #my ($self) = @_; - return $ActiveBackEnds{'WineTestBot'}; + return GetDBBackEnd('WineTestBot'); } 1;

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 February 2018