Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion FEX
Submodule FEX updated 171 files
20 changes: 19 additions & 1 deletion Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -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
##
Expand Down Expand Up @@ -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))
Expand Down
2 changes: 1 addition & 1 deletion dxvk
Submodule dxvk updated 295 files
1 change: 1 addition & 0 deletions dxvk-igdext
Submodule dxvk-igdext added at a2aa5a
2 changes: 1 addition & 1 deletion dxvk-nvapi
Submodule dxvk-nvapi updated 71 files
+1 −1 .github/workflows/build-llvm.yml
+1 −1 .github/workflows/build-proton.yml
+15 −15 .github/workflows/build-test-package-linux.yml
+4 −3 .github/workflows/build-test-windows.yml
+8 −2 README.md
+1 −1 external/DirectX-Headers
+1 −1 external/Vulkan-Headers
+1 −1 external/nvapi
+186 −129 inc/catch2/catch_amalgamated.cpp
+348 −253 inc/catch2/catch_amalgamated.hpp
+337 −20 inc/nvml/nvml.h
+19 −0 src/interfaces/vkd3d-proton_interfaces.h
+2 −0 src/meson.build
+21 −21 src/nvapi.cpp
+2 −2 src/nvapi/nvapi_adapter_registry.cpp
+233 −0 src/nvapi/nvapi_as_convert.cpp
+53 −0 src/nvapi/nvapi_as_convert.h
+2 −4 src/nvapi/nvapi_d3d11_device.cpp
+29 −10 src/nvapi/nvapi_d3d12_device.cpp
+12 −2 src/nvapi/nvapi_d3d12_device.h
+20 −4 src/nvapi/nvapi_d3d12_graphics_command_list.cpp
+15 −4 src/nvapi/nvapi_d3d12_graphics_command_list.h
+21 −19 src/nvapi/nvapi_output.cpp
+11 −1 src/nvapi/nvapi_output.h
+339 −182 src/nvapi/nvapi_vulkan_low_latency_device.cpp
+117 −30 src/nvapi/nvapi_vulkan_low_latency_device.h
+87 −0 src/nvapi/nvapi_vulkan_low_latency_device_factory.cpp
+23 −0 src/nvapi/nvapi_vulkan_low_latency_device_factory.h
+14 −14 src/nvapi_d3d.cpp
+23 −23 src/nvapi_d3d11.cpp
+343 −105 src/nvapi_d3d12.cpp
+178 −5 src/nvapi_disp.cpp
+14 −14 src/nvapi_drs.cpp
+28 −28 src/nvapi_gpu.cpp
+9 −1 src/nvapi_interface.cpp
+1 −1 src/nvapi_mosaic.cpp
+3 −3 src/nvapi_ngx.cpp
+5 −2 src/nvapi_private.h
+5 −5 src/nvapi_sys.cpp
+27 −59 src/nvapi_vulkan.cpp
+9 −6 src/nvofapi.cpp
+1 −0 src/nvofapi/nvofapi_image.h
+11 −11 src/nvofapi/nvofapi_instance.cpp
+1 −0 src/nvofapi/nvofapi_instance.h
+1 −1 src/nvofapi_cuda.cpp
+1 −1 src/nvofapi_d3d11.cpp
+7 −7 src/nvofapi_d3d12.cpp
+7 −7 src/nvofapi_vk.cpp
+45 −0 src/util/com_pointer.h
+28 −0 src/util/util_drs.h
+15 −6 src/util/util_env.cpp
+2 −0 src/util/util_env.h
+19 −17 src/util/util_log.cpp
+13 −7 src/util/util_log.h
+9 −9 src/util/util_pso_extension.h
+34 −185 src/util/util_statuscode.h
+2 −0 tests/meson.build
+6 −2 tests/mocks/d3d12_mocks.h
+63 −1 tests/mocks/vulkan_mocks.h
+3 −1 tests/nvapi/default_test_environment.cpp
+1 −1 tests/nvapi/default_test_environment.h
+39 −0 tests/nvapi/display_config.h
+12 −3 tests/nvapi/extended_test_environment.cpp
+1 −1 tests/nvapi/extended_test_environment.h
+1 −1 tests/nvapi/section_listener.h
+8 −0 tests/nvapi_d3d11.cpp
+1,245 −223 tests/nvapi_d3d12.cpp
+136 −0 tests/nvapi_sysinfo_topo.cpp
+35 −0 tests/nvapi_system.cpp
+1 −0 tests/nvapi_tests_private.h
+399 −192 tests/nvapi_vulkan.cpp
9 changes: 9 additions & 0 deletions proton
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion vkd3d
Submodule vkd3d updated from 112812 to c0c1d9
2 changes: 1 addition & 1 deletion vkd3d-proton
Submodule vkd3d-proton updated 168 files
2 changes: 1 addition & 1 deletion wine
Submodule wine updated 142 files