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

proton: Use WINEDLLPATH for vkd3d DLLs instead of copying them.

Browse Source
This commit is contained in:
Rémi Bernon 2025-01-13 00:31:39 +01:00 committed by Arkadiusz Hiler
parent b201603f0d
commit d0bbf643d9
2 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
default_pfx.py
View File

@ -119,14 +119,13 @@ def fixup_drive_links(default_pfx_dir):
def make_default_pfx(default_pfx_dir, dist_dir): def make_default_pfx(default_pfx_dir, dist_dir):
local_env = dict(os.environ) local_env = dict(os.environ)
libdir = dist_dir + '/lib/'
ld_path = dist_dir + "/lib/x86_64-linux-gnu:" + dist_dir + "/lib/i386-linux-gnu" ld_path = ':'.join([libdir + "x86_64-linux-gnu", libdir + "i386-linux-gnu"])
dll_path = dist_dir + "/lib/vkd3d/x86_64-windows:" + dist_dir + "/lib/vkd3d/i386-windows"
local_env["LD_LIBRARY_PATH"] = ld_path local_env["LD_LIBRARY_PATH"] = ld_path
local_env["WINEPREFIX"] = default_pfx_dir local_env["WINEPREFIX"] = default_pfx_dir
local_env["WINEDEBUG"] = "-all" local_env["WINEDEBUG"] = "-all"
local_env["WINEDLLPATH"] = dll_path local_env["WINEDLLPATH"] = libdir + "vkd3d"
runtime_args = [] runtime_args = []
subprocess.run(runtime_args + ["/bin/bash", "-c", subprocess.run(runtime_args + ["/bin/bash", "-c",

23
proton
View File

@ -40,7 +40,7 @@ from random import randrange
#To enable debug logging, copy "user_settings.sample.py" to "user_settings.py" #To enable debug logging, copy "user_settings.sample.py" to "user_settings.py"
#and edit it if needed. #and edit it if needed.
CURRENT_PREFIX_VERSION="10.0-103" CURRENT_PREFIX_VERSION="10.0-104"
PFX="Proton: " PFX="Proton: "
ld_path_var = "LD_LIBRARY_PATH" ld_path_var = "LD_LIBRARY_PATH"
@ -742,6 +742,15 @@ class CompatData:
log("Removing stale builtin " + builtin) log("Removing stale builtin " + builtin)
os.remove(builtin) os.remove(builtin)
stale_vkd3d = [self.prefix_dir + "/drive_c/windows/system32/libvkd3d-1.dll",
self.prefix_dir + "/drive_c/windows/syswow64/libvkd3d-1.dll",
self.prefix_dir + "/drive_c/windows/system32/libvkd3d-shader-1.dll",
self.prefix_dir + "/drive_c/windows/syswow64/libvkd3d-shader-1.dll" ]
for dll in stale_vkd3d:
if file_exists(dll, follow_symlinks=False):
log("Removing stale vkd3d dll " + dll)
os.remove(dll)
except ValueError: except ValueError:
log("Prefix has an invalid version?! You may want to back up user files and delete this prefix.") log("Prefix has an invalid version?! You may want to back up user files and delete this prefix.")
#Just let the Wine upgrade happen and hope it works... #Just let the Wine upgrade happen and hope it works...
@ -1036,16 +1045,6 @@ class CompatData:
try_copy(g_proton.default_pfx_dir + "drive_c/openxr/wineopenxr64.json", "drive_c/openxr", try_copy(g_proton.default_pfx_dir + "drive_c/openxr/wineopenxr64.json", "drive_c/openxr",
prefix=self.prefix_dir, track_file=tracked_files, link_debug=True) prefix=self.prefix_dir, track_file=tracked_files, link_debug=True)
#copy vkd3d files into place
try_copy(g_proton.lib_dir + "vkd3d/x86_64-windows/libvkd3d-1.dll", "drive_c/windows/system32",
prefix=self.prefix_dir, track_file=tracked_files, link_debug=True)
try_copy(g_proton.lib_dir + "vkd3d/i386-windows/libvkd3d-1.dll", "drive_c/windows/syswow64",
prefix=self.prefix_dir, track_file=tracked_files, link_debug=True)
try_copy(g_proton.lib_dir + "vkd3d/x86_64-windows/libvkd3d-shader-1.dll", "drive_c/windows/system32",
prefix=self.prefix_dir, track_file=tracked_files, link_debug=True)
try_copy(g_proton.lib_dir + "vkd3d/i386-windows/libvkd3d-shader-1.dll", "drive_c/windows/syswow64",
prefix=self.prefix_dir, track_file=tracked_files, link_debug=True)
if use_wined3d: if use_wined3d:
dxvkfiles = [] dxvkfiles = []
vkd3d_protonfiles = [] vkd3d_protonfiles = []
@ -1439,7 +1438,7 @@ class Session:
prepend_to_env_str(self.env, ld_path_var, g_proton.lib_dir + "x86_64-linux-gnu:" + g_proton.lib_dir + "i386-linux-gnu", ":") prepend_to_env_str(self.env, ld_path_var, g_proton.lib_dir + "x86_64-linux-gnu:" + g_proton.lib_dir + "i386-linux-gnu", ":")
self.env["WINEDLLPATH"] = g_proton.lib_dir + "wine" self.env["WINEDLLPATH"] = ':'.join([g_proton.lib_dir + "vkd3d", g_proton.lib_dir + "wine"])
self.env["GST_PLUGIN_SYSTEM_PATH_1_0"] = g_proton.lib_dir + "x86_64-linux-gnu/gstreamer-1.0" + ":" + g_proton.lib_dir + "i386-linux-gnu/gstreamer-1.0" self.env["GST_PLUGIN_SYSTEM_PATH_1_0"] = g_proton.lib_dir + "x86_64-linux-gnu/gstreamer-1.0" + ":" + g_proton.lib_dir + "i386-linux-gnu/gstreamer-1.0"
self.env["WINE_GST_REGISTRY_DIR"] = g_compatdata.path("gstreamer-1.0/") self.env["WINE_GST_REGISTRY_DIR"] = g_compatdata.path("gstreamer-1.0/")