From 4550240892ccc2da5421160c2ed8b1e6ec7b7840 Mon Sep 17 00:00:00 2001
From: Tk-Glitch <ti3nou@gmail.com>
Date: Mon, 16 Dec 2019 14:51:38 +0100
Subject: [PATCH] proton-tkg: D9VK has been merged

---
 proton-tkg/proton-tkg.sh               | 19 -------------------
 proton-tkg/proton_template/conf/proton |  6 +++---
 2 files changed, 3 insertions(+), 22 deletions(-)

diff --git a/proton-tkg/proton-tkg.sh b/proton-tkg/proton-tkg.sh
index 7475526b..a1f555ef 100755
--- a/proton-tkg/proton-tkg.sh
+++ b/proton-tkg/proton-tkg.sh
@@ -248,25 +248,6 @@ else
       mkdir -p proton_dist_tmp/lib/wine/dxvk && cp -v dxvk/x32/* proton_dist_tmp/lib/wine/dxvk/
     fi
 
-    # d9vk
-    if [ "$_use_d9vk" != "false" ]; then
-      if [ ! -d "$_nowhere"/d9vk ] || [ "$_use_d9vk" == "release" ]; then
-        rm -rf "$_nowhere"/d9vk
-        echo "#####################################################"
-        echo ""
-        echo " Downloading some D9VK release from github for you..."
-        echo ""
-        echo "#####################################################"
-        echo ""
-        wget https://github.com/Joshua-Ashton/d9vk/releases/download/0.40.1/d9vk-0.40.1.tar.gz
-        tar -xvf d9vk-*.tar.gz >/dev/null 2>&1
-        rm -f d9vk-*.tar.*
-        mv "$_nowhere"/d9vk-* "$_nowhere"/d9vk
-      fi
-      mkdir -p proton_dist_tmp/lib64/wine/d9vk && cp -v d9vk/x64/d3d9.dll proton_dist_tmp/lib64/wine/d9vk/
-      mkdir -p proton_dist_tmp/lib/wine/d9vk && cp -v d9vk/x32/d3d9.dll proton_dist_tmp/lib/wine/d9vk/
-    fi
-
     echo ''
     echo "Packaging..."
 
diff --git a/proton-tkg/proton_template/conf/proton b/proton-tkg/proton_template/conf/proton
index 40dc24bb..45611c34 100755
--- a/proton-tkg/proton_template/conf/proton
+++ b/proton-tkg/proton_template/conf/proton
@@ -480,13 +480,13 @@ class CompatData:
             if not ("wined3d9only" in g_session.compat_config or "wined3d" in g_session.compat_config or "custom9" in g_session.compat_config):
                 if not os.path.exists(self.prefix_dir + "drive_c/windows/syswow64"):
                     #use vulkan-based d9vk for d3d9 32
-                    make_d9vk_links(g_proton.lib_dir + "wine/d9vk/",
+                    make_d9vk_links(g_proton.lib_dir + "wine/dxvk/",
                         self.prefix_dir + "drive_c/windows/system32")
                 else:
                     #use vulkan-based d9vk for d3d9 32+64
-                    make_d9vk_links(g_proton.lib64_dir + "wine/d9vk/",
+                    make_d9vk_links(g_proton.lib64_dir + "wine/dxvk/",
                         self.prefix_dir + "drive_c/windows/system32")
-                    make_d9vk_links(g_proton.lib_dir + "wine/d9vk/",
+                    make_d9vk_links(g_proton.lib_dir + "wine/dxvk/",
                         self.prefix_dir + "drive_c/windows/syswow64")
                 g_session.dlloverrides["d3d9"] = "n"
             elif not ("wined3d9only" in g_session.compat_config or "wined3d" in g_session.compat_config) and "custom9" in g_session.compat_config: