From 5d3d462f5995eb831aaf33f76c686b01c1ccc750 Mon Sep 17 00:00:00 2001 From: Andrew Eikum Date: Wed, 5 Feb 2020 08:57:58 -0600 Subject: proton: Default to DXVK for d3d9. --- README.md | 4 ++-- proton | 7 +------ user_settings.sample.py | 5 +---- 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 35abe051..8a0ece65 100644 --- a/README.md +++ b/README.md @@ -267,8 +267,7 @@ the Wine prefix. Removing the option will revert to the previous behavior. | | PROTON_LOG | Convenience method for dumping a useful debug log to `$HOME/steam-$APPID.log`. For more thorough logging, use `user_settings.py`. | | | PROTON_DUMP_DEBUG_COMMANDS | When running a game, Proton will write some useful debug scripts for that game into `$PROTON_DEBUG_DIR/proton_$USER/`. | | | PROTON_DEBUG_DIR | Root directory for the Proton debug scripts, `/tmp` by default. | -| wined3d | PROTON_USE_WINED3D | Use OpenGL-based wined3d instead of Vulkan-based DXVK for d3d11 and d3d10. This used to be called `PROTON_USE_WINED3D11`, which is now an alias for this same option. | -| d9vk | PROTON_USE_D9VK | Use Vulkan-based d9vk instead of OpenGL-based wined3d for d3d9. | +| wined3d | PROTON_USE_WINED3D | Use OpenGL-based wined3d instead of Vulkan-based DXVK for d3d11, d3d10, and d3d9. | | nod3d11 | PROTON_NO_D3D11 | Disable d3d11.dll, for d3d11 games which can fall back to and run better with d3d9. | | nod3d10 | PROTON_NO_D3D10 | Disable d3d10.dll and dxgi.dll, for d3d10 games which can fall back to and run better with d3d9. | | noesync | PROTON_NO_ESYNC | Do not use eventfd-based in-process synchronization primitives. | @@ -276,5 +275,6 @@ the Wine prefix. Removing the option will revert to the previous behavior. | forcelgadd | PROTON_FORCE_LARGE_ADDRESS_AWARE | Force Wine to enable the LARGE_ADDRESS_AWARE flag for all executables. | | oldglstr | PROTON_OLD_GL_STRING | Set some driver overrides to limit the length of the GL extension string, for old games that crash on very long extension strings. | | | WINE_FULLSCREEN_INTEGER_SCALING | Enable integer scaling mode, to give sharp pixels when upscaling. | +| d9vk | PROTON_USE_D9VK | **Note: Obsoleted in Proton 5.0.** In older versions, use Vulkan-based DXVK instead of OpenGL-based wined3d for d3d9. | diff --git a/proton b/proton index c9a676fa..3a9422a5 100755 --- a/proton +++ b/proton @@ -343,12 +343,8 @@ class CompatData: dxvkfiles = ["dxvk_config"] wined3dfiles = ["d3d11", "d3d10", "d3d10core", "d3d10_1", "d3d9"] else: - dxvkfiles = ["dxvk_config", "d3d11", "d3d10", "d3d10core", "d3d10_1"] + dxvkfiles = ["dxvk_config", "d3d11", "d3d10", "d3d10core", "d3d10_1", "d3d9"] wined3dfiles = [] - if "d9vk" in g_session.compat_config: - dxvkfiles.append("d3d9") - else: - wined3dfiles.append("d3d9") #if the user asked for dxvk's dxgi (dxgi=n), then copy it into place if "WINEDLLOVERRIDES" in os.environ and "dxgi=n" in os.environ["WINEDLLOVERRIDES"]: @@ -451,7 +447,6 @@ class Session: if not self.check_environment("PROTON_USE_WINED3D", "wined3d"): self.check_environment("PROTON_USE_WINED3D11", "wined3d") - self.check_environment("PROTON_USE_D9VK", "d9vk") self.check_environment("PROTON_NO_D3D11", "nod3d11") self.check_environment("PROTON_NO_D3D10", "nod3d10") self.check_environment("PROTON_NO_ESYNC", "noesync") diff --git a/user_settings.sample.py b/user_settings.sample.py index feb685e5..353c5da1 100755 --- a/user_settings.sample.py +++ b/user_settings.sample.py @@ -21,12 +21,9 @@ user_settings = { #Enable DXVK's HUD # "DXVK_HUD": "devinfo,fps", - #Use OpenGL-based wined3d for d3d11 and d3d10 instead of Vulkan-based DXVK + #Use OpenGL-based wined3d for d3d11, d3d10, and d3d9 instead of Vulkan-based DXVK # "PROTON_USE_WINED3D": "1", - #Use Vulkan-based D9VK instead of OpenGL-based wined3d for d3d9. -# "PROTON_USE_D9VK": "1", - #Disable d3d11 entirely # "PROTON_NO_D3D11": "1", -- cgit v1.2.3