wine-devel July 2018

wine-devel@winehq.org

74 participants
637 discussions

[PATCH vkd3d 3/4] libs/vkd3d: Support D3D12_SRV_DIMENSION_TEXTURE2D in d3d12_device_CreateShaderResourceView().
by Józef Kucia 19 Jul '18

19 Jul '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/resource.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index e1a5adf3364d..fb84e4b13a08 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1194,6 +1194,15 @@ void d3d12_desc_create_srv(struct d3d12_desc *descriptor, switch (desc->ViewDimension) { + case D3D12_SRV_DIMENSION_TEXTURE2D: + vk_view_type = VK_IMAGE_VIEW_TYPE_2D; + miplevel_idx = desc->u.Texture2D.MostDetailedMip; + miplevel_count = desc->u.Texture2D.MipLevels; + if (desc->u.Texture2D.PlaneSlice) + FIXME("Ignoring plane slice %u.\n", desc->u.Texture2D.PlaneSlice); + if (desc->u.Texture2D.ResourceMinLODClamp) + FIXME("Unhandled min LOD clamp %.8e.\n", desc->u.Texture2D.ResourceMinLODClamp); + break; case D3D12_SRV_DIMENSION_TEXTURECUBE: vk_view_type = VK_IMAGE_VIEW_TYPE_CUBE; miplevel_idx = desc->u.TextureCube.MostDetailedMip; -- 2.16.4

2 1

[PATCH vkd3d 2/4] libs/vkd3d: Support D3D12_FEATURE_ROOT_SIGNATURE.
by Józef Kucia 19 Jul '18

19 Jul '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/device.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index fb57d76b5666..5f3161d0a7da 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1597,6 +1597,14 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device * return S_OK; } + case D3D12_FEATURE_ROOT_SIGNATURE: + { + D3D12_FEATURE_DATA_ROOT_SIGNATURE *data = feature_data; + FIXME("Root signature version 1_1 not supported yet.\n"); + data->HighestVersion = D3D_ROOT_SIGNATURE_VERSION_1_0; + return S_OK; + } + default: FIXME("Unhandled feature %#x.\n", feature); return E_NOTIMPL; -- 2.16.4

2 1

[PATCH vkd3d 1/4] include: Add more definitions for D3D12 features.
by Józef Kucia 19 Jul '18

19 Jul '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- include/vkd3d_d3d12.idl | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/include/vkd3d_d3d12.idl b/include/vkd3d_d3d12.idl index ec7df5653faa..a0c09ef8aa74 100644 --- a/include/vkd3d_d3d12.idl +++ b/include/vkd3d_d3d12.idl @@ -1516,14 +1516,38 @@ typedef struct D3D12_FEATURE_DATA_FEATURE_LEVELS D3D_FEATURE_LEVEL MaxSupportedFeatureLevel; } D3D12_FEATURE_DATA_FEATURE_LEVELS; +typedef struct D3D12_FEATURE_DATA_ROOT_SIGNATURE +{ + D3D_ROOT_SIGNATURE_VERSION HighestVersion; +} D3D12_FEATURE_DATA_ROOT_SIGNATURE; + +typedef enum D3D_SHADER_MODEL +{ + D3D_SHADER_MODEL_5_1 = 0x51, + D3D_SHADER_MODEL_6_0 = 0x60, +} D3D_SHADER_MODEL; + +typedef struct D3D12_FEATURE_DATA_SHADER_MODEL +{ + D3D_SHADER_MODEL HighestShaderModel; +} D3D12_FEATURE_DATA_SHADER_MODEL; + typedef enum D3D12_FEATURE { D3D12_FEATURE_D3D12_OPTIONS = 0, D3D12_FEATURE_ARCHITECTURE = 1, D3D12_FEATURE_FEATURE_LEVELS = 2, D3D12_FEATURE_FORMAT_SUPPORT = 3, - D3D12_FEATURE_FORMAT_INFO = 4, - D3D12_FEATURE_GPU_VIRTUAL_ADDRESS_SUPPORT = 5, + D3D12_FEATURE_MULTISAMPLE_QUALITY_LEVELS = 4, + D3D12_FEATURE_FORMAT_INFO = 5, + D3D12_FEATURE_GPU_VIRTUAL_ADDRESS_SUPPORT = 6, + D3D12_FEATURE_SHADER_MODEL = 7, + D3D12_FEATURE_D3D12_OPTIONS1 = 8, + D3D12_FEATURE_ROOT_SIGNATURE = 12, + D3D12_FEATURE_ARCHITECTURE1 = 16, + D3D12_FEATURE_D3D12_OPTIONS2 = 18, + D3D12_FEATURE_SHADER_CACHE = 19, + D3D12_FEATURE_COMMAND_QUEUE_PRIORITY = 20, } D3D12_FEATURE; typedef struct D3D12_MEMCPY_DEST -- 2.16.4

