Valve/Proton
1
0
Fork 0
mirror of https://github.com/ValveSoftware/Proton.git synced 2025-01-27 05:58:16 +03:00
Code Issues Packages Projects Releases Wiki Activity

Ensure vkd3d-proton is used for D3D12 unless wined3d is explicitly requested.

Browse Source
This commit is contained in:
Giovanni Mascellani 2022-07-20 17:40:50 +02:00 committed by Arkadiusz Hiler
parent 69d6b82e94
commit 9ae252db4f
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
proton
View File

@ -900,9 +900,11 @@ class CompatData:
if use_wined3d: if use_wined3d:
dxvkfiles = [] dxvkfiles = []
wined3dfiles = ["d3d11", "d3d10", "d3d10core", "d3d10_1", "d3d9"] vkd3d_protonfiles = []
wined3dfiles = ["d3d12", "d3d11", "d3d10", "d3d10core", "d3d10_1", "d3d9"]
else: else:
dxvkfiles = ["d3d11", "d3d10core", "d3d9"] dxvkfiles = ["d3d11", "d3d10core", "d3d9"]
vkd3d_protonfiles = ["d3d12"]
wined3dfiles = [] wined3dfiles = []
if use_dxvk_dxgi: if use_dxvk_dxgi:
@ -923,6 +925,13 @@ class CompatData:
prefix=self.prefix_dir, track_file=tracked_files, link_debug=True) prefix=self.prefix_dir, track_file=tracked_files, link_debug=True)
g_session.dlloverrides[f] = "n" g_session.dlloverrides[f] = "n"
for f in vkd3d_protonfiles:
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)
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)
g_session.dlloverrides[f] = "n"
# If the user requested the NVAPI be available, copy it into place. # If the user requested the NVAPI be available, copy it into place.
# If they didn't, clean up any stray nvapi DLLs. # If they didn't, clean up any stray nvapi DLLs.
if use_nvapi: if use_nvapi:
@ -953,11 +962,6 @@ class CompatData:
try_copy(nvidia_wine_dll_dir + "/" + dll, "drive_c/windows/system32", optional=True, try_copy(nvidia_wine_dll_dir + "/" + dll, "drive_c/windows/system32", optional=True,
prefix=self.prefix_dir, track_file=tracked_files, link_debug=True) prefix=self.prefix_dir, track_file=tracked_files, link_debug=True)
try_copy(g_proton.lib64_dir + "wine/vkd3d-proton/d3d12.dll", "drive_c/windows/system32",
prefix=self.prefix_dir, track_file=tracked_files, link_debug=True)
try_copy(g_proton.lib_dir + "wine/vkd3d-proton/d3d12.dll", "drive_c/windows/syswow64",
prefix=self.prefix_dir, track_file=tracked_files, link_debug=True)
setup_game_dir_drive() setup_game_dir_drive()
setup_steam_dir_drive() setup_steam_dir_drive()