Compare commits

...

4 Commits

Author SHA1 Message Date
Andrew Eikum
4c5db31b40 update vkd3d-proton to v2.3.1-71-g72d9b322 2021-06-18 08:39:19 -05:00
Andrew Eikum
ee25e59e77 update wine 2021-06-18 08:39:19 -05:00
Zebediah Figura
bf95242ce6 proton: Always check if the prefix config changed.
In particular, make sure that we update builtin dlls for the first process that runs.
2021-06-17 15:39:42 -05:00
Andrew Eikum
acca0052a0 proton: Use DXVK's DXGI by default 2021-06-17 15:39:42 -05:00
3 changed files with 14 additions and 16 deletions

26
proton
View File

@ -483,7 +483,7 @@ class CompatData:
steamdir = os.environ["STEAM_COMPAT_CLIENT_INSTALL_PATH"]
use_wined3d = "wined3d" in g_session.compat_config
use_dxvk_dxgi = "WINEDLLOVERRIDES" in g_session.env and "dxgi=n" in g_session.env["WINEDLLOVERRIDES"]
use_dxvk_dxgi = not ("WINEDLLOVERRIDES" in g_session.env and "dxgi=b" in g_session.env["WINEDLLOVERRIDES"])
builtin_dll_copy = os.environ.get("PROTON_DLL_COPY",
#dxsetup redist
@ -530,20 +530,19 @@ class CompatData:
builtin_dll_copy,
))
if old_ver == CURRENT_PREFIX_VERSION:
# check whether any prefix config has changed
try:
with open(self.config_info_file, "r") as f:
old_prefix_info = f.read()
except IOError:
old_prefix_info = ""
# check whether any prefix config has changed
try:
with open(self.config_info_file, "r") as f:
old_prefix_info = f.read()
except IOError:
old_prefix_info = ""
if old_prefix_info != prefix_info:
# update builtin dll symlinks or copies
self.update_builtin_libs(builtin_dll_copy)
if old_ver != CURRENT_PREFIX_VERSION or old_prefix_info != prefix_info:
# update builtin dll symlinks or copies
self.update_builtin_libs(builtin_dll_copy)
with open(self.config_info_file, "w") as f:
f.write(prefix_info)
with open(self.config_info_file, "w") as f:
f.write(prefix_info)
with open(self.version_file, "w") as f:
f.write(CURRENT_PREFIX_VERSION + "\n")
@ -603,7 +602,6 @@ class CompatData:
dxvkfiles = ["dxvk_config", "d3d11", "d3d10", "d3d10core", "d3d10_1", "d3d9"]
wined3dfiles = []
#if the user asked for dxvk's dxgi (dxgi=n), then copy it into place
if use_dxvk_dxgi:
dxvkfiles.append("dxgi")
else:

@ -1 +1 @@
Subproject commit 3ed3526332f53d7d35cf1b685fa8096b01f26ff0
Subproject commit 72d9b322b89c325520e8f3060a8b60f719c52d6e

2
wine

@ -1 +1 @@
Subproject commit f94b0f7590d43bb3e6aefcc6e16cf69bffc25122
Subproject commit 6ce94e396298f1d4283670e4c30cb40303549092