September 2023 - Wine-commits

Francois Gouget : testbot/LogUtils: Don't deduplicate the WineTest task.log files.
by Alexandre Julliard 14 Sep '23

14 Sep '23

Module: tools Branch: master Commit: ecf535afb7c5d7001a16eabd60f0047f4c5ede7e URL: https://gitlab.winehq.org/winehq/tools/-/commit/ecf535afb7c5d7001a16eabd60f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jun 26 19:34:13 2023 +0200 testbot/LogUtils: Don't deduplicate the WineTest task.log files. The task.log file for a win32 test run is not redundant with one for a wow64 run. Ideally one would deduplicate the task.log within each category but it's simpler to just not deduplicate them at all. --- testbot/lib/WineTestBot/LogUtils.pm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 56025688..8ea2dd50 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -1815,8 +1815,13 @@ sub UpdateLatestReport($$) } } - my $ErrMessage = _DeduplicateLatestReport($RefReportName); - push @ErrMessages, $ErrMessage if (defined $ErrMessage); + # The task.log file for a win32 test run is not redundant with one for a + # wow64 run. So skip deduplication entirely for task.log files. + if ($RefReportName !~ /-task\.log$/) + { + my $ErrMessage = _DeduplicateLatestReport($RefReportName); + push @ErrMessages, $ErrMessage if (defined $ErrMessage); + } return \@ErrMessages; }

1 0

Francois Gouget : testbot: Snapshot the reference reports early.
by Alexandre Julliard 14 Sep '23

14 Sep '23

