From 03b345c6be0c5cc45579c012ec341da9d49b9858 Mon Sep 17 00:00:00 2001 From: m1m1k4tz <83061466+m1m1k4tz@users.noreply.github.com> Date: Wed, 13 Nov 2024 00:01:13 -0500 Subject: [PATCH 1/6] Update README.md Programmatically set registry keys --- README.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index f305be2d..71bb1b95 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,11 @@ In a default Wine prefix that would be as follows: export WINEPREFIX=/path/to/wineprefix cp x64/*.dll $WINEPREFIX/drive_c/windows/system32 cp x32/*.dll $WINEPREFIX/drive_c/windows/syswow64 -winecfg +wine reg add 'HKEY_CURRENT_USER\Software\Wine\DllOverrides' /v "d3d8" /d native,builtin /f >/dev/null 2>&1 +wine reg add 'HKEY_CURRENT_USER\Software\Wine\DllOverrides' /v "d3d9" /d native,builtin /f >/dev/null 2>&1 +wine reg add 'HKEY_CURRENT_USER\Software\Wine\DllOverrides' /v "d3d10core" /d native,builtin /f >/dev/null 2>&1 +wine reg add 'HKEY_CURRENT_USER\Software\Wine\DllOverrides' /v "d3d11" /d native,builtin /f >/dev/null 2>&1 +wine reg add 'HKEY_CURRENT_USER\Software\Wine\DllOverrides' /v "dxgi" /d native,builtin /f >/dev/null 2>&1 ``` For a pure 32-bit Wine prefix (non default) the 32-bit DLLs instead go to the `system32` directory: From 65ae9af81c84ae664cf62e6f75285d2372ec7feb Mon Sep 17 00:00:00 2001 From: m1m1k4tz <83061466+m1m1k4tz@users.noreply.github.com> Date: Wed, 13 Nov 2024 00:10:32 -0500 Subject: [PATCH 2/6] Update README.md Update directions --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 71bb1b95..7694d196 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ The most recent development builds can be found [here](https://github.com/doitsu Release builds can be found [here](https://github.com/doitsujin/dxvk/releases). ## How to use -In order to install a DXVK package obtained from the [release](https://github.com/doitsujin/dxvk/releases) page into a given wine prefix, copy or symlink the DLLs into the following directories as follows, then open `winecfg` and manually add `native` DLL overrides for `d3d8`, `d3d9`, `d3d10core`, `d3d11` and `dxgi` under the Libraries tab. +In order to install a DXVK package obtained from the [release](https://github.com/doitsujin/dxvk/releases) page into a given wine prefix, copy or symlink the DLLs into the following directories as follows. In a default Wine prefix that would be as follows: ``` From c40c22b0db16f8d037a28bcfbbb2e0b609023b03 Mon Sep 17 00:00:00 2001 From: m1m1k4tz <83061466+m1m1k4tz@users.noreply.github.com> Date: Wed, 13 Nov 2024 19:55:35 -0500 Subject: [PATCH 3/6] Update README.md Add uninstall instructions --- README.md | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 7694d196..c64a5e55 100644 --- a/README.md +++ b/README.md @@ -32,10 +32,30 @@ winecfg Verify that your application uses DXVK instead of wined3d by enabling the HUD (see notes below). -In order to remove DXVK from a prefix, remove the DLLs and DLL overrides, and run `wineboot -u` to restore the original DLL files. - Tools such as Steam Play, Lutris, Bottles, Heroic Launcher, etc will automatically handle setup of dxvk on their own when enabled. +### Uninstall +In order to remove DXVK from a prefix, remove the DLLs and DLL overrides, and run wineboot -u to restore the original DLL files. +``` +export WINEPREFIX=/path/to/wineprefix +rm $WINEPREFIX/drive_c/windows/system32/d3d8.dll +rm $WINEPREFIX/drive_c/windows/system32/d3d9.dll +rm $WINEPREFIX/drive_c/windows/system32/d3d10core.dll +rm $WINEPREFIX/drive_c/windows/system32/d3d11.dll +rm $WINEPREFIX/drive_c/windows/system32/dxgi.dll +rm $WINEPREFIX/drive_c/windows/syswow64/d3d8.dll +rm $WINEPREFIX/drive_c/windows/syswow64/d3d9.dll +rm $WINEPREFIX/drive_c/windows/syswow64/d3d10core.dll +rm $WINEPREFIX/drive_c/windows/syswow64/d3d11.dll +rm $WINEPREFIX/drive_c/windows/syswow64/dxgi.dll +wine wineboot -u +wine reg delete 'HKEY_CURRENT_USER\Software\Wine\DllOverrides' /v "d3d8" /d native,builtin /f >/dev/null 2>&1 +wine reg delete 'HKEY_CURRENT_USER\Software\Wine\DllOverrides' /v "d3d9" /d native,builtin /f >/dev/null 2>&1 +wine reg delete 'HKEY_CURRENT_USER\Software\Wine\DllOverrides' /v "d3d10core" /d native,builtin /f >/dev/null 2>&1 +wine reg delete 'HKEY_CURRENT_USER\Software\Wine\DllOverrides' /v "d3d11" /d native,builtin /f >/dev/null 2>&1 +wine reg delete 'HKEY_CURRENT_USER\Software\Wine\DllOverrides' /v "dxgi" /d native,builtin /f >/dev/null 2>&1 +``` + #### DLL dependencies Listed below are the DLL requirements for using DXVK with any single API. From 018ca6c7bf60d8192b0f20a24227c26ad8202707 Mon Sep 17 00:00:00 2001 From: m1m1k4tz <83061466+m1m1k4tz@users.noreply.github.com> Date: Wed, 13 Nov 2024 21:40:57 -0500 Subject: [PATCH 4/6] Update README.md Tiny fix --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c64a5e55..2fe2974d 100644 --- a/README.md +++ b/README.md @@ -56,7 +56,7 @@ wine reg delete 'HKEY_CURRENT_USER\Software\Wine\DllOverrides' /v "d3d11" /d nat wine reg delete 'HKEY_CURRENT_USER\Software\Wine\DllOverrides' /v "dxgi" /d native,builtin /f >/dev/null 2>&1 ``` -#### DLL dependencies +### DLL dependencies Listed below are the DLL requirements for using DXVK with any single API. - d3d8: `d3d8.dll` and `d3d9.dll` From 848f9fb0f9793ff0f86eb6029cee9397fec60a09 Mon Sep 17 00:00:00 2001 From: m1m1k4tz <83061466+m1m1k4tz@users.noreply.github.com> Date: Sat, 16 Nov 2024 00:54:09 -0500 Subject: [PATCH 5/6] Update README.md Small fixes, finish up the 32 bit stuff --- README.md | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 2fe2974d..2b2cb94e 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,11 @@ For a pure 32-bit Wine prefix (non default) the 32-bit DLLs instead go to the `s ``` export WINEPREFIX=/path/to/wineprefix cp x32/*.dll $WINEPREFIX/drive_c/windows/system32 -winecfg +wine reg add 'HKEY_CURRENT_USER\Software\Wine\DllOverrides' /v "d3d8" /d native,builtin /f >/dev/null 2>&1 +wine reg add 'HKEY_CURRENT_USER\Software\Wine\DllOverrides' /v "d3d9" /d native,builtin /f >/dev/null 2>&1 +wine reg add 'HKEY_CURRENT_USER\Software\Wine\DllOverrides' /v "d3d10core" /d native,builtin /f >/dev/null 2>&1 +wine reg add 'HKEY_CURRENT_USER\Software\Wine\DllOverrides' /v "d3d11" /d native,builtin /f >/dev/null 2>&1 +wine reg add 'HKEY_CURRENT_USER\Software\Wine\DllOverrides' /v "dxgi" /d native,builtin /f >/dev/null 2>&1 ``` Verify that your application uses DXVK instead of wined3d by enabling the HUD (see notes below). @@ -36,6 +40,8 @@ Tools such as Steam Play, Lutris, Bottles, Heroic Launcher, etc will automatical ### Uninstall In order to remove DXVK from a prefix, remove the DLLs and DLL overrides, and run wineboot -u to restore the original DLL files. + +In a default Wine prefix that would be as follows: ``` export WINEPREFIX=/path/to/wineprefix rm $WINEPREFIX/drive_c/windows/system32/d3d8.dll @@ -56,6 +62,22 @@ wine reg delete 'HKEY_CURRENT_USER\Software\Wine\DllOverrides' /v "d3d11" /d nat wine reg delete 'HKEY_CURRENT_USER\Software\Wine\DllOverrides' /v "dxgi" /d native,builtin /f >/dev/null 2>&1 ``` +For a pure 32-bit Wine prefix (non default) that would be as follows: +``` +export WINEPREFIX=/path/to/wineprefix +rm $WINEPREFIX/drive_c/windows/system32/d3d8.dll +rm $WINEPREFIX/drive_c/windows/system32/d3d9.dll +rm $WINEPREFIX/drive_c/windows/system32/d3d10core.dll +rm $WINEPREFIX/drive_c/windows/system32/d3d11.dll +rm $WINEPREFIX/drive_c/windows/system32/dxgi.dll +wine wineboot -u +wine reg delete 'HKEY_CURRENT_USER\Software\Wine\DllOverrides' /v "d3d8" /d native,builtin /f >/dev/null 2>&1 +wine reg delete 'HKEY_CURRENT_USER\Software\Wine\DllOverrides' /v "d3d9" /d native,builtin /f >/dev/null 2>&1 +wine reg delete 'HKEY_CURRENT_USER\Software\Wine\DllOverrides' /v "d3d10core" /d native,builtin /f >/dev/null 2>&1 +wine reg delete 'HKEY_CURRENT_USER\Software\Wine\DllOverrides' /v "d3d11" /d native,builtin /f >/dev/null 2>&1 +wine reg delete 'HKEY_CURRENT_USER\Software\Wine\DllOverrides' /v "dxgi" /d native,builtin /f >/dev/null 2>&1 +``` + ### DLL dependencies Listed below are the DLL requirements for using DXVK with any single API. From 15da4f089034cf4ec4a6ef9cb050870f3045f7a9 Mon Sep 17 00:00:00 2001 From: m1m1k4tz <83061466+m1m1k4tz@users.noreply.github.com> Date: Sun, 17 Nov 2024 21:04:41 -0500 Subject: [PATCH 6/6] Update README.md Reduce the lines of code in the uninstall section --- README.md | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index 2b2cb94e..2421210d 100644 --- a/README.md +++ b/README.md @@ -44,16 +44,7 @@ In order to remove DXVK from a prefix, remove the DLLs and DLL overrides, and ru In a default Wine prefix that would be as follows: ``` export WINEPREFIX=/path/to/wineprefix -rm $WINEPREFIX/drive_c/windows/system32/d3d8.dll -rm $WINEPREFIX/drive_c/windows/system32/d3d9.dll -rm $WINEPREFIX/drive_c/windows/system32/d3d10core.dll -rm $WINEPREFIX/drive_c/windows/system32/d3d11.dll -rm $WINEPREFIX/drive_c/windows/system32/dxgi.dll -rm $WINEPREFIX/drive_c/windows/syswow64/d3d8.dll -rm $WINEPREFIX/drive_c/windows/syswow64/d3d9.dll -rm $WINEPREFIX/drive_c/windows/syswow64/d3d10core.dll -rm $WINEPREFIX/drive_c/windows/syswow64/d3d11.dll -rm $WINEPREFIX/drive_c/windows/syswow64/dxgi.dll +rm -f $WINEPREFIX/drive_c/windows/{system32,syswow64}/d{3d8,3d9,3d10core,3d11,xgi}.dll wine wineboot -u wine reg delete 'HKEY_CURRENT_USER\Software\Wine\DllOverrides' /v "d3d8" /d native,builtin /f >/dev/null 2>&1 wine reg delete 'HKEY_CURRENT_USER\Software\Wine\DllOverrides' /v "d3d9" /d native,builtin /f >/dev/null 2>&1 @@ -65,11 +56,7 @@ wine reg delete 'HKEY_CURRENT_USER\Software\Wine\DllOverrides' /v "dxgi" /d nati For a pure 32-bit Wine prefix (non default) that would be as follows: ``` export WINEPREFIX=/path/to/wineprefix -rm $WINEPREFIX/drive_c/windows/system32/d3d8.dll -rm $WINEPREFIX/drive_c/windows/system32/d3d9.dll -rm $WINEPREFIX/drive_c/windows/system32/d3d10core.dll -rm $WINEPREFIX/drive_c/windows/system32/d3d11.dll -rm $WINEPREFIX/drive_c/windows/system32/dxgi.dll +rm -f $WINEPREFIX/drive_c/windows/system32/d{3d8,3d9,3d10core,3d11,xgi}.dll wine wineboot -u wine reg delete 'HKEY_CURRENT_USER\Software\Wine\DllOverrides' /v "d3d8" /d native,builtin /f >/dev/null 2>&1 wine reg delete 'HKEY_CURRENT_USER\Software\Wine\DllOverrides' /v "d3d9" /d native,builtin /f >/dev/null 2>&1