2 1

[PATCH 2/2] wined3d: Add GPU information for Intel HD Graphics 630.
by Józef Kucia 19 Jul '18

19 Jul '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/directx.c | 1 + dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 2 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 68b2a116b820..7d9a5e99eef8 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1517,6 +1517,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_INTEL, CARD_INTEL_IP580_2, "Intel(R) Iris(TM) Pro Graphics 580", DRIVER_INTEL_HD4000, 2048}, {HW_VENDOR_INTEL, CARD_INTEL_IPP580_1, "Intel(R) Iris(TM) Pro Graphics P580", DRIVER_INTEL_HD4000, 2048}, {HW_VENDOR_INTEL, CARD_INTEL_IPP580_2, "Intel(R) Iris(TM) Pro Graphics P580", DRIVER_INTEL_HD4000, 2048}, + {HW_VENDOR_INTEL, CARD_INTEL_HD630, "Intel(R) HD Graphics 630", DRIVER_INTEL_HD4000, 3072}, }; static const struct driver_version_information *get_driver_version_info(enum wined3d_display_driver driver, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 97badbea8423..ece41ebd06ca 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2497,6 +2497,7 @@ enum wined3d_pci_device CARD_INTEL_IP580_2 = 0x193b, CARD_INTEL_IPP580_1 = 0x193a, CARD_INTEL_IPP580_2 = 0x193d, + CARD_INTEL_HD630 = 0x5912, }; struct wined3d_fbo_ops -- 2.16.4

2 1

[PATCH 1/2] wined3d: Add GPU information for AMD Radeon RX Vega.
by Józef Kucia 19 Jul '18

19 Jul '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/directx.c | 1 + dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 2 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index bb8d5afb4aa7..68b2a116b820 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1441,6 +1441,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_AMD, CARD_AMD_RADEON_R9_FURY, "AMD Radeon (TM) R9 Fury Series", DRIVER_AMD_RX, 4096}, {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_460, "Radeon(TM) RX 460 Graphics", DRIVER_AMD_RX, 4096}, {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_480, "Radeon (TM) RX 480 Graphics", DRIVER_AMD_RX, 4096}, + {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_VEGA, "Radeon RX Vega", DRIVER_AMD_RX, 8192}, /* VMware */ {HW_VENDOR_VMWARE, CARD_VMWARE_SVGA3D, "VMware SVGA 3D (Microsoft Corporation - WDDM)", DRIVER_VMWARE, 1024}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a25c296616bb..97badbea8423 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2296,6 +2296,7 @@ enum wined3d_pci_device CARD_AMD_RADEON_R9_FURY = 0x7300, CARD_AMD_RADEON_RX_460 = 0x67ef, CARD_AMD_RADEON_RX_480 = 0x67df, + CARD_AMD_RADEON_RX_VEGA = 0x687f, CARD_NVIDIA_RIVA_128 = 0x0018, CARD_NVIDIA_RIVA_TNT = 0x0020, -- 2.16.4

2 1

[PATCH] msvcr110: Create current scheduler in _CurrentScheduler::_Id
by Daniel Lehman 19 Jul '18

19 Jul '18

> Shouldn't something similar be also done for _CurrentScheduler::_Id? yeah, but not sure how to automate testing for it. once either _GetNumberOfVirtualProcessors or _Id is called, the scheduler is created and I don't know how to kill it in the attached test, you can comment out either call to the underscore version and both the non-underscore versions (GetNumberOfVirtualProcessors and Id) still pass

3 2

[PATCH] msvcp90: Use the ARRAY_SIZE() macro.
by Mathew Hodson 19 Jul '18

19 Jul '18

