April 2020 - Wine-devel - list.winehq.org

[PATCH] winapi: Update to "use warnings 'all'".
by Serge Gautherie 16 Apr '20

16 Apr '20

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- tools/winapi/c_function.pm | 1 + tools/winapi/c_parser.pm | 1 + tools/winapi/c_type.pm | 1 + tools/winapi/config.pm | 1 + tools/winapi/function.pm | 1 + tools/winapi/make_filter | 3 ++- tools/winapi/make_filter_options.pm | 4 +++- tools/winapi/make_parser.pm | 1 + tools/winapi/modules.pm | 1 + tools/winapi/msvcmaker | 3 ++- tools/winapi/msvcmaker_options.pm | 4 +++- tools/winapi/nativeapi.pm | 1 + tools/winapi/options.pm | 2 ++ tools/winapi/output.pm | 2 ++ tools/winapi/preprocessor.pm | 1 + tools/winapi/setup.pm | 1 + tools/winapi/tests.pm | 1 + tools/winapi/type.pm | 1 + tools/winapi/util.pm | 1 + tools/winapi/winapi.pm | 1 + tools/winapi/winapi_check | 3 ++- tools/winapi/winapi_check_options.pm | 8 ++++++-- tools/winapi/winapi_documentation.pm | 1 + tools/winapi/winapi_extract | 3 ++- tools/winapi/winapi_extract_options.pm | 4 +++- tools/winapi/winapi_function.pm | 4 +++- tools/winapi/winapi_global.pm | 1 + tools/winapi/winapi_local.pm | 1 + tools/winapi/winapi_module_user.pm | 1 + tools/winapi/winapi_parser.pm | 1 + tools/winapi/winapi_test | 3 ++- tools/winapi/winapi_test_options.pm | 4 +++- 32 files changed, 54 insertions(+), 12 deletions(-) diff --git a/tools/winapi/c_function.pm b/tools/winapi/c_function.pm index 773c6b2..4bef581 100644 --- a/tools/winapi/c_function.pm +++ b/tools/winapi/c_function.pm @@ -19,6 +19,7 @@ package c_function; use strict; +use warnings 'all'; sub new($) { diff --git a/tools/winapi/c_parser.pm b/tools/winapi/c_parser.pm index d42e04a..77e524f 100644 --- a/tools/winapi/c_parser.pm +++ b/tools/winapi/c_parser.pm @@ -19,6 +19,7 @@ package c_parser; use strict; +use warnings 'all'; use vars qw($VERSION @ISA @EXPORT @EXPORT_OK); require Exporter; diff --git a/tools/winapi/c_type.pm b/tools/winapi/c_type.pm index c6aeb6a..ba1aec2 100644 --- a/tools/winapi/c_type.pm +++ b/tools/winapi/c_type.pm @@ -19,6 +19,7 @@ package c_type; use strict; +use warnings 'all'; use output qw($output); diff --git a/tools/winapi/config.pm b/tools/winapi/config.pm index fd45dc7..ceba90a 100644 --- a/tools/winapi/config.pm +++ b/tools/winapi/config.pm @@ -19,6 +19,7 @@ package config; use strict; +use warnings 'all'; use setup qw($current_dir $wine_dir $winapi_dir); diff --git a/tools/winapi/function.pm b/tools/winapi/function.pm index c53daa6..2bc2c4c 100644 --- a/tools/winapi/function.pm +++ b/tools/winapi/function.pm @@ -19,6 +19,7 @@ package function; use strict; +use warnings 'all'; sub new($) { my $proto = shift; diff --git a/tools/winapi/make_filter b/tools/winapi/make_filter index 45665de..f080706 100755 --- a/tools/winapi/make_filter +++ b/tools/winapi/make_filter @@ -1,4 +1,4 @@ -#! /usr/bin/perl -w +#!/usr/bin/perl # # Copyright 1999, 2000, 2001 Patrik Stridvall # @@ -18,6 +18,7 @@ # use strict; +use warnings 'all'; BEGIN { $0 =~ m%^(.*?/?tools)/winapi/make_filter$%; diff --git a/tools/winapi/make_filter_options.pm b/tools/winapi/make_filter_options.pm index 0cb81cd..7008487 100644 --- a/tools/winapi/make_filter_options.pm +++ b/tools/winapi/make_filter_options.pm @@ -17,9 +17,11 @@ # package make_filter_options; -use base qw(options); use strict; +use warnings 'all'; + +use base qw(options); use vars qw($VERSION @ISA @EXPORT @EXPORT_OK); require Exporter; diff --git a/tools/winapi/make_parser.pm b/tools/winapi/make_parser.pm index 773c5f3..2f5788d 100644 --- a/tools/winapi/make_parser.pm +++ b/tools/winapi/make_parser.pm @@ -19,6 +19,7 @@ package make_parser; use strict; +use warnings 'all'; use setup qw($current_dir $wine_dir $winapi_dir); diff --git a/tools/winapi/modules.pm b/tools/winapi/modules.pm index cbf1a2a..0651a7f 100644 --- a/tools/winapi/modules.pm +++ b/tools/winapi/modules.pm @@ -19,6 +19,7 @@ package modules; use strict; +use warnings 'all'; use vars qw($VERSION @ISA @EXPORT @EXPORT_OK); require Exporter; diff --git a/tools/winapi/msvcmaker b/tools/winapi/msvcmaker index a18eb97..864b2b7 100755 --- a/tools/winapi/msvcmaker +++ b/tools/winapi/msvcmaker @@ -1,8 +1,9 @@ -#! /usr/bin/perl -w +#!/usr/bin/perl # Copyright 2002 Patrik Stridvall use strict; +use warnings 'all'; BEGIN { $0 =~ m%^(.*?/?tools)/winapi/msvcmaker$%; diff --git a/tools/winapi/msvcmaker_options.pm b/tools/winapi/msvcmaker_options.pm index 32bdffd..242dcb9 100644 --- a/tools/winapi/msvcmaker_options.pm +++ b/tools/winapi/msvcmaker_options.pm @@ -17,9 +17,11 @@ # package msvcmaker_options; -use base qw(options); use strict; +use warnings 'all'; + +use base qw(options); use vars qw($VERSION @ISA @EXPORT @EXPORT_OK); require Exporter; diff --git a/tools/winapi/nativeapi.pm b/tools/winapi/nativeapi.pm index 4804486..bc58d96 100644 --- a/tools/winapi/nativeapi.pm +++ b/tools/winapi/nativeapi.pm @@ -19,6 +19,7 @@ package nativeapi; use strict; +use warnings 'all'; use vars qw($VERSION @ISA @EXPORT @EXPORT_OK); require Exporter; diff --git a/tools/winapi/options.pm b/tools/winapi/options.pm index 3daeb11..2254852 100644 --- a/tools/winapi/options.pm +++ b/tools/winapi/options.pm @@ -19,6 +19,7 @@ package options; use strict; +use warnings 'all'; use vars qw($VERSION @ISA @EXPORT @EXPORT_OK); require Exporter; @@ -58,6 +59,7 @@ sub parse_value($$) { package _options; use strict; +use warnings 'all'; use output qw($output); diff --git a/tools/winapi/output.pm b/tools/winapi/output.pm index f2c8d79..381570a 100644 --- a/tools/winapi/output.pm +++ b/tools/winapi/output.pm @@ -19,6 +19,7 @@ package output; use strict; +use warnings 'all'; use vars qw($VERSION @ISA @EXPORT @EXPORT_OK); require Exporter; @@ -34,6 +35,7 @@ $output = '_output'->new; package _output; use strict; +use warnings 'all'; my $stdout_isatty = -t STDOUT; my $stderr_isatty = -t STDERR; diff --git a/tools/winapi/preprocessor.pm b/tools/winapi/preprocessor.pm index 3d49773..796f7df 100644 --- a/tools/winapi/preprocessor.pm +++ b/tools/winapi/preprocessor.pm @@ -19,6 +19,7 @@ package preprocessor; use strict; +use warnings 'all'; sub new($) { my $proto = shift; diff --git a/tools/winapi/setup.pm b/tools/winapi/setup.pm index 60a35c5..ed08460 100644 --- a/tools/winapi/setup.pm +++ b/tools/winapi/setup.pm @@ -19,6 +19,7 @@ package setup; use strict; +use warnings 'all'; BEGIN { use vars qw($VERSION @ISA @EXPORT @EXPORT_OK); diff --git a/tools/winapi/tests.pm b/tools/winapi/tests.pm index 142538c..6553da3 100644 --- a/tools/winapi/tests.pm +++ b/tools/winapi/tests.pm @@ -19,6 +19,7 @@ package tests; use strict; +use warnings 'all'; use vars qw($VERSION @ISA @EXPORT @EXPORT_OK); require Exporter; diff --git a/tools/winapi/type.pm b/tools/winapi/type.pm index 8f66780..b18383a 100644 --- a/tools/winapi/type.pm +++ b/tools/winapi/type.pm @@ -19,6 +19,7 @@ package type; use strict; +use warnings 'all'; sub new($) { my $proto = shift; diff --git a/tools/winapi/util.pm b/tools/winapi/util.pm index 6697d56..8f400da 100644 --- a/tools/winapi/util.pm +++ b/tools/winapi/util.pm @@ -19,6 +19,7 @@ package util; use strict; +use warnings 'all'; use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS); require Exporter; diff --git a/tools/winapi/winapi.pm b/tools/winapi/winapi.pm index c770465..62b4311 100644 --- a/tools/winapi/winapi.pm +++ b/tools/winapi/winapi.pm @@ -19,6 +19,7 @@ package winapi; use strict; +use warnings 'all'; use vars qw($VERSION @ISA @EXPORT @EXPORT_OK); require Exporter; diff --git a/tools/winapi/winapi_check b/tools/winapi/winapi_check index 61a0635..bfc9fc7 100755 --- a/tools/winapi/winapi_check +++ b/tools/winapi/winapi_check @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!/usr/bin/perl # Copyright 1999-2002 Patrik Stridvall # @@ -28,6 +28,7 @@ # use strict; +use warnings 'all'; BEGIN { $0 =~ m%^(.*?/?tools)/winapi/winapi_check$%; diff --git a/tools/winapi/winapi_check_options.pm b/tools/winapi/winapi_check_options.pm index 23abb1f..8e17744 100644 --- a/tools/winapi/winapi_check_options.pm +++ b/tools/winapi/winapi_check_options.pm @@ -17,9 +17,11 @@ # package winapi_check_options; -use base qw(options); use strict; +use warnings 'all'; + +use base qw(options); use vars qw($VERSION @ISA @EXPORT @EXPORT_OK); require Exporter; @@ -161,9 +163,11 @@ my $options_usage = "usage: winapi_check [--help] [<files>]\n"; $options = '_winapi_check_options'->new(\%options_long, \%options_short, $options_usage); package _winapi_check_options; -use base qw(_options); use strict; +use warnings 'all'; + +use base qw(_options); sub report_module($$) { my $self = shift; diff --git a/tools/winapi/winapi_documentation.pm b/tools/winapi/winapi_documentation.pm index d959e11..2be7c8c 100644 --- a/tools/winapi/winapi_documentation.pm +++ b/tools/winapi/winapi_documentation.pm @@ -19,6 +19,7 @@ package winapi_documentation; use strict; +use warnings 'all'; use config qw($current_dir $wine_dir); use modules qw($modules); diff --git a/tools/winapi/winapi_extract b/tools/winapi/winapi_extract index 1d165b9..b53fbcf 100755 --- a/tools/winapi/winapi_extract +++ b/tools/winapi/winapi_extract @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!/usr/bin/perl # Copyright 2002 Patrik Stridvall # @@ -18,6 +18,7 @@ # use strict; +use warnings 'all'; BEGIN { $0 =~ m%^(.*?/?tools)/winapi/winapi_extract$%; diff --git a/tools/winapi/winapi_extract_options.pm b/tools/winapi/winapi_extract_options.pm index 0e5754e..5126ba4 100644 --- a/tools/winapi/winapi_extract_options.pm +++ b/tools/winapi/winapi_extract_options.pm @@ -17,9 +17,11 @@ # package winapi_extract_options; -use base qw(options); use strict; +use warnings 'all'; + +use base qw(options); use vars qw($VERSION @ISA @EXPORT @EXPORT_OK); require Exporter; diff --git a/tools/winapi/winapi_function.pm b/tools/winapi/winapi_function.pm index 633e9ea..d4cfb72 100644 --- a/tools/winapi/winapi_function.pm +++ b/tools/winapi/winapi_function.pm @@ -17,9 +17,11 @@ # package winapi_function; -use base qw(function); use strict; +use warnings 'all'; + +use base qw(function); use config qw($current_dir $wine_dir); use util qw(normalize_set); diff --git a/tools/winapi/winapi_global.pm b/tools/winapi/winapi_global.pm index 38c0dfe..bb1403c 100644 --- a/tools/winapi/winapi_global.pm +++ b/tools/winapi/winapi_global.pm @@ -19,6 +19,7 @@ package winapi_global; use strict; +use warnings 'all'; use modules qw($modules); use nativeapi qw($nativeapi); diff --git a/tools/winapi/winapi_local.pm b/tools/winapi/winapi_local.pm index 42dd146..a9aef17 100644 --- a/tools/winapi/winapi_local.pm +++ b/tools/winapi/winapi_local.pm @@ -19,6 +19,7 @@ package winapi_local; use strict; +use warnings 'all'; use nativeapi qw($nativeapi); use options qw($options); diff --git a/tools/winapi/winapi_module_user.pm b/tools/winapi/winapi_module_user.pm index ef14453..53bce8e 100644 --- a/tools/winapi/winapi_module_user.pm +++ b/tools/winapi/winapi_module_user.pm @@ -19,6 +19,7 @@ package winapi_module_user; use strict; +use warnings 'all'; use vars qw($VERSION @ISA @EXPORT @EXPORT_OK); require Exporter; diff --git a/tools/winapi/winapi_parser.pm b/tools/winapi/winapi_parser.pm index 3703837..87e286f 100644 --- a/tools/winapi/winapi_parser.pm +++ b/tools/winapi/winapi_parser.pm @@ -19,6 +19,7 @@ package winapi_parser; use strict; +use warnings 'all'; use output qw($output); use options qw($options); diff --git a/tools/winapi/winapi_test b/tools/winapi/winapi_test index 8b7596f..8051591 100755 --- a/tools/winapi/winapi_test +++ b/tools/winapi/winapi_test @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!/usr/bin/perl # Copyright 2002 Patrik Stridvall # @@ -18,6 +18,7 @@ # use strict; +use warnings 'all'; BEGIN { $0 =~ m%^(.*?/?tools)/winapi/winapi_test$%; diff --git a/tools/winapi/winapi_test_options.pm b/tools/winapi/winapi_test_options.pm index 240e840..c422b65 100644 --- a/tools/winapi/winapi_test_options.pm +++ b/tools/winapi/winapi_test_options.pm @@ -17,9 +17,11 @@ # package winapi_test_options; -use base qw(options); use strict; +use warnings 'all'; + +use base qw(options); use vars qw($VERSION @ISA @EXPORT @EXPORT_OK); require Exporter; -- 2.10.0.windows.1

1 0

[PATCH] winedbg: Add compatibility manifest to fix displayed Windows version.
by Brendan Shanks 16 Apr '20

16 Apr '20

Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- programs/winedbg/winedbg.manifest | 17 +++++++++++++++++ programs/winedbg/winedbg.rc | 3 +++ 2 files changed, 20 insertions(+) create mode 100644 programs/winedbg/winedbg.manifest diff --git a/programs/winedbg/winedbg.manifest b/programs/winedbg/winedbg.manifest new file mode 100644 index 0000000000..f7188313aa --- /dev/null +++ b/programs/winedbg/winedbg.manifest @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> +<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1"> + <application> +  + <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/> +  + <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/> +  + <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/> +  + <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/> +  + <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/> + </application> +</compatibility> +</assembly> diff --git a/programs/winedbg/winedbg.rc b/programs/winedbg/winedbg.rc index 7ad7686d28..af0018c3cf 100644 --- a/programs/winedbg/winedbg.rc +++ b/programs/winedbg/winedbg.rc @@ -75,3 +75,6 @@ BEGIN DEFPUSHBUTTON "Close", IDOK, 326, 320, 70, 16, WS_TABSTOP PUSHBUTTON "&Save As...", ID_SAVEAS, 252, 320, 70, 16, WS_TABSTOP END + +/* @makedep: winedbg.manifest */ +1 RT_MANIFEST winedbg.manifest -- 2.24.1

2 1

[PATCH v3 1/6] dxgi: Create frame latency event for D3D12 swap chain if requested.
by Philip Rebohle 16 Apr '20

16 Apr '20

Signed-off-by: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> --- v2: Don't set manual-reset flag for the event. v3: Fix frame_latency_event type. dlls/dxgi/swapchain.c | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index f19b58da2e..58353ec1b7 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -1094,6 +1094,9 @@ struct d3d12_swapchain IDXGIOutput *target; DXGI_SWAP_CHAIN_DESC1 desc; DXGI_SWAP_CHAIN_FULLSCREEN_DESC fullscreen_desc; + + ID3D12Fence *frame_latency_fence; + HANDLE frame_latency_event; }; static DXGI_FORMAT dxgi_format_from_vk_format(VkFormat vk_format) @@ -1887,6 +1890,12 @@ static void d3d12_swapchain_destroy(struct d3d12_swapchain *swapchain) d3d12_swapchain_destroy_buffers(swapchain, TRUE); + if (swapchain->frame_latency_event) + CloseHandle(swapchain->frame_latency_event); + + if (swapchain->frame_latency_fence) + ID3D12Fence_Release(swapchain->frame_latency_fence); + if (swapchain->command_queue) ID3D12CommandQueue_Release(swapchain->command_queue); @@ -2906,7 +2915,7 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI FIXME("Ignoring scaling %#x.\n", swapchain_desc->Scaling); if (swapchain_desc->AlphaMode && swapchain_desc->AlphaMode != DXGI_ALPHA_MODE_IGNORE) FIXME("Ignoring alpha mode %#x.\n", swapchain_desc->AlphaMode); - if (swapchain_desc->Flags) + if (swapchain_desc->Flags & ~(DXGI_SWAP_CHAIN_FLAG_FRAME_LATENCY_WAITABLE_OBJECT)) FIXME("Ignoring swapchain flags %#x.\n", swapchain_desc->Flags); if (fullscreen_desc->RefreshRate.Numerator || fullscreen_desc->RefreshRate.Denominator) @@ -2983,6 +2992,25 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI return hresult_from_vk_result(vr); } + if (swapchain_desc->Flags & DXGI_SWAP_CHAIN_FLAG_FRAME_LATENCY_WAITABLE_OBJECT) + { + if (FAILED(hr = ID3D12Device_CreateFence(device, DXGI_MAX_SWAP_CHAIN_BUFFERS, + 0, &IID_ID3D12Fence, (void **)&swapchain->frame_latency_fence))) + { + WARN("Failed to create D3D12 fence, hr %d.\n", hr); + d3d12_swapchain_destroy(swapchain); + return hr; + } + + if (!(swapchain->frame_latency_event = CreateEventW(NULL, FALSE, TRUE, NULL))) + { + hr = HRESULT_FROM_WIN32(GetLastError()); + WARN("Failed to create frame latency event, hr %d.\n", hr); + d3d12_swapchain_destroy(swapchain); + return hr; + } + } + IWineDXGIFactory_AddRef(swapchain->factory = factory); return S_OK; -- 2.26.0

2 6

[PATCH] winapi_test: Fix 'MIXERLINECONTROL[AW]' typos, in tests.dat.
by Serge Gautherie 16 Apr '20

16 Apr '20

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- Addendum to e9e6845d66645daff6ffcfe599e03849e6ba9d32. --- dlls/winmm/tests/generated.c | 46 ++++++++++++++++++++++++++++++++++++++++++++ tools/winapi/tests.dat | 4 ++-- 2 files changed, 48 insertions(+), 2 deletions(-) diff --git a/dlls/winmm/tests/generated.c b/dlls/winmm/tests/generated.c index 4c0fe7a..78051c6 100644 --- a/dlls/winmm/tests/generated.c +++ b/dlls/winmm/tests/generated.c @@ -814,6 +814,28 @@ static void test_pack_MIXERCONTROLW(void) TEST_FIELD_OFFSET(MIXERCONTROLW, cMultipleItems, 16) } +static void test_pack_MIXERLINECONTROLSA(void) +{ + /* MIXERLINECONTROLSA (pack 1) */ + TEST_FIELD_SIZE (MIXERLINECONTROLSA, cbStruct, 4) + TEST_FIELD_ALIGN (MIXERLINECONTROLSA, cbStruct, 1) + TEST_FIELD_OFFSET(MIXERLINECONTROLSA, cbStruct, 0) + TEST_FIELD_SIZE (MIXERLINECONTROLSA, dwLineID, 4) + TEST_FIELD_ALIGN (MIXERLINECONTROLSA, dwLineID, 1) + TEST_FIELD_OFFSET(MIXERLINECONTROLSA, dwLineID, 4) +} + +static void test_pack_MIXERLINECONTROLSW(void) +{ + /* MIXERLINECONTROLSW (pack 1) */ + TEST_FIELD_SIZE (MIXERLINECONTROLSW, cbStruct, 4) + TEST_FIELD_ALIGN (MIXERLINECONTROLSW, cbStruct, 1) + TEST_FIELD_OFFSET(MIXERLINECONTROLSW, cbStruct, 0) + TEST_FIELD_SIZE (MIXERLINECONTROLSW, dwLineID, 4) + TEST_FIELD_ALIGN (MIXERLINECONTROLSW, dwLineID, 1) + TEST_FIELD_OFFSET(MIXERLINECONTROLSW, dwLineID, 4) +} + static void test_pack_MIXERCONTROLDETAILS(void) { /* MIXERCONTROLDETAILS (pack 1) */ @@ -3219,6 +3241,28 @@ static void test_pack_MIXERCONTROLW(void) TEST_FIELD_OFFSET(MIXERCONTROLW, cMultipleItems, 16) } +static void test_pack_MIXERLINECONTROLSA(void) +{ + /* MIXERLINECONTROLSA (pack 1) */ + TEST_FIELD_SIZE (MIXERLINECONTROLSA, cbStruct, 4) + TEST_FIELD_ALIGN (MIXERLINECONTROLSA, cbStruct, 1) + TEST_FIELD_OFFSET(MIXERLINECONTROLSA, cbStruct, 0) + TEST_FIELD_SIZE (MIXERLINECONTROLSA, dwLineID, 4) + TEST_FIELD_ALIGN (MIXERLINECONTROLSA, dwLineID, 1) + TEST_FIELD_OFFSET(MIXERLINECONTROLSA, dwLineID, 4) +} + +static void test_pack_MIXERLINECONTROLSW(void) +{ + /* MIXERLINECONTROLSW (pack 1) */ + TEST_FIELD_SIZE (MIXERLINECONTROLSW, cbStruct, 4) + TEST_FIELD_ALIGN (MIXERLINECONTROLSW, cbStruct, 1) + TEST_FIELD_OFFSET(MIXERLINECONTROLSW, cbStruct, 0) + TEST_FIELD_SIZE (MIXERLINECONTROLSW, dwLineID, 4) + TEST_FIELD_ALIGN (MIXERLINECONTROLSW, dwLineID, 1) + TEST_FIELD_OFFSET(MIXERLINECONTROLSW, dwLineID, 4) +} + static void test_pack_MIXERCONTROLDETAILS(void) { /* MIXERCONTROLDETAILS (pack 1) */ @@ -5001,6 +5045,8 @@ static void test_pack(void) test_pack_MIXERCONTROLDETAILS_UNSIGNED(); test_pack_MIXERCONTROLW(); test_pack_MIXERLINEA(); + test_pack_MIXERLINECONTROLSA(); + test_pack_MIXERLINECONTROLSW(); test_pack_MIXERLINEW(); test_pack_MMCKINFO(); test_pack_MMIOINFO(); diff --git a/tools/winapi/tests.dat b/tools/winapi/tests.dat index 3f470d4..64467c4 100644 --- a/tools/winapi/tests.dat +++ b/tools/winapi/tests.dat @@ -1790,8 +1790,8 @@ MIXERLINEA MIXERLINEW MIXERCONTROLA MIXERCONTROLW -MIXERLINECONTROLA -MIXERLINECONTROLW +MIXERLINECONTROLSA +MIXERLINECONTROLSW MIXERCONTROLDETAILS MIXERCONTROLDETAILS_LISTTEXTA MIXERCONTROLDETAILS_LISTTEXTW -- 2.10.0.windows.1

1 0

[PATCH 5/5] wined3d: Do not request coherent memory in wined3d_buffer_vk_create_buffer_object().
by Henri Verbeet 16 Apr '20

16 Apr '20

We may get coherent memory anyway, but we don't require it. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/buffer.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 47aca9218d7..2e2ae239210 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1589,9 +1589,8 @@ static BOOL wined3d_buffer_vk_create_buffer_object(struct wined3d_buffer_vk *buf usage |= VK_BUFFER_USAGE_INDIRECT_BUFFER_BIT; if (bind_flags & (WINED3D_BIND_STREAM_OUTPUT | WINED3D_BIND_RENDER_TARGET | WINED3D_BIND_DEPTH_STENCIL)) FIXME("Ignoring some bind flags %#x.\n", bind_flags); - memory_type = VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT - | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT - | VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT; + memory_type = VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT + | VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT; if (!(wined3d_context_vk_create_bo(context_vk, resource->size, usage, memory_type, &buffer_vk->bo))) { WARN("Failed to create Vulkan buffer.\n"); -- 2.20.1

1 0

[PATCH 4/5] wined3d: Flush non-coherent memory ranges in adapter_vk_unmap_bo_address().
by Henri Verbeet 16 Apr '20

16 Apr '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/adapter_vk.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index a015963ee67..1773f26ae7f 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -556,13 +556,30 @@ static void adapter_vk_unmap_bo_address(struct wined3d_context *context, const s { const struct wined3d_vk_info *vk_info; struct wined3d_device_vk *device_vk; + VkMappedMemoryRange range; struct wined3d_bo_vk *bo; + unsigned int i; if (!(bo = (struct wined3d_bo_vk *)data->buffer_object)) return; vk_info = wined3d_context_vk(context)->vk_info; device_vk = wined3d_device_vk(context->device); + + if (!(bo->memory_type & VK_MEMORY_PROPERTY_HOST_COHERENT_BIT)) + { + range.sType = VK_STRUCTURE_TYPE_MAPPED_MEMORY_RANGE; + range.pNext = NULL; + range.memory = bo->vk_memory; + + for (i = 0; i < range_count; ++i) + { + range.offset = ranges[i].offset; + range.size = ranges[i].size; + VK_CALL(vkFlushMappedMemoryRanges(device_vk->vk_device, 1, &range)); + } + } + VK_CALL(vkUnmapMemory(device_vk->vk_device, bo->vk_memory)); } -- 2.20.1

1 0

[PATCH 3/5] wined3d: Invalidate non-coherent memory before reading from it in adapter_vk_map_bo_address().
by Henri Verbeet 16 Apr '20

16 Apr '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/adapter_vk.c | 11 +++++++++++ dlls/wined3d/context_vk.c | 8 ++++++-- dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index a5900b29e59..a015963ee67 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -496,6 +496,7 @@ static void *adapter_vk_map_bo_address(struct wined3d_context *context, struct wined3d_device_vk *device_vk; VkCommandBuffer vk_command_buffer; VkBufferMemoryBarrier vk_barrier; + VkMappedMemoryRange range; struct wined3d_bo_vk *bo; void *map_ptr; VkResult vr; @@ -525,6 +526,16 @@ static void *adapter_vk_map_bo_address(struct wined3d_context *context, vk_barrier.size = size; VK_CALL(vkCmdPipelineBarrier(vk_command_buffer, VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, VK_PIPELINE_STAGE_HOST_BIT, 0, 0, NULL, 1, &vk_barrier, 0, NULL)); + + if (!(bo->memory_type & VK_MEMORY_PROPERTY_HOST_COHERENT_BIT)) + { + range.sType = VK_STRUCTURE_TYPE_MAPPED_MEMORY_RANGE; + range.pNext = NULL; + range.memory = bo->vk_memory; + range.offset = (uintptr_t)data->addr; + range.size = size; + VK_CALL(vkInvalidateMappedMemoryRanges(device_vk->vk_device, 1, &range)); + } } wined3d_context_vk_submit_command_buffer(context_vk); diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 84e701543f1..b0e65231f25 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -38,6 +38,7 @@ BOOL wined3d_context_vk_create_bo(struct wined3d_context_vk *context_vk, VkDevic struct wined3d_adapter_vk *adapter_vk; VkMemoryAllocateInfo allocate_info; VkBufferCreateInfo create_info; + unsigned int memory_type_idx; VkResult vr; adapter_vk = wined3d_adapter_vk(device_vk->d.adapter); @@ -62,14 +63,15 @@ BOOL wined3d_context_vk_create_bo(struct wined3d_context_vk *context_vk, VkDevic allocate_info.sType = VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO; allocate_info.pNext = NULL; allocate_info.allocationSize = memory_requirements.size; - allocate_info.memoryTypeIndex = wined3d_adapter_vk_get_memory_type_index(adapter_vk, + memory_type_idx = wined3d_adapter_vk_get_memory_type_index(adapter_vk, memory_requirements.memoryTypeBits, memory_type); - if (allocate_info.memoryTypeIndex == ~0u) + if (memory_type_idx == ~0u) { ERR("Failed to find suitable memory type.\n"); VK_CALL(vkDestroyBuffer(device_vk->vk_device, bo->vk_buffer, NULL)); return FALSE; } + allocate_info.memoryTypeIndex = memory_type_idx; if ((vr = VK_CALL(vkAllocateMemory(device_vk->vk_device, &allocate_info, NULL, &bo->vk_memory))) < 0) { ERR("Failed to allocate buffer memory, vr %s.\n", wined3d_debug_vkresult(vr)); @@ -85,6 +87,8 @@ BOOL wined3d_context_vk_create_bo(struct wined3d_context_vk *context_vk, VkDevic return FALSE; } + bo->memory_type = adapter_vk->memory_properties.memoryTypes[memory_type_idx].propertyFlags; + return TRUE; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c2fde81e641..55243050b03 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1521,6 +1521,8 @@ struct wined3d_bo_vk { VkBuffer vk_buffer; VkDeviceMemory vk_memory; + + VkMemoryPropertyFlags memory_type; }; struct wined3d_bo_address -- 2.20.1

1 0

[PATCH 2/5] wined3d: Only insert read barriers for WINED3D_MAP_READ maps in adapter_vk_map_bo_address().
by Henri Verbeet 16 Apr '20

16 Apr '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/adapter_vk.c | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 85dfa6c987c..a5900b29e59 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -506,23 +506,26 @@ static void *adapter_vk_map_bo_address(struct wined3d_context *context, vk_info = context_vk->vk_info; device_vk = wined3d_device_vk(context->device); - if (!(vk_command_buffer = wined3d_context_vk_get_command_buffer(context_vk))) + if (map_flags & WINED3D_MAP_READ) { - ERR("Failed to get command buffer.\n"); - return NULL; - } + if (!(vk_command_buffer = wined3d_context_vk_get_command_buffer(context_vk))) + { + ERR("Failed to get command buffer.\n"); + return NULL; + } - vk_barrier.sType = VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER; - vk_barrier.pNext = NULL; - vk_barrier.srcAccessMask = vk_access_mask_from_bind_flags(bind_flags); - vk_barrier.dstAccessMask = VK_ACCESS_HOST_READ_BIT; - vk_barrier.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; - vk_barrier.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; - vk_barrier.buffer = bo->vk_buffer; - vk_barrier.offset = (uintptr_t)data->addr; - vk_barrier.size = size; - VK_CALL(vkCmdPipelineBarrier(vk_command_buffer, VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, - VK_PIPELINE_STAGE_HOST_BIT, 0, 0, NULL, 1, &vk_barrier, 0, NULL)); + vk_barrier.sType = VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER; + vk_barrier.pNext = NULL; + vk_barrier.srcAccessMask = vk_access_mask_from_bind_flags(bind_flags); + vk_barrier.dstAccessMask = VK_ACCESS_HOST_READ_BIT; + vk_barrier.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; + vk_barrier.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; + vk_barrier.buffer = bo->vk_buffer; + vk_barrier.offset = (uintptr_t)data->addr; + vk_barrier.size = size; + VK_CALL(vkCmdPipelineBarrier(vk_command_buffer, VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, + VK_PIPELINE_STAGE_HOST_BIT, 0, 0, NULL, 1, &vk_barrier, 0, NULL)); + } wined3d_context_vk_submit_command_buffer(context_vk); wined3d_context_vk_wait_command_buffer(context_vk, context_vk->current_command_buffer.id - 1); -- 2.20.1

1 0

[PATCH 1/5] wined3d: Move Vulkan specific context functions to context_vk.c.
by Henri Verbeet 16 Apr '20

16 Apr '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/Makefile.in | 1 + dlls/wined3d/context.c | 279 +----------------------------- dlls/wined3d/context_vk.c | 307 +++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 1 + 4 files changed, 310 insertions(+), 278 deletions(-) create mode 100644 dlls/wined3d/context_vk.c diff --git a/dlls/wined3d/Makefile.in b/dlls/wined3d/Makefile.in index 7ebd0106502..0f8be5bd18b 100644 --- a/dlls/wined3d/Makefile.in +++ b/dlls/wined3d/Makefile.in @@ -9,6 +9,7 @@ C_SRCS = \ ati_fragment_shader.c \ buffer.c \ context.c \ + context_vk.c \ cs.c \ device.c \ directx.c \ diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 41dbca24dbc..d20e9e6835e 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1493,123 +1493,6 @@ static void wined3d_context_gl_cleanup(struct wined3d_context_gl *context_gl) wined3d_context_cleanup(&context_gl->c); } -BOOL wined3d_context_vk_create_bo(struct wined3d_context_vk *context_vk, VkDeviceSize size, - VkBufferUsageFlags usage, VkMemoryPropertyFlags memory_type, struct wined3d_bo_vk *bo) -{ - struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); - const struct wined3d_vk_info *vk_info = context_vk->vk_info; - VkMemoryRequirements memory_requirements; - struct wined3d_adapter_vk *adapter_vk; - VkMemoryAllocateInfo allocate_info; - VkBufferCreateInfo create_info; - VkResult vr; - - adapter_vk = wined3d_adapter_vk(device_vk->d.adapter); - - create_info.sType = VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO; - create_info.pNext = NULL; - create_info.flags = 0; - create_info.size = size; - create_info.usage = usage; - create_info.sharingMode = VK_SHARING_MODE_EXCLUSIVE; - create_info.queueFamilyIndexCount = 0; - create_info.pQueueFamilyIndices = NULL; - - if ((vr = VK_CALL(vkCreateBuffer(device_vk->vk_device, &create_info, NULL, &bo->vk_buffer))) < 0) - { - ERR("Failed to create Vulkan buffer, vr %s.\n", wined3d_debug_vkresult(vr)); - return FALSE; - } - - VK_CALL(vkGetBufferMemoryRequirements(device_vk->vk_device, bo->vk_buffer, &memory_requirements)); - - allocate_info.sType = VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO; - allocate_info.pNext = NULL; - allocate_info.allocationSize = memory_requirements.size; - allocate_info.memoryTypeIndex = wined3d_adapter_vk_get_memory_type_index(adapter_vk, - memory_requirements.memoryTypeBits, memory_type); - if (allocate_info.memoryTypeIndex == ~0u) - { - ERR("Failed to find suitable memory type.\n"); - VK_CALL(vkDestroyBuffer(device_vk->vk_device, bo->vk_buffer, NULL)); - return FALSE; - } - if ((vr = VK_CALL(vkAllocateMemory(device_vk->vk_device, &allocate_info, NULL, &bo->vk_memory))) < 0) - { - ERR("Failed to allocate buffer memory, vr %s.\n", wined3d_debug_vkresult(vr)); - VK_CALL(vkDestroyBuffer(device_vk->vk_device, bo->vk_buffer, NULL)); - return FALSE; - } - - if ((vr = VK_CALL(vkBindBufferMemory(device_vk->vk_device, bo->vk_buffer, bo->vk_memory, 0))) < 0) - { - ERR("Failed to bind buffer memory, vr %s.\n", wined3d_debug_vkresult(vr)); - VK_CALL(vkFreeMemory(device_vk->vk_device, bo->vk_memory, NULL)); - VK_CALL(vkDestroyBuffer(device_vk->vk_device, bo->vk_buffer, NULL)); - return FALSE; - } - - return TRUE; -} - -void wined3d_context_vk_destroy_bo(struct wined3d_context_vk *context_vk, const struct wined3d_bo_vk *bo) -{ - struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); - const struct wined3d_vk_info *vk_info = context_vk->vk_info; - - VK_CALL(vkDestroyBuffer(device_vk->vk_device, bo->vk_buffer, NULL)); - VK_CALL(vkFreeMemory(device_vk->vk_device, bo->vk_memory, NULL)); -} - -static void wined3d_context_vk_cleanup_resources(struct wined3d_context_vk *context_vk) -{ - struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); - const struct wined3d_vk_info *vk_info = context_vk->vk_info; - struct wined3d_command_buffer_vk *buffer; - SIZE_T i = 0; - - while (i < context_vk->submitted.buffer_count) - { - buffer = &context_vk->submitted.buffers[i]; - if (VK_CALL(vkGetFenceStatus(device_vk->vk_device, buffer->vk_fence)) == VK_NOT_READY) - { - ++i; - continue; - } - - TRACE("Command buffer %p with id 0x%s has finished.\n", - buffer->vk_command_buffer, wine_dbgstr_longlong(buffer->id)); - VK_CALL(vkDestroyFence(device_vk->vk_device, buffer->vk_fence, NULL)); - VK_CALL(vkFreeCommandBuffers(device_vk->vk_device, - context_vk->vk_command_pool, 1, &buffer->vk_command_buffer)); - - if (buffer->id > context_vk->completed_command_buffer_id) - context_vk->completed_command_buffer_id = buffer->id; - *buffer = context_vk->submitted.buffers[--context_vk->submitted.buffer_count]; - } -} - -void wined3d_context_vk_cleanup(struct wined3d_context_vk *context_vk) -{ - struct wined3d_command_buffer_vk *buffer = &context_vk->current_command_buffer; - struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); - const struct wined3d_vk_info *vk_info = context_vk->vk_info; - - if (buffer->vk_command_buffer) - { - VK_CALL(vkFreeCommandBuffers(device_vk->vk_device, - context_vk->vk_command_pool, 1, &buffer->vk_command_buffer)); - buffer->vk_command_buffer = VK_NULL_HANDLE; - } - VK_CALL(vkDestroyCommandPool(device_vk->vk_device, context_vk->vk_command_pool, NULL)); - - wined3d_context_vk_wait_command_buffer(context_vk, buffer->id - 1); - context_vk->completed_command_buffer_id = buffer->id; - wined3d_context_vk_cleanup_resources(context_vk); - heap_free(context_vk->submitted.buffers); - wined3d_context_cleanup(&context_vk->c); -} - DWORD context_get_tls_idx(void) { return wined3d_context_tls_idx; @@ -2009,136 +1892,7 @@ HGLRC context_create_wgl_attribs(const struct wined3d_gl_info *gl_info, HDC hdc, return ctx; } -VkCommandBuffer wined3d_context_vk_get_command_buffer(struct wined3d_context_vk *context_vk) -{ - struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); - const struct wined3d_vk_info *vk_info = context_vk->vk_info; - VkCommandBufferAllocateInfo command_buffer_info; - struct wined3d_command_buffer_vk *buffer; - VkCommandBufferBeginInfo begin_info; - VkResult vr; - - TRACE("context_vk %p.\n", context_vk); - - buffer = &context_vk->current_command_buffer; - if (buffer->vk_command_buffer) - { - TRACE("Returning existing command buffer %p with id 0x%s.\n", - buffer->vk_command_buffer, wine_dbgstr_longlong(buffer->id)); - return buffer->vk_command_buffer; - } - - command_buffer_info.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO; - command_buffer_info.pNext = NULL; - command_buffer_info.commandPool = context_vk->vk_command_pool; - command_buffer_info.level = VK_COMMAND_BUFFER_LEVEL_PRIMARY; - command_buffer_info.commandBufferCount = 1; - if ((vr = VK_CALL(vkAllocateCommandBuffers(device_vk->vk_device, - &command_buffer_info, &buffer->vk_command_buffer))) < 0) - { - WARN("Failed to allocate Vulkan command buffer, vr %s.\n", wined3d_debug_vkresult(vr)); - return VK_NULL_HANDLE; - } - - begin_info.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO; - begin_info.pNext = NULL; - begin_info.flags = 0; - begin_info.pInheritanceInfo = NULL; - if ((vr = VK_CALL(vkBeginCommandBuffer(buffer->vk_command_buffer, &begin_info))) < 0) - { - WARN("Failed to begin command buffer, vr %s.\n", wined3d_debug_vkresult(vr)); - VK_CALL(vkFreeCommandBuffers(device_vk->vk_device, context_vk->vk_command_pool, - 1, &buffer->vk_command_buffer)); - return buffer->vk_command_buffer = VK_NULL_HANDLE; - } - - TRACE("Created new command buffer %p with id 0x%s.\n", - buffer->vk_command_buffer, wine_dbgstr_longlong(buffer->id)); - - return buffer->vk_command_buffer; -} - -void wined3d_context_vk_submit_command_buffer(struct wined3d_context_vk *context_vk) -{ - struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); - const struct wined3d_vk_info *vk_info = context_vk->vk_info; - struct wined3d_command_buffer_vk *buffer; - VkFenceCreateInfo fence_desc; - VkSubmitInfo submit_info; - VkResult vr; - - TRACE("context_vk %p.\n", context_vk); - - buffer = &context_vk->current_command_buffer; - if (!buffer->vk_command_buffer) - return; - - TRACE("Submitting command buffer %p with id 0x%s.\n", - buffer->vk_command_buffer, wine_dbgstr_longlong(buffer->id)); - - VK_CALL(vkEndCommandBuffer(buffer->vk_command_buffer)); - - fence_desc.sType = VK_STRUCTURE_TYPE_FENCE_CREATE_INFO; - fence_desc.pNext = NULL; - fence_desc.flags = 0; - if ((vr = VK_CALL(vkCreateFence(device_vk->vk_device, &fence_desc, NULL, &buffer->vk_fence))) < 0) - ERR("Failed to create fence, vr %s.\n", wined3d_debug_vkresult(vr)); - - submit_info.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO; - submit_info.pNext = NULL; - submit_info.waitSemaphoreCount = 0; - submit_info.pWaitSemaphores = NULL; - submit_info.pWaitDstStageMask = NULL; - submit_info.commandBufferCount = 1; - submit_info.pCommandBuffers = &buffer->vk_command_buffer; - submit_info.signalSemaphoreCount = 0; - submit_info.pSignalSemaphores = NULL; - - if ((vr = VK_CALL(vkQueueSubmit(device_vk->vk_queue, 1, &submit_info, buffer->vk_fence))) < 0) - ERR("Failed to submit command buffer %p, vr %s.\n", - buffer->vk_command_buffer, wined3d_debug_vkresult(vr)); - - if (!wined3d_array_reserve((void **)&context_vk->submitted.buffers, &context_vk->submitted.buffers_size, - context_vk->submitted.buffer_count + 1, sizeof(*context_vk->submitted.buffers))) - ERR("Failed to grow submitted command buffer array.\n"); - - context_vk->submitted.buffers[context_vk->submitted.buffer_count++] = *buffer; - - buffer->vk_command_buffer = VK_NULL_HANDLE; - /* We don't expect this to ever happen, but handle it anyway. */ - if (!++buffer->id) - { - wined3d_context_vk_wait_command_buffer(context_vk, buffer->id - 1); - context_vk->completed_command_buffer_id = 0; - buffer->id = 1; - } - wined3d_context_vk_cleanup_resources(context_vk); -} - -void wined3d_context_vk_wait_command_buffer(struct wined3d_context_vk *context_vk, uint64_t id) -{ - struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); - const struct wined3d_vk_info *vk_info = context_vk->vk_info; - SIZE_T i; - - if (id <= context_vk->completed_command_buffer_id) - return; - - for (i = 0; i < context_vk->submitted.buffer_count; ++i) - { - if (context_vk->submitted.buffers[i].id != id) - continue; - - VK_CALL(vkWaitForFences(device_vk->vk_device, 1, - &context_vk->submitted.buffers[i].vk_fence, VK_TRUE, UINT64_MAX)); - wined3d_context_vk_cleanup_resources(context_vk); - return; - } - - ERR("Failed to find fence for command buffer with id 0x%s.\n", wine_dbgstr_longlong(id)); -} - -static void wined3d_context_init(struct wined3d_context *context, struct wined3d_swapchain *swapchain) +void wined3d_context_init(struct wined3d_context *context, struct wined3d_swapchain *swapchain) { struct wined3d_device *device = swapchain->device; DWORD state; @@ -2583,37 +2337,6 @@ fail: return E_FAIL; } -HRESULT wined3d_context_vk_init(struct wined3d_context_vk *context_vk, struct wined3d_swapchain *swapchain) -{ - VkCommandPoolCreateInfo command_pool_info; - const struct wined3d_vk_info *vk_info; - struct wined3d_adapter_vk *adapter_vk; - struct wined3d_device_vk *device_vk; - VkResult vr; - - TRACE("context_vk %p, swapchain %p.\n", context_vk, swapchain); - - wined3d_context_init(&context_vk->c, swapchain); - device_vk = wined3d_device_vk(swapchain->device); - adapter_vk = wined3d_adapter_vk(device_vk->d.adapter); - context_vk->vk_info = vk_info = &adapter_vk->vk_info; - - command_pool_info.sType = VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO; - command_pool_info.pNext = NULL; - command_pool_info.flags = VK_COMMAND_POOL_CREATE_TRANSIENT_BIT; - command_pool_info.queueFamilyIndex = device_vk->vk_queue_family_index; - if ((vr = VK_CALL(vkCreateCommandPool(device_vk->vk_device, - &command_pool_info, NULL, &context_vk->vk_command_pool))) < 0) - { - ERR("Failed to create Vulkan command pool, vr %s.\n", wined3d_debug_vkresult(vr)); - wined3d_context_cleanup(&context_vk->c); - return E_FAIL; - } - context_vk->current_command_buffer.id = 1; - - return WINED3D_OK; -} - void wined3d_context_gl_destroy(struct wined3d_context_gl *context_gl) { struct wined3d_device *device = context_gl->c.device; diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c new file mode 100644 index 00000000000..84e701543f1 --- /dev/null +++ b/dlls/wined3d/context_vk.c @@ -0,0 +1,307 @@ +/* + * Copyright 2002-2004 Jason Edmeades + * Copyright 2002-2004 Raphael Junqueira + * Copyright 2004 Christian Costa + * Copyright 2005 Oliver Stieber + * Copyright 2006, 2008 Henri Verbeet + * Copyright 2007-2011, 2013 Stefan Dösinger for CodeWeavers + * Copyright 2009-2020 Henri Verbeet for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" +#include "wine/port.h" + +#include "wined3d_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(d3d); + +BOOL wined3d_context_vk_create_bo(struct wined3d_context_vk *context_vk, VkDeviceSize size, + VkBufferUsageFlags usage, VkMemoryPropertyFlags memory_type, struct wined3d_bo_vk *bo) +{ + struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); + const struct wined3d_vk_info *vk_info = context_vk->vk_info; + VkMemoryRequirements memory_requirements; + struct wined3d_adapter_vk *adapter_vk; + VkMemoryAllocateInfo allocate_info; + VkBufferCreateInfo create_info; + VkResult vr; + + adapter_vk = wined3d_adapter_vk(device_vk->d.adapter); + + create_info.sType = VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO; + create_info.pNext = NULL; + create_info.flags = 0; + create_info.size = size; + create_info.usage = usage; + create_info.sharingMode = VK_SHARING_MODE_EXCLUSIVE; + create_info.queueFamilyIndexCount = 0; + create_info.pQueueFamilyIndices = NULL; + + if ((vr = VK_CALL(vkCreateBuffer(device_vk->vk_device, &create_info, NULL, &bo->vk_buffer))) < 0) + { + ERR("Failed to create Vulkan buffer, vr %s.\n", wined3d_debug_vkresult(vr)); + return FALSE; + } + + VK_CALL(vkGetBufferMemoryRequirements(device_vk->vk_device, bo->vk_buffer, &memory_requirements)); + + allocate_info.sType = VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO; + allocate_info.pNext = NULL; + allocate_info.allocationSize = memory_requirements.size; + allocate_info.memoryTypeIndex = wined3d_adapter_vk_get_memory_type_index(adapter_vk, + memory_requirements.memoryTypeBits, memory_type); + if (allocate_info.memoryTypeIndex == ~0u) + { + ERR("Failed to find suitable memory type.\n"); + VK_CALL(vkDestroyBuffer(device_vk->vk_device, bo->vk_buffer, NULL)); + return FALSE; + } + if ((vr = VK_CALL(vkAllocateMemory(device_vk->vk_device, &allocate_info, NULL, &bo->vk_memory))) < 0) + { + ERR("Failed to allocate buffer memory, vr %s.\n", wined3d_debug_vkresult(vr)); + VK_CALL(vkDestroyBuffer(device_vk->vk_device, bo->vk_buffer, NULL)); + return FALSE; + } + + if ((vr = VK_CALL(vkBindBufferMemory(device_vk->vk_device, bo->vk_buffer, bo->vk_memory, 0))) < 0) + { + ERR("Failed to bind buffer memory, vr %s.\n", wined3d_debug_vkresult(vr)); + VK_CALL(vkFreeMemory(device_vk->vk_device, bo->vk_memory, NULL)); + VK_CALL(vkDestroyBuffer(device_vk->vk_device, bo->vk_buffer, NULL)); + return FALSE; + } + + return TRUE; +} + +void wined3d_context_vk_destroy_bo(struct wined3d_context_vk *context_vk, const struct wined3d_bo_vk *bo) +{ + struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); + const struct wined3d_vk_info *vk_info = context_vk->vk_info; + + VK_CALL(vkDestroyBuffer(device_vk->vk_device, bo->vk_buffer, NULL)); + VK_CALL(vkFreeMemory(device_vk->vk_device, bo->vk_memory, NULL)); +} + +static void wined3d_context_vk_cleanup_resources(struct wined3d_context_vk *context_vk) +{ + struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); + const struct wined3d_vk_info *vk_info = context_vk->vk_info; + struct wined3d_command_buffer_vk *buffer; + SIZE_T i = 0; + + while (i < context_vk->submitted.buffer_count) + { + buffer = &context_vk->submitted.buffers[i]; + if (VK_CALL(vkGetFenceStatus(device_vk->vk_device, buffer->vk_fence)) == VK_NOT_READY) + { + ++i; + continue; + } + + TRACE("Command buffer %p with id 0x%s has finished.\n", + buffer->vk_command_buffer, wine_dbgstr_longlong(buffer->id)); + VK_CALL(vkDestroyFence(device_vk->vk_device, buffer->vk_fence, NULL)); + VK_CALL(vkFreeCommandBuffers(device_vk->vk_device, + context_vk->vk_command_pool, 1, &buffer->vk_command_buffer)); + + if (buffer->id > context_vk->completed_command_buffer_id) + context_vk->completed_command_buffer_id = buffer->id; + *buffer = context_vk->submitted.buffers[--context_vk->submitted.buffer_count]; + } +} + +void wined3d_context_vk_cleanup(struct wined3d_context_vk *context_vk) +{ + struct wined3d_command_buffer_vk *buffer = &context_vk->current_command_buffer; + struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); + const struct wined3d_vk_info *vk_info = context_vk->vk_info; + + if (buffer->vk_command_buffer) + { + VK_CALL(vkFreeCommandBuffers(device_vk->vk_device, + context_vk->vk_command_pool, 1, &buffer->vk_command_buffer)); + buffer->vk_command_buffer = VK_NULL_HANDLE; + } + VK_CALL(vkDestroyCommandPool(device_vk->vk_device, context_vk->vk_command_pool, NULL)); + + wined3d_context_vk_wait_command_buffer(context_vk, buffer->id - 1); + context_vk->completed_command_buffer_id = buffer->id; + wined3d_context_vk_cleanup_resources(context_vk); + heap_free(context_vk->submitted.buffers); + wined3d_context_cleanup(&context_vk->c); +} + +VkCommandBuffer wined3d_context_vk_get_command_buffer(struct wined3d_context_vk *context_vk) +{ + struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); + const struct wined3d_vk_info *vk_info = context_vk->vk_info; + VkCommandBufferAllocateInfo command_buffer_info; + struct wined3d_command_buffer_vk *buffer; + VkCommandBufferBeginInfo begin_info; + VkResult vr; + + TRACE("context_vk %p.\n", context_vk); + + buffer = &context_vk->current_command_buffer; + if (buffer->vk_command_buffer) + { + TRACE("Returning existing command buffer %p with id 0x%s.\n", + buffer->vk_command_buffer, wine_dbgstr_longlong(buffer->id)); + return buffer->vk_command_buffer; + } + + command_buffer_info.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO; + command_buffer_info.pNext = NULL; + command_buffer_info.commandPool = context_vk->vk_command_pool; + command_buffer_info.level = VK_COMMAND_BUFFER_LEVEL_PRIMARY; + command_buffer_info.commandBufferCount = 1; + if ((vr = VK_CALL(vkAllocateCommandBuffers(device_vk->vk_device, + &command_buffer_info, &buffer->vk_command_buffer))) < 0) + { + WARN("Failed to allocate Vulkan command buffer, vr %s.\n", wined3d_debug_vkresult(vr)); + return VK_NULL_HANDLE; + } + + begin_info.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO; + begin_info.pNext = NULL; + begin_info.flags = 0; + begin_info.pInheritanceInfo = NULL; + if ((vr = VK_CALL(vkBeginCommandBuffer(buffer->vk_command_buffer, &begin_info))) < 0) + { + WARN("Failed to begin command buffer, vr %s.\n", wined3d_debug_vkresult(vr)); + VK_CALL(vkFreeCommandBuffers(device_vk->vk_device, context_vk->vk_command_pool, + 1, &buffer->vk_command_buffer)); + return buffer->vk_command_buffer = VK_NULL_HANDLE; + } + + TRACE("Created new command buffer %p with id 0x%s.\n", + buffer->vk_command_buffer, wine_dbgstr_longlong(buffer->id)); + + return buffer->vk_command_buffer; +} + +void wined3d_context_vk_submit_command_buffer(struct wined3d_context_vk *context_vk) +{ + struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); + const struct wined3d_vk_info *vk_info = context_vk->vk_info; + struct wined3d_command_buffer_vk *buffer; + VkFenceCreateInfo fence_desc; + VkSubmitInfo submit_info; + VkResult vr; + + TRACE("context_vk %p.\n", context_vk); + + buffer = &context_vk->current_command_buffer; + if (!buffer->vk_command_buffer) + return; + + TRACE("Submitting command buffer %p with id 0x%s.\n", + buffer->vk_command_buffer, wine_dbgstr_longlong(buffer->id)); + + VK_CALL(vkEndCommandBuffer(buffer->vk_command_buffer)); + + fence_desc.sType = VK_STRUCTURE_TYPE_FENCE_CREATE_INFO; + fence_desc.pNext = NULL; + fence_desc.flags = 0; + if ((vr = VK_CALL(vkCreateFence(device_vk->vk_device, &fence_desc, NULL, &buffer->vk_fence))) < 0) + ERR("Failed to create fence, vr %s.\n", wined3d_debug_vkresult(vr)); + + submit_info.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO; + submit_info.pNext = NULL; + submit_info.waitSemaphoreCount = 0; + submit_info.pWaitSemaphores = NULL; + submit_info.pWaitDstStageMask = NULL; + submit_info.commandBufferCount = 1; + submit_info.pCommandBuffers = &buffer->vk_command_buffer; + submit_info.signalSemaphoreCount = 0; + submit_info.pSignalSemaphores = NULL; + + if ((vr = VK_CALL(vkQueueSubmit(device_vk->vk_queue, 1, &submit_info, buffer->vk_fence))) < 0) + ERR("Failed to submit command buffer %p, vr %s.\n", + buffer->vk_command_buffer, wined3d_debug_vkresult(vr)); + + if (!wined3d_array_reserve((void **)&context_vk->submitted.buffers, &context_vk->submitted.buffers_size, + context_vk->submitted.buffer_count + 1, sizeof(*context_vk->submitted.buffers))) + ERR("Failed to grow submitted command buffer array.\n"); + + context_vk->submitted.buffers[context_vk->submitted.buffer_count++] = *buffer; + + buffer->vk_command_buffer = VK_NULL_HANDLE; + /* We don't expect this to ever happen, but handle it anyway. */ + if (!++buffer->id) + { + wined3d_context_vk_wait_command_buffer(context_vk, buffer->id - 1); + context_vk->completed_command_buffer_id = 0; + buffer->id = 1; + } + wined3d_context_vk_cleanup_resources(context_vk); +} + +void wined3d_context_vk_wait_command_buffer(struct wined3d_context_vk *context_vk, uint64_t id) +{ + struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); + const struct wined3d_vk_info *vk_info = context_vk->vk_info; + SIZE_T i; + + if (id <= context_vk->completed_command_buffer_id) + return; + + for (i = 0; i < context_vk->submitted.buffer_count; ++i) + { + if (context_vk->submitted.buffers[i].id != id) + continue; + + VK_CALL(vkWaitForFences(device_vk->vk_device, 1, + &context_vk->submitted.buffers[i].vk_fence, VK_TRUE, UINT64_MAX)); + wined3d_context_vk_cleanup_resources(context_vk); + return; + } + + ERR("Failed to find fence for command buffer with id 0x%s.\n", wine_dbgstr_longlong(id)); +} + +HRESULT wined3d_context_vk_init(struct wined3d_context_vk *context_vk, struct wined3d_swapchain *swapchain) +{ + VkCommandPoolCreateInfo command_pool_info; + const struct wined3d_vk_info *vk_info; + struct wined3d_adapter_vk *adapter_vk; + struct wined3d_device_vk *device_vk; + VkResult vr; + + TRACE("context_vk %p, swapchain %p.\n", context_vk, swapchain); + + wined3d_context_init(&context_vk->c, swapchain); + device_vk = wined3d_device_vk(swapchain->device); + adapter_vk = wined3d_adapter_vk(device_vk->d.adapter); + context_vk->vk_info = vk_info = &adapter_vk->vk_info; + + command_pool_info.sType = VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO; + command_pool_info.pNext = NULL; + command_pool_info.flags = VK_COMMAND_POOL_CREATE_TRANSIENT_BIT; + command_pool_info.queueFamilyIndex = device_vk->vk_queue_family_index; + if ((vr = VK_CALL(vkCreateCommandPool(device_vk->vk_device, + &command_pool_info, NULL, &context_vk->vk_command_pool))) < 0) + { + ERR("Failed to create Vulkan command pool, vr %s.\n", wined3d_debug_vkresult(vr)); + wined3d_context_cleanup(&context_vk->c); + return E_FAIL; + } + context_vk->current_command_buffer.id = 1; + + return WINED3D_OK; +} diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 5935a90cacb..c2fde81e641 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1994,6 +1994,7 @@ struct wined3d_context }; void wined3d_context_cleanup(struct wined3d_context *context) DECLSPEC_HIDDEN; +void wined3d_context_init(struct wined3d_context *context, struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; HRESULT wined3d_context_no3d_init(struct wined3d_context *context_no3d, struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; -- 2.20.1

1 0

[PATCH 2/2] windowscodecs: Implement DdsDecoder_Initialize().
by Ziqing Hui 16 Apr '20

16 Apr '20

DDS file layout can been found here: https://docs.microsoft.com/en-us/windows/win32/direct3ddds/dx-graphics-dds-… Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/ddsformat.c | 81 +++++++++++++++++++++++++++- dlls/windowscodecs/tests/ddsformat.c | 4 +- 2 files changed, 81 insertions(+), 4 deletions(-)

3 2