diff --git a/.gitmodules b/.gitmodules index 09fc03927a9..a4fa99340db 100644 --- a/.gitmodules +++ b/.gitmodules @@ -75,3 +75,6 @@ [submodule "libsoup"] path = libsoup url = https://github.com/GNOME/libsoup.git +[submodule "dxvk-igdext"] + path = dxvk-igdext + url = https://github.com/GameTechDev/dxvk-igdext diff --git a/FEX b/FEX index b4b38a92efb..d833f3ae675 160000 --- a/FEX +++ b/FEX @@ -1 +1 @@ -Subproject commit b4b38a92efb391fcd9ec34f36237d5e26c1ca6a7 +Subproject commit d833f3ae675a404212fbdf1b96ffa619c6861f1f diff --git a/Makefile.in b/Makefile.in index f6cb7840f0d..8a99a2aaf3c 100644 --- a/Makefile.in +++ b/Makefile.in @@ -744,6 +744,24 @@ $(OBJ)/.dxvk-nvapi-post-source: touch $@ +## +## dxvk-igdext +## + +DXVK_IGDEXT_x86_64_CMAKE_ARGS = \ + -DCMAKE_TOOLCHAIN_FILE=$(DXVK_IGDEXT_SRC)/toolchain-mingw64.cmake \ + -DCMAKE_INSTALL_BINDIR=$(DXVK_IGDEXT_x86_64_DST)/lib/wine/igdext/x86_64-windows + +$(eval $(call rules-source,dxvk-igdext,$(SRCDIR)/dxvk-igdext)) +$(eval $(call rules-cmake,dxvk-igdext,x86_64,windows)) + +$(OBJ)/.dxvk-igdext-post-source: + mkdir -p $(DST_LIBDIR)/wine/igdext + rm -rf $(DST_LIBDIR)/wine/igdext/version + echo "$(shell git -C $(SRCDIR) submodule status -- dxvk-igdext)" > $(DST_LIBDIR)/wine/igdext/version + touch $@ + + ## ## vkd3d ## @@ -1365,7 +1383,7 @@ endif ## default_pfx ## -default_pfx: wine gst_good gst_bad gst_libav gst_plugins_rs lsteamclient steamexe vrclient wineopenxr $(WINEOPENXR64_JSON) dxvk dxvk-nvapi vkd3d-proton +default_pfx: wine gst_good gst_bad gst_libav gst_plugins_rs lsteamclient steamexe vrclient wineopenxr $(WINEOPENXR64_JSON) dxvk dxvk-nvapi dxvk-igdext vkd3d-proton find $(DST_LIBDIR)/wine -type f -execdir chmod a-w '{}' '+' rm -rf $(abspath $(DIST_PREFIX)) rm -rf $(abspath $(DIST_PREFIX_ARM64)) diff --git a/dxvk b/dxvk index a6764047e58..adeda6639a0 160000 --- a/dxvk +++ b/dxvk @@ -1 +1 @@ -Subproject commit a6764047e587178283fcde4073ae6e1410af594f +Subproject commit adeda6639a09ad1b6a1b7c4158a781ffaf68947d diff --git a/dxvk-igdext b/dxvk-igdext new file mode 160000 index 00000000000..a2aa5a2efc3 --- /dev/null +++ b/dxvk-igdext @@ -0,0 +1 @@ +Subproject commit a2aa5a2efc39c299dc95968e15786db0cef62acc diff --git a/dxvk-nvapi b/dxvk-nvapi index f9fdf268e88..d102231de42 160000 --- a/dxvk-nvapi +++ b/dxvk-nvapi @@ -1 +1 @@ -Subproject commit f9fdf268e888d17ae9875a4f01908164ff05f740 +Subproject commit d102231de42d64fe914f99a9a55a66029902cb59 diff --git a/proton b/proton index 9f20b1e44ca..4027ad16ae4 100755 --- a/proton +++ b/proton @@ -1231,6 +1231,15 @@ class CompatData: track_file=tracked_files, link_debug=True) + intc_store = "drive_c/windows/system32/DriverStore/FileRepository/igd_faux.inf_1" + makedirs(os.path.join(self.prefix_dir, intc_store)) + try_copy(g_proton.arch_pe_dir("wine/igdext", False) + "igdext64.dll", + intc_store, + optional=True, + prefix=self.prefix_dir, + track_file=tracked_files, + link_debug=True) + setup_game_dir_drive() setup_steam_dir_drive() setup_openvr_paths() diff --git a/vkd3d b/vkd3d index 1128125fbaf..c0c1d93ba71 160000 --- a/vkd3d +++ b/vkd3d @@ -1 +1 @@ -Subproject commit 1128125fbaf133e120b7ddfec99a10bf20a2eb25 +Subproject commit c0c1d93ba71861e3d4beba3c95319d63c76de619 diff --git a/vkd3d-proton b/vkd3d-proton index 212991fc2c2..8c575e0495d 160000 --- a/vkd3d-proton +++ b/vkd3d-proton @@ -1 +1 @@ -Subproject commit 212991fc2c266bc0d59f4c4ce8f80f7126508d71 +Subproject commit 8c575e0495d1cb2afc54be73244a3f689cd71c86 diff --git a/wine b/wine index dc26e618470..c45949faec5 160000 --- a/wine +++ b/wine @@ -1 +1 @@ -Subproject commit dc26e61847081a1b5cb0733dc30feba6ee575482 +Subproject commit c45949faec5b47560228cce3c4b590a4b068f2f4