Signed-off-by: Mathew Hodson <mathew.hodson(a)gmail.com> --- dlls/msvcp90/misc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index b9fd9d0..a1bec86 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -391,7 +391,7 @@ unsigned short __cdecl wctype(const char *property) }; unsigned int i; - for(i=0; i<sizeof(properties)/sizeof(properties[0]); i++) + for(i = 0; i < ARRAY_SIZE(properties); i++) if(!strcmp(property, properties[i].name)) return properties[i].mask; @@ -2440,7 +2440,7 @@ void __thiscall _vector_base_v4__Internal_throw_exception(void/*_vector_base_v4* TRACE("(%p %lu)\n", this, idx); - if(idx < sizeof(exceptions)/sizeof(exceptions[0])) + if(idx < ARRAY_SIZE(exceptions)) throw_exception(exceptions[idx].type, exceptions[idx].msg); } #endif @@ -2463,7 +2463,7 @@ const char* __cdecl _Syserror_map(int err) TRACE("(%d)\n", err); - for(i=0; i<sizeof(syserror_map)/sizeof(syserror_map[0]); i++) + for(i = 0; i < ARRAY_SIZE(syserror_map); i++) { if(syserror_map[i].err == err) return syserror_map[i].str; -- 2.7.4

2 1

[PATCH] odbc32: Hide SQL functions to avoid conflicts with certain drivers.
by Daniel Lehman 19 Jul '18

19 Jul '18

3 2

[PATCH] testbot: Split the log and report line category detection.
by Francois Gouget 19 Jul '18

19 Jul '18

This avoids false positives for cases such as lines containing 'error:' in test reports. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineSendLog.pl | 8 ++- testbot/lib/WineTestBot/LogUtils.pm | 105 ++++++++++++++++++---------- testbot/web/JobDetails.pl | 12 ++-- 3 files changed, 82 insertions(+), 43 deletions(-) diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index f1cb74e33..e2c823a91 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -300,7 +300,9 @@ EOF { $CurrentDll = $1; } - my $Category = GetLogLineCategory($Line); + my $Category = $LogName =~ /\.report$/ ? + GetReportLineCategory($Line) : + GetLogLineCategory($Line); if ($Category eq "error") { if ($PrintedDll ne $CurrentDll) @@ -488,7 +490,9 @@ EOF { foreach my $Line (<$LogFile>) { - my $Category = GetLogLineCategory($Line); + my $Category = $LogName =~ /\.report$/ ? + GetReportLineCategory($Line) : + GetLogLineCategory($Line); $MessagesFromLog .= $Line if ($Category eq "error"); } close($LogFile); diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index cabd18358..e6f9a27af 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -27,7 +27,8 @@ WineTestBot::LogUtils - Provides functions to parse task logs use Exporter 'import'; -our @EXPORT = qw(GetLogFileNames GetLogLabel GetLogLineCategory +our @EXPORT = qw(GetLogFileNames GetLogLabel + GetLogLineCategory GetReportLineCategory ParseTaskLog ParseWineTestReport); use File::Basename; @@ -80,6 +81,59 @@ sub ParseTaskLog($$) } +=pod +=over 12 + +=item C<GetLogLineCategory()> + +Identifies the category of the given log line: an error message, a Wine +diagnostic line, a TestBot error, etc. + +The category can then be used to decide whether to hide the line or, on +the contrary, highlight it. + +=back +=cut + +sub GetLogLineCategory($) +{ + my ($Line) = @_; + + if (# Git errors + $Line =~ /^CONFLICT / or + $Line =~ /^error: patch failed:/ or + $Line =~ /^error: corrupt patch / or + # Build errors + $Line =~ /: error: / or + $Line =~ /^make: [*]{3} No rule to make target / or + $Line =~ /^Makefile:[0-9]+: recipe for target .* failed$/ or + $Line =~ /^(?:Build|Reconfig|Task): (?!ok)/ or + # Typical perl errors + $Line =~ /^Use of uninitialized value/) + { + return "error"; + } + if ($Line =~ /:winediag:/) + { + return "diag"; + } + if ($Line =~ /^BotError:/ or + $Line =~ /^X Error of failed request: / or + $Line =~ / opcode of failed request: /) + { + return "boterror"; + } + if (# Build messages + $Line =~ /^\+ \S/ or + $Line =~ /^(?:Build|Reconfig|Task): ok/) + { + return "info"; + } + + return "none"; +} + + # # WineTest report parser # @@ -383,23 +437,21 @@ sub ParseWineTestReport($$$$) } -# -# Log querying and formatting -# - =pod =over 12 -=item C<GetLogLineCategory()> +=item C<GetReportLineCategory()> + +Identifies the category of the given test report line: an error message, +a todo, just an informational message or none of these. -Identifies the category of the given log line: an error message, a todo, just -an informational message or none of these. The category can then be used to -decide whether to hide the line or, on the contrary, highlight it. +The category can then be used to decide whether to hide the line or, on +the contrary, highlight it. =back =cut -sub GetLogLineCategory($) +sub GetReportLineCategory($) { my ($Line) = @_; @@ -416,35 +468,11 @@ sub GetLogLineCategory($) $Line =~ /Fatal: test .* does not exist/ or $Line =~ / done $258$/ or $Line =~ /: unhandled exception [0-9a-fA-F]{8} at / or - $Line =~ /^Unhandled exception: / or - # Git errors - $Line =~ /^CONFLICT / or - $Line =~ /^error: patch failed:/ or - $Line =~ /^error: corrupt patch / or - # Build errors - $Line =~ /: error: / or - $Line =~ /^make: [*]{3} No rule to make target / or - $Line =~ /^Makefile:[0-9]+: recipe for target .* failed$/ or - $Line =~ /^(?:Build|Reconfig|Task): (?!ok)/ or - # Typical perl errors - $Line =~ /^Use of uninitialized value/) + $Line =~ /^Unhandled exception: /) { return "error"; } - if ($Line =~ /:winediag:/) - { - return "diag"; - } - if ($Line =~ /^BotError:/ or - $Line =~ /^X Error of failed request: / or - $Line =~ / opcode of failed request: /) - { - return "boterror"; - } - if ($Line =~ /^\+ \S/ or - $Line =~ /^[_.a-z0-9-]+:[_a-z0-9]* start / or - # Build messages - $Line =~ /^(?:Build|Reconfig|Task): ok/) + if ($Line =~ /^[_.a-z0-9-]+:[_a-z0-9]* start /) { return "info"; } @@ -452,6 +480,11 @@ sub GetLogLineCategory($) return "none"; } + +# +# Log querying and formatting +# + =pod =over 12 diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 3fcec5db6..ee4e53930 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -245,11 +245,13 @@ highlighted to make the log more readable. =back =cut -sub GetHtmlLine($$$) +sub GetHtmlLine($$$$) { - my ($self, $FullLog, $Line) = @_; + my ($self, $LogName, $FullLog, $Line) = @_; - my $Category = GetLogLineCategory($Line); + my $Category = $LogName =~ /\.report$/ ? + GetReportLineCategory($Line) : + GetLogLineCategory($Line); return undef if ($Category !~ /error/ and !$FullLog); my $Html = $self->escapeHTML($Line); @@ -403,7 +405,7 @@ sub GenerateBody($) $HasLogEntries = 1; chomp $Line; $CurrentDll = $1 if ($Line =~ m/^([_.a-z0-9-]+):[_a-z0-9]* start /); - my $Html = $self->GetHtmlLine($MoreInfo->{Full}, $Line); + my $Html = $self->GetHtmlLine($LogName, $MoreInfo->{Full}, $Line); next if (!defined $Html); if ($PrintedDll ne $CurrentDll && !$MoreInfo->{Full}) @@ -476,7 +478,7 @@ sub GenerateBody($) print "<pre><code>"; $ErrFirst = 0; } - print $self->GetHtmlLine(1, $Line), "\n"; + print $self->GetHtmlLine($ErrName, 1, $Line), "\n"; } close($ErrFile); -- 2.18.0

1 0

[PATCH] wbemdisp: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 19 Jul '18

19 Jul '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wbemdisp/locator.c | 4 ++-- dlls/wbemdisp/main.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wbemdisp/locator.c b/dlls/wbemdisp/locator.c index cdc0ab4479..1c7f56ad25 100644 --- a/dlls/wbemdisp/locator.c +++ b/dlls/wbemdisp/locator.c @@ -1641,7 +1641,7 @@ static HRESULT WINAPI services_DeleteAsync( static BSTR build_query_string( const WCHAR *class ) { static const WCHAR selectW[] = {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ',0}; - UINT len = strlenW(class) + sizeof(selectW) / sizeof(selectW[0]); + UINT len = strlenW(class) + ARRAY_SIZE(selectW); BSTR ret; if (!(ret = SysAllocStringLen( NULL, len ))) return NULL; @@ -2074,7 +2074,7 @@ static BSTR build_resource_string( BSTR server, BSTR namespace ) if (server && *server) len_server = strlenW( server ); else len_server = 1; if (namespace && *namespace) len_namespace = strlenW( namespace ); - else len_namespace = sizeof(defaultW) / sizeof(defaultW[0]) - 1; + else len_namespace = ARRAY_SIZE(defaultW) - 1; if (!(ret = SysAllocStringLen( NULL, 2 + len_server + 1 + len_namespace ))) return NULL; diff --git a/dlls/wbemdisp/main.c b/dlls/wbemdisp/main.c index 9d9b0adf40..aff4d5042b 100644 --- a/dlls/wbemdisp/main.c +++ b/dlls/wbemdisp/main.c @@ -374,7 +374,7 @@ static HRESULT WINAPI WinMGMTS_ParseDisplayName(IParseDisplayName *iface, IBindC ULONG *pchEaten, IMoniker **ppmkOut) { static const WCHAR prefixW[] = {'w','i','n','m','g','m','t','s',':',0}; - const DWORD prefix_len = sizeof(prefixW) / sizeof(prefixW[0]) - 1; + const DWORD prefix_len = ARRAY_SIZE(prefixW) - 1; ISWbemLocator *locator = NULL; ISWbemServices *services = NULL; ISWbemObject *obj = NULL; -- 2.14.4

2 1

← Newer
1
...
21
22
23
24
25
26
27
...
64
Older →

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-devel July 2018