Module: tools Branch: master Commit: 856148104c40f153dcc91435b02a84c05b918f77 URL: https://gitlab.winehq.org/winehq/tools/-/commit/856148104c40f153dcc91435b02… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Jun 25 12:02:58 2023 +0200 testbot: Snapshot the reference reports early. Only WineRunWineTest.pl really needs it so the task.log reference reports are available early enough. But apply the change to all 4 scripts for consistency. --- testbot/bin/WineRunBuild.pl | 12 ++++++++---- testbot/bin/WineRunReconfig.pl | 12 ++++++++---- testbot/bin/WineRunTask.pl | 11 ++++++++--- testbot/bin/WineRunWineTest.pl | 21 ++++++++++++++------- 4 files changed, 38 insertions(+), 18 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index 64fe45ec..979470a1 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -388,6 +388,14 @@ if (!$Pid) } +# +# Snapshot the reference reports +# + +my $ErrMessages = SnapshotLatestReport($Task, "task.log"); +LogTaskError("$_\n") for (@$ErrMessages); + + # # From that point on we want to at least try to grab the build # log before giving up @@ -425,10 +433,6 @@ if ($TA->GetFile("Build.log", "$TaskDir/task.log")) $TAError = $ErrMessage = undef; # ...but keep keep the task.log ones $TaskFailures = $LogInfo->{eCount}; - - # Grab a copy of the reference report - my $ErrMessages = SnapshotLatestReport($Task, "task.log"); - LogTaskError("$_\n") for (@$ErrMessages); } elsif ($LogInfo->{Task} eq "badpatch") { diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 5d58411b..73d16f3a 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -396,6 +396,14 @@ if (!$Pid) } +# +# Snapshot the reference reports +# + +my $ErrMessages = SnapshotLatestReport($Task, "task.log"); +LogTaskError("$_\n") for (@$ErrMessages); + + # # From that point on we want to at least try to grab the build # log before giving up @@ -435,10 +443,6 @@ if ($TA->GetFile("Reconfig.log", "$TaskDir/task.log")) $TAError = $ErrMessage = undef; # ...but keep keep the task.log ones $TaskFailures = $LogInfo->{eCount}; - - # Grab a copy of the reference report - my $ErrMessages = SnapshotLatestReport($Task, "task.log"); - LogTaskError("$_\n") for (@$ErrMessages); } elsif (defined $LogInfo->{BadLog}) { diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 3b514fb1..e48c73b4 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -515,6 +515,14 @@ if (!$Pid) } +# +# Snapshot the reference reports +# + +my $ErrMessages = SnapshotLatestReport($Task, $RptFileName); +LogTaskError("$_\n") for (@$ErrMessages); + + # # From that point on we want to at least try to grab the test # log and a screenshot before giving up @@ -569,9 +577,6 @@ if ($TA->GetFile($RptFileName, "$TaskDir/$RptFileName")) } else { - # Grab a copy of the reference report - my $ErrMessages = SnapshotLatestReport($Task, $RptFileName); - LogTaskError("$_\n") for (@$ErrMessages); my $LogErrMsg = CreateLogErrorsCache($LogInfo, $Task); LogTaskError("$LogErrMsg\n") if (defined $LogErrMsg); diff --git a/testbot/bin/WineRunWineTest.pl b/testbot/bin/WineRunWineTest.pl index ad869a96..d685f819 100755 --- a/testbot/bin/WineRunWineTest.pl +++ b/testbot/bin/WineRunWineTest.pl @@ -301,7 +301,7 @@ sub WrapUpAndExit($;$$$$$$$$) # case of a timeout. if ($Step->Type eq 'suite' and $Status eq 'completed' and !$TimedOut) { - my $ErrMessages = UpdateLatestReports($Task, $ReportNames); + my $ErrMessages = UpdateLatestReports($Task, @$ReportNames); Error("$_\n") for (@$ErrMessages); } @@ -486,6 +486,18 @@ if (!$Pid) } +# +# Snapshot the reference reports +# + +foreach my $ReportName (@$ReportNames) +{ + Debug(Elapsed($Start), " Snapshotting '$ReportName'\n"); + my $ErrMessages = SnapshotLatestReport($Task, $ReportName); + LogTaskError("$_\n") for (@$ErrMessages); +} + + # # From that point on we want to at least try to grab the task log # and a screenshot before giving up @@ -528,10 +540,7 @@ if ($TA->GetFile("Task.log", "$TaskDir/task.log")) $TAError = $ErrMessage = $PossibleCrash = undef; # Reset the timeout error but keep the task.log ones $TaskFailures = $LogInfo->{eCount}; - - # Grab a copy of the reference report - my $ErrMessages = SnapshotLatestReport($Task, "task.log"); - LogTaskError("$_\n") for (@$ErrMessages); + # The reference task.log files will be grabbed along with matching reports. } elsif ($LogInfo->{Task} eq "badpatch") { @@ -602,8 +611,6 @@ foreach my $RptFileName (@$ReportNames) else { # Grab a copy of the reference report - my $ErrMessages = SnapshotLatestReport($Task, $RptFileName); - LogTaskError("$_\n") for (@$ErrMessages); my $LogErrMsg = CreateLogErrorsCache($LogInfo, $Task); LogTaskError("$LogErrMsg\n") if (defined $LogErrMsg);

1 0

Francois Gouget : testbot: Keep reference copies of the Wine test task.log files.
by Alexandre Julliard 14 Sep '23

14 Sep '23

Module: tools Branch: master Commit: 78cbe16aa7c0166bf21e0b7d1a8a5fee11f50b6c URL: https://gitlab.winehq.org/winehq/tools/-/commit/78cbe16aa7c0166bf21e0b7d1a8… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jun 26 16:47:05 2023 +0200 testbot: Keep reference copies of the Wine test task.log files. They can contain warnings and errors too so the TestBot should keep reference files too to detect new entries. --- testbot/bin/UpdateTaskLogs | 15 ++++++++++----- testbot/bin/WineRunWineTest.pl | 2 +- testbot/lib/WineTestBot/LogUtils.pm | 23 +++++++++++++++++------ 3 files changed, 28 insertions(+), 12 deletions(-) diff --git a/testbot/bin/UpdateTaskLogs b/testbot/bin/UpdateTaskLogs index 985e1dc0..eef3e522 100755 --- a/testbot/bin/UpdateTaskLogs +++ b/testbot/bin/UpdateTaskLogs @@ -355,7 +355,7 @@ sub ProcessTaskLogs($$$$) { # Save / delete the task's reference reports... all of them, # even if they were not supposed to exist (e.g. failed builds). - foreach my $ReportName (@$ReportNames) + foreach my $ReportName (@$ReportNames, "task.log") { # Also match the files related/derived from the report for the cleanup my $RefReportPaths = $Task->GetRefReportPaths($ReportName, "(?:\.err|\.errors)?"); @@ -402,6 +402,10 @@ sub ProcessTaskLogs($$$$) # Take a snapshot of the reference reports older than this Task foreach my $ReportName (@{GetLogFileNames($TaskDir)}) { + next if ($ReportName eq "testbot.log"); + # For Wine test tasks, only snapshot the task.log reference files that + # match a xxx.report report. + next if ($ReportName eq "task.log" and $Step->Type !~ /^(?:build|reconfig)$/); Debug(TaskKeyStr($Task) .": Snapshotting the reference reports for $ReportName\n"); my $ErrMessages = SnapshotLatestReport($Task, $ReportName); foreach my $ErrMessage (@$ErrMessages) @@ -467,7 +471,8 @@ sub ProcessTaskLogs($$$$) { foreach my $ReportName (@{GetLogFileNames($TaskDir)}) { - next if ($Step->Type eq "suite" and $ReportName !~ /\.report$/); + next if ($ReportName eq "testbot.log"); + next if ($ReportName eq "task.log" and $Task->VM->Type =~ /^win(?:32|64)$/); next if ($Step->Type eq "reconfig" and $ReportName !~ /\.log$/); next if (-z "$TaskDir/$ReportName"); $Rc += DoUpdateLatestReport($Task, $ReportName, "$TaskDir/$ReportName"); @@ -481,10 +486,10 @@ sub ProcessTaskLogs($$$$) sub ProcessLatestReports() { my $Rc = 0; - my $LatestGlob = "$DataDir/latest/*.report"; + my $LatestGlob = "$DataDir/latest/*"; # Delete or rename the old reference reports - foreach my $LatestReportPath (glob("$LatestGlob $LatestGlob.err")) + foreach my $LatestReportPath (glob("$LatestGlob.report $LatestGlob.report.err")) { my $RefReportName = basename($LatestReportPath); next if ($RefReportName !~ /^([a-zA-Z0-9_]+_[a-zA-Z0-9_]+\.report)(?:\.err)?$/); @@ -508,7 +513,7 @@ sub ProcessLatestReports() { my $RefReportName = basename($LatestReportPath); # Keep the regexp in sync with WineTestBot::Task::GetRefReportName() - next if ($RefReportName !~ /^([a-zA-Z0-9_]+-job[0-9.]+-[a-zA-Z0-9_]+\.report)(?:\.errors)?$/); + next if ($RefReportName !~ /^([a-zA-Z0-9_]+-job[0-9.]+-[a-zA-Z0-9_]+\.(?:log|report))(?:\.errors)?$/); $RefReportName = $1; # untaint $LatestReportPath = "$DataDir/latest/$RefReportName"; $Rc += Delete("$LatestReportPath.err"); diff --git a/testbot/bin/WineRunWineTest.pl b/testbot/bin/WineRunWineTest.pl index d685f819..002e7f3b 100755 --- a/testbot/bin/WineRunWineTest.pl +++ b/testbot/bin/WineRunWineTest.pl @@ -301,7 +301,7 @@ sub WrapUpAndExit($;$$$$$$$$) # case of a timeout. if ($Step->Type eq 'suite' and $Status eq 'completed' and !$TimedOut) { - my $ErrMessages = UpdateLatestReports($Task, @$ReportNames); + my $ErrMessages = UpdateLatestReports($Task, [@$ReportNames, "task.log"]); Error("$_\n") for (@$ErrMessages); } diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 8ea2dd50..40cf2c1e 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -1674,8 +1674,8 @@ sub CreateLogErrorsCache($;$) Takes a snapshot of the reference WineTest results for the specified Task. -The reference reports are used to identify new failures, even long after the task has -been run. +The reference reports are used to identify new failures, even long after the +task has been run. Note also that comparing reports in this way may be a bit inaccurate right after a Wine commit due to delays in getting new WineTest results, etc. @@ -1699,12 +1699,23 @@ sub SnapshotLatestReport($$) # Ignore reference results more recent than the report next if ($ReportAge and -M $RefReportPath <= $ReportAge); - foreach my $Suffix ("", ".errors") + my @RefNames = ($RefReportName, "$RefReportName.errors"); + if ($ReportName ne "task.log") { - unlink "$TaskDir/$RefReportName$Suffix"; - if (!link("$RefReportPath$Suffix", "$TaskDir/$RefReportName$Suffix")) + # For non-build tasks, also snapshot the corresponding task.log file + my $TaskLog = $RefReportName; + $TaskLog =~ s/-$ReportName$/-task.log/; + if (-f "$DataDir/latest/$TaskLog") { - push @ErrMessages, "Could not create the '$RefReportName$Suffix' link: $!"; + push @RefNames, $TaskLog, "$TaskLog.errors"; + } + } + foreach my $RefName (@RefNames) + { + unlink "$TaskDir/$RefName"; + if (!link("$DataDir/latest/$RefName", "$TaskDir/$RefName")) + { + push @ErrMessages, "Could not create the '$RefName' link: $!"; } } }

