From f7f6f6b4dba4be3b9f1b91691e3935d0960f8dde Mon Sep 17 00:00:00 2001
From: Andrew Eikum <aeikum@codeweavers.com>
Date: Tue, 10 Dec 2019 09:28:14 -0600
Subject: [PATCH] build: Use new dxvk_config library instead of importing into
 wined3d

---
 build/makefile_base.mak | 2 ++
 dxvk                    | 2 +-
 proton                  | 4 ++--
 wine                    | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/build/makefile_base.mak b/build/makefile_base.mak
index b542d072..566eceeb 100644
--- a/build/makefile_base.mak
+++ b/build/makefile_base.mak
@@ -1188,6 +1188,7 @@ dxvk64: $(DXVK_CONFIGURE_FILES64)
 	cp "$(DXVK_OBJ64)"/bin/d3d10_1.dll "$(DST_DIR)"/lib64/wine/dxvk
 	cp "$(DXVK_OBJ64)"/bin/d3d10core.dll "$(DST_DIR)"/lib64/wine/dxvk
 	cp "$(DXVK_OBJ64)"/bin/d3d9.dll "$(DST_DIR)"/lib64/wine/dxvk
+	cp "$(DXVK_OBJ64)"/bin/dxvk_config.dll "$(DST_DIR)"/lib64/wine/dxvk
 	if test -e $(SRCDIR)/.git; then ( cd $(SRCDIR) && git submodule status -- dxvk ) > "$(DST_DIR)"/lib64/wine/dxvk/version; fi
 
 
@@ -1200,6 +1201,7 @@ dxvk32: $(DXVK_CONFIGURE_FILES32)
 	cp "$(DXVK_OBJ32)"/bin/d3d10_1.dll "$(DST_DIR)"/lib/wine/dxvk/
 	cp "$(DXVK_OBJ32)"/bin/d3d10core.dll "$(DST_DIR)"/lib/wine/dxvk/
 	cp "$(DXVK_OBJ32)"/bin/d3d9.dll "$(DST_DIR)"/lib/wine/dxvk/
+	cp "$(DXVK_OBJ32)"/bin/dxvk_config.dll "$(DST_DIR)"/lib/wine/dxvk
 	if test -e $(SRCDIR)/.git; then ( cd $(SRCDIR) && git submodule status -- dxvk ) > "$(DST_DIR)"/lib/wine/dxvk/version; fi
 
 endif # NO_DXVK
diff --git a/dxvk b/dxvk
index 3b180e3b..fc569626 160000
--- a/dxvk
+++ b/dxvk
@@ -1 +1 @@
-Subproject commit 3b180e3bb68d6345356c671abe7aa9839c385254
+Subproject commit fc569626a6c83c9c0a008e98d5d664be60a93e8f
diff --git a/proton b/proton
index 22b51129..0f5e3d62 100755
--- a/proton
+++ b/proton
@@ -342,10 +342,10 @@ class CompatData:
             try_copy(g_proton.lib64_dir + "wine/dxvk/openvr_api_dxvk.dll", self.prefix_dir + "/drive_c/windows/system32/")
 
             if "wined3d" in g_session.compat_config:
-                dxvkfiles = []
+                dxvkfiles = ["dxvk_config"]
                 wined3dfiles = ["d3d11", "d3d10", "d3d10core", "d3d10_1", "d3d9"]
             else:
-                dxvkfiles = ["d3d11", "d3d10", "d3d10core", "d3d10_1"]
+                dxvkfiles = ["dxvk_config", "d3d11", "d3d10", "d3d10core", "d3d10_1"]
                 wined3dfiles = []
                 if "d9vk" in g_session.compat_config:
                     dxvkfiles.append("d3d9")
diff --git a/wine b/wine
index 46ce156f..336c3874 160000
--- a/wine
+++ b/wine
@@ -1 +1 @@
-Subproject commit 46ce156f1b5c0b77d140ecf32108e564f7443d3c
+Subproject commit 336c38747c309dcd63f369a7239b292e870e0069