From a52104ccc51e42570892078cedf982738a2dcd13 Mon Sep 17 00:00:00 2001 From: Arkadiusz Hiler Date: Thu, 16 Mar 2023 12:45:29 +0200 Subject: [PATCH] proton: Optionally copy d3d12core for vkd3d-proton. In anticipation of a pull-request being merged that moves things around and introduces d3d12core.dll. This should be made non-optional once the vkd3d-proton changes land. Link: https://github.com/HansKristian-Work/vkd3d-proton/pull/1458 --- proton | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/proton b/proton index 67dbb6b6..c857f38a 100755 --- a/proton +++ b/proton @@ -933,7 +933,7 @@ class CompatData: wined3dfiles = ["d3d12", "d3d11", "d3d10", "d3d10core", "d3d10_1", "d3d9"] else: dxvkfiles = ["d3d11", "d3d10core", "d3d9"] - vkd3d_protonfiles = ["d3d12"] + vkd3d_protonfiles = ["d3d12", "d3d12core"] wined3dfiles = [] if use_dxvk_dxgi: @@ -955,10 +955,13 @@ class CompatData: g_session.dlloverrides[f] = "n" for f in vkd3d_protonfiles: + optional = False + if f == "d3d12core": + optional = True try_copy(g_proton.lib64_dir + "wine/vkd3d-proton/" + f + ".dll", "drive_c/windows/system32", - prefix=self.prefix_dir, track_file=tracked_files, link_debug=True) + prefix=self.prefix_dir, track_file=tracked_files, link_debug=True, optional=optional) try_copy(g_proton.lib_dir + "wine/vkd3d-proton/" + f + ".dll", "drive_c/windows/syswow64", - prefix=self.prefix_dir, track_file=tracked_files, link_debug=True) + prefix=self.prefix_dir, track_file=tracked_files, link_debug=True, optional=optional) g_session.dlloverrides[f] = "n" # If the user requested the NVAPI be available, copy it into place.