1 0

Giovanni Mascellani : ci: Run the tests on macOS.
by Alexandre Julliard 14 Sep '23

14 Sep '23

Module: vkd3d Branch: master Commit: d72c91ef9732c446f18766cc7bc8ef4c49de8aff URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/d72c91ef9732c446f18766cc7bc8e… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Thu Aug 31 22:55:46 2023 +0200 ci: Run the tests on macOS. --- gitlab/README | 11 +++++++++- gitlab/build-mac | 19 +++++++++++++++++ gitlab/build.yml | 50 +++++++++++++++++++++++++++++++++++++++----- gitlab/patch_moltenvk_icd.sh | 12 +++++++++++ 4 files changed, 86 insertions(+), 6 deletions(-) diff --git a/gitlab/README b/gitlab/README index ef4d0bed..ffcb09f6 100644 --- a/gitlab/README +++ b/gitlab/README @@ -14,7 +14,8 @@ The file build.yml contains the actual testing targets. Currently vkd3d is tested on Linux, on x86-64 and i386, each architecture with two different Vulkan drivers (both from Mesa): llvmpipe (a software implementation) and RADV (a hardware implementation backed by an AMD -GPU). The testing logs are available as CI artifacts. +GPU); and on macOS, on Intel, using MoltenVK as Vulkan driver. The +testing logs are available as CI artifacts. Some custom runner configuration is required in order to run the tests on an AMD GPU. Specifically, a runner tagged with `amd-gpu' must be @@ -40,3 +41,11 @@ available with the following features: is created dynamically, therefore has no predictable GID: the use of a fixed GID enables the guest system to be set up so that the user running the tests can access the render nodes. + +A runner on an Intel macOS system tagged with `mac' must also be +available to run the macOS tests. Unfortunately a system like Docker +is not available in this case to provide an isolated standard +environment for running the tests. All the software required to +compile and run the tests will therefore have to be installed directly +on the host system. Complete instructions to setup the macOS are +currently not available. diff --git a/gitlab/build-mac b/gitlab/build-mac new file mode 100755 index 00000000..e423330e --- /dev/null +++ b/gitlab/build-mac @@ -0,0 +1,19 @@ +#!/bin/bash + +echo "Building $(git log -1)" +echo "---" + +COMMIT=$(git rev-parse --short HEAD) + +set -Eeuxo pipefail + +./autogen.sh +rm -fr build +mkdir build +cd build +../configure && make -j$(sysctl -n hw.ncpu) && make -j$(sysctl -n hw.ncpu) crosstest && make -j$(sysctl -n hw.ncpu) check || touch ../pipeline_failed + +mkdir -p ../artifacts/$COMMIT +rsync -Rr tests/*.exe test-suite.log tests/*.log tests/*/*.log ../artifacts/$COMMIT + +git reset --hard diff --git a/gitlab/build.yml b/gitlab/build.yml index 780d645b..3b67f93e 100644 --- a/gitlab/build.yml +++ b/gitlab/build.yml @@ -1,4 +1,4 @@ -.build: +.build-linux: stage: build rules: - if: $CI_PIPELINE_SOURCE == 'merge_request_event' @@ -26,20 +26,20 @@ - artifacts build-radv-64: - extends: .build + extends: .build-linux tags: - amd-gpu variables: VK_LOADER_DRIVERS_SELECT: 'radeon_*' build-llvmpipe-64: - extends: .build + extends: .build-linux allow_failure: true variables: VK_LOADER_DRIVERS_SELECT: 'lvp_*' build-radv-32: - extends: .build + extends: .build-linux tags: - amd-gpu variables: @@ -47,8 +47,48 @@ build-radv-32: CC: 'gcc -m32' build-llvmpipe-32: - extends: .build + extends: .build-linux allow_failure: true variables: VK_LOADER_DRIVERS_SELECT: 'lvp_*' CC: 'gcc -m32' + +build-mac: + stage: build + rules: + - if: $CI_PIPELINE_SOURCE == 'merge_request_event' + allow_failure: true + interruptible: true + needs: [] + dependencies: [] + tags: + - mac + script: + - git config --global --add safe.directory $CI_PROJECT_DIR + - git clean -fdx + - git reset --hard + - rm -fr .git/rebase-merge + # We use a custom ICD which is not marked as a portability driver, + # so that test programs are not confused. + - ./gitlab/patch_moltenvk_icd.sh + - export VK_DRIVER_FILES="$PWD/gitlab/MoltenVK_icd.json" + - mkdir artifacts + - system_profiler SPSoftwareDataType SPHardwareDataType > artifacts/systeminfo.txt + - vulkaninfo > artifacts/vulkaninfo.txt + - export PATH="/usr/local/opt/bison/bin:/usr/local/opt/flex/bin:$PATH" + - git clone --depth 1 --branch wine-3.21 https://gitlab.winehq.org/wine/wine.git + - cd wine + - mkdir build + - cd build + - ../configure --enable-win64 --without-x --without-freetype + - make tools/widl/widl + - cd ../.. + - export PATH="$PWD/wine/build/tools/widl:$PATH" + - git rebase $CI_MERGE_REQUEST_DIFF_BASE_SHA --exec ./gitlab/build-mac + - if [ -f pipeline_failed ] ; then exit 1 ; fi + variables: + VKD3D_DISABLE_EXTENSIONS: "VK_EXT_descriptor_indexing" + artifacts: + when: always + paths: + - artifacts diff --git a/gitlab/patch_moltenvk_icd.sh b/gitlab/patch_moltenvk_icd.sh new file mode 100755 index 00000000..ad90a4ea --- /dev/null +++ b/gitlab/patch_moltenvk_icd.sh @@ -0,0 +1,12 @@ +#!/bin/bash + +BASE_PATH="/usr/local/opt/molten-vk/share/vulkan/icd.d" + +cp "$BASE_PATH/MoltenVK_icd.json" gitlab/MoltenVK_icd.json + +# The driver path is relative +sed -i -e 's|"library_path" *: "|"library_path" : "'"$BASE_PATH/"'|g' gitlab/MoltenVK_icd.json + +# We pretend this is not a portability driver, otherwise vkd3d won't +# find it +sed -i -e 's|"is_portability_driver" *: *true|"is_portability_driver" : false|g' gitlab/MoltenVK_icd.json

1 0

Giovanni Mascellani : ci: Do not drop artifacts after 1 day.
by Alexandre Julliard 14 Sep '23

14 Sep '23

Module: vkd3d Branch: master Commit: 3113f167babdf657618915234a60421fb728c699 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/3113f167babdf657618915234a604… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue Sep 5 16:24:37 2023 +0200 ci: Do not drop artifacts after 1 day. There is no point in using such a short timeout. We trust the GitLab instance to already have a sensible default. --- gitlab/build.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/gitlab/build.yml b/gitlab/build.yml index 3b67f93e..0eac7722 100644 --- a/gitlab/build.yml +++ b/gitlab/build.yml @@ -21,7 +21,6 @@ - if [ -f pipeline_failed ] ; then exit 1 ; fi artifacts: when: always - expire_in: 1 day paths: - artifacts

1 0

Nikolay Sivov : vkd3d-shader/asm: Tweak TEXCOORD declaration name.
by Alexandre Julliard 13 Sep '23

13 Sep '23

Module: vkd3d Branch: master Commit: 45541dd9b2884157999889839c03c9d019dce34d URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/45541dd9b2884157999889839c03c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 11 12:41:55 2023 +0200 vkd3d-shader/asm: Tweak TEXCOORD declaration name. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/d3d_asm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/d3d_asm.c b/libs/vkd3d-shader/d3d_asm.c index d72402eb..f0c386f1 100644 --- a/libs/vkd3d-shader/d3d_asm.c +++ b/libs/vkd3d-shader/d3d_asm.c @@ -714,7 +714,7 @@ static void shader_dump_decl_usage(struct vkd3d_d3d_asm_compiler *compiler, break; case VKD3D_DECL_USAGE_TEXCOORD: - shader_addline(buffer, "texture%u", semantic->usage_idx); + shader_addline(buffer, "texcoord%u", semantic->usage_idx); break; case VKD3D_DECL_USAGE_TANGENT:

1 0

Martin Storsjö : include: Add the ID3D12StateObjectProperties interface.
by Alexandre Julliard 13 Sep '23

13 Sep '23

Module: vkd3d Branch: master Commit: 16daf0423da459010d8b8bed645979f4483d7924 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/16daf0423da459010d8b8bed64597… Author: Martin Storsjö <martin(a)martin.st> Date: Tue Sep 5 23:58:12 2023 +0300 include: Add the ID3D12StateObjectProperties interface. Signed-off-by: Martin Storsjö <martin(a)martin.st> --- include/vkd3d_d3d12.idl | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/include/vkd3d_d3d12.idl b/include/vkd3d_d3d12.idl index 9545b663..ec74d167 100644 --- a/include/vkd3d_d3d12.idl +++ b/include/vkd3d_d3d12.idl @@ -3311,6 +3311,20 @@ interface ID3D12StateObject : ID3D12Pageable { } +[ + uuid(de5fa827-9bf9-4f26-89ff-d7f56fde3860), + object, + local, + pointer_default(unique) +] +interface ID3D12StateObjectProperties : IUnknown +{ + void *GetShaderIdentifier(const WCHAR *export_name); + UINT64 GetShaderStackSize(const WCHAR *export_name); + UINT64 GetPipelineStackSize(); + void SetPipelineStackSize(UINT64 pipeline_stack_size_in_bytes); +} + typedef HRESULT (__stdcall *PFN_D3D12_CREATE_ROOT_SIGNATURE_DESERIALIZER)( const void *data, SIZE_T data_size, REFIID iid, void **deserializer);

1 0

Martin Storsjö : include: Add the ID3D12Device5 interface.
by Alexandre Julliard 13 Sep '23

13 Sep '23

Module: vkd3d Branch: master Commit: 1302b897ed73ff3c9f6321c9213c57cc3f251c05 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/1302b897ed73ff3c9f6321c9213c5… Author: Martin Storsjö <martin(a)martin.st> Date: Wed Sep 6 00:09:29 2023 +0300 include: Add the ID3D12Device5 interface. Signed-off-by: Martin Storsjö <martin(a)martin.st> --- include/vkd3d_d3d12.idl | 366 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 366 insertions(+)

1 0

Martin Storsjö : include: Add the ID3D12DeviceRemovedExtendedDataSettings{,1} interfaces.
by Alexandre Julliard 13 Sep '23

13 Sep '23

Module: vkd3d Branch: master Commit: 4f4afab3d5d6475db98055a84205d393a0fbcd45 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/4f4afab3d5d6475db98055a84205d… Author: Martin Storsjö <martin(a)martin.st> Date: Wed Sep 6 17:55:48 2023 +0300 include: Add the ID3D12DeviceRemovedExtendedDataSettings{,1} interfaces. Signed-off-by: Martin Storsjö <martin(a)martin.st> --- include/vkd3d_d3d12.idl | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/include/vkd3d_d3d12.idl b/include/vkd3d_d3d12.idl index fb358632..185303cb 100644 --- a/include/vkd3d_d3d12.idl +++ b/include/vkd3d_d3d12.idl @@ -3691,6 +3691,37 @@ interface ID3D12Device5 : ID3D12Device4 const D3D12_SERIALIZED_DATA_DRIVER_MATCHING_IDENTIFIER *identifier_to_check); } +typedef enum D3D12_DRED_ENABLEMENT +{ + D3D12_DRED_ENABLEMENT_SYSTEM_CONTROLLED = 0x0, + D3D12_DRED_ENABLEMENT_FORCED_OFF = 0x1, + D3D12_DRED_ENABLEMENT_FORCED_ON = 0x2, +} D3D12_DRED_ENABLEMENT; + +[ + uuid(82bc481c-6b9b-4030-aedb-7ee3d1df1e63), + object, + local, + pointer_default(unique) +] +interface ID3D12DeviceRemovedExtendedDataSettings : IUnknown +{ + void SetAutoBreadcrumbsEnablement(D3D12_DRED_ENABLEMENT enablement); + void SetPageFaultEnablement(D3D12_DRED_ENABLEMENT enablement); + void SetWatsonDumpEnablement(D3D12_DRED_ENABLEMENT enablement); +} + +[ + uuid(dbd5ae51-3317-4f0a-adf9-1d7cedcaae0b), + object, + local, + pointer_default(unique) +] +interface ID3D12DeviceRemovedExtendedDataSettings1 : ID3D12DeviceRemovedExtendedDataSettings +{ + void SetBreadcrumbContextEnablement(D3D12_DRED_ENABLEMENT enablement); +} + typedef HRESULT (__stdcall *PFN_D3D12_CREATE_ROOT_SIGNATURE_DESERIALIZER)( const void *data, SIZE_T data_size, REFIID iid, void **deserializer);

1 0

Martin Storsjö : include: Add the ID3D12DeviceRemovedExtendedData{,1,2} interfaces.
by Alexandre Julliard 13 Sep '23

13 Sep '23

Module: vkd3d Branch: master Commit: edaf7fbd881c589be9f85b73ff45d3bea85f36ff URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/edaf7fbd881c589be9f85b73ff45d… Author: Martin Storsjö <martin(a)martin.st> Date: Wed Sep 6 18:00:26 2023 +0300 include: Add the ID3D12DeviceRemovedExtendedData{,1,2} interfaces. Signed-off-by: Martin Storsjö <martin(a)martin.st> --- include/vkd3d_d3d12.idl | 273 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 273 insertions(+)

1 0