Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

proton: Populate NVIDIA_WINE_DLL_DIR when available #8087

Open
wants to merge 2 commits into
base: experimental_9.0
Choose a base branch
from
Open

proton: Populate NVIDIA_WINE_DLL_DIR when available #8087

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f205ee9
update submodules
Sep 4, 2024
d380d66
proton: Populate NVIDIA_WINE_DLL_DIR when available
liam-middlebrook Sep 10, 2024
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
2 changes: 1 addition & 1 deletion dxvk
Open in desktop
Submodule dxvk updated 50 files
+0 −34 dxvk.conf
+11 −0 src/d3d11/d3d11_context.cpp
+3 −2 src/d3d11/d3d11_context_ext.cpp
+2 −11 src/d3d11/d3d11_context_imm.cpp
+12 −0 src/d3d11/d3d11_device.h
+0 −1 src/d3d11/d3d11_options.cpp
+0 −3 src/d3d11/d3d11_options.h
+2 −2 src/d3d11/d3d11_swapchain.cpp
+1 −0 src/d3d11/d3d11_view_dsv.cpp
+1 −0 src/d3d11/d3d11_view_rtv.cpp
+1 −0 src/d3d11/d3d11_view_srv.cpp
+1 −0 src/d3d11/d3d11_view_uav.cpp
+5 −2 src/d3d8/d3d8_device.cpp
+1 −1 src/d3d8/d3d8_device.h
+9 −4 src/d3d9/d3d9_adapter.cpp
+20 −7 src/d3d9/d3d9_common_texture.cpp
+9 −14 src/d3d9/d3d9_device.cpp
+1 −0 src/d3d9/d3d9_format.h
+15 −6 src/d3d9/d3d9_initializer.cpp
+3 −2 src/d3d9/d3d9_initializer.h
+1 −0 src/d3d9/d3d9_mem.cpp
+3 −3 src/d3d9/d3d9_options.cpp
+0 −5 src/d3d9/d3d9_options.h
+5 −0 src/d3d9/d3d9_surface.cpp
+5 −6 src/d3d9/d3d9_swapchain.cpp
+2 −1 src/d3d9/d3d9_swapchain.h
+11 −0 src/d3d9/d3d9_util.cpp
+5 −0 src/d3d9/d3d9_util.h
+25 −9 src/dxbc/dxbc_compiler.cpp
+0 −1 src/dxbc/dxbc_options.cpp
+0 −3 src/dxbc/dxbc_options.h
+40 −18 src/dxgi/dxgi_adapter.cpp
+0 −3 src/dxgi/dxgi_options.cpp
+0 −3 src/dxgi/dxgi_options.h
+6 −14 src/dxso/dxso_compiler.cpp
+0 −1 src/dxso/dxso_options.cpp
+0 −5 src/dxso/dxso_options.h
+3 −1 src/dxvk/dxvk_descriptor.cpp
+1 −1 src/dxvk/dxvk_instance.cpp
+2 −2 src/dxvk/dxvk_presenter.cpp
+1 −1 src/dxvk/dxvk_presenter.h
+12 −0 src/spirv/spirv_code_buffer.cpp
+8 −0 src/spirv/spirv_code_buffer.h
+104 −2 src/spirv/spirv_module.cpp
+7 −1 src/spirv/spirv_module.h
+1 −0 src/util/com/com_pointer.h
+46 −39 src/util/config/config.cpp
+1 −0 src/util/rc/util_rc_ptr.h
+39 −25 src/util/util_fps_limiter.cpp
+6 −5 src/util/util_fps_limiter.h
2 changes: 1 addition & 1 deletion dxvk-nvapi
Open in desktop
Submodule dxvk-nvapi updated 50 files
+2 −0 .clang-tidy-ignore
+3 −0 .gitmodules
+1 −0 external/nvapi
+0 −943 inc/NvApiDriverSettings.c
+0 −1,147 inc/NvApiDriverSettings.h
+348 −129 inc/catch_amalgamated.cpp
+137 −130 inc/catch_amalgamated.hpp
+0 −141 inc/nvShaderExtnEnums.h
+0 −26,654 inc/nvapi.h
+0 −515 inc/nvapi_interface.h
+624 −454 inc/nvml.h
+3 −3 inc/trompeloeil/coro.hpp
+2 −0 inc/trompeloeil/lifetime.hpp
+297 −90 inc/trompeloeil/mock.hpp
+8 −4 inc/trompeloeil/sequence.hpp
+1 −0 meson.build
+1 −1 package-release.sh
+1 −1 src/meson.build
+1 −1 src/nvapi.cpp
+6 −6 src/nvapi_d3d.cpp
+16 −15 src/nvapi_d3d11.cpp
+15 −11 src/nvapi_d3d12.cpp
+5 −2 src/nvapi_disp.cpp
+1 −1 src/nvapi_drs.cpp
+116 −17 src/nvapi_gpu.cpp
+3 −1 src/nvapi_interface.cpp
+4 −1 src/nvapi_private.h
+3 −3 src/nvapi_sys.cpp
+37 −19 src/sysinfo/nvapi_adapter.cpp
+20 −8 src/sysinfo/nvapi_adapter.h
+6 −2 src/sysinfo/nvapi_adapter_registry.cpp
+7 −0 src/sysinfo/nvml.cpp
+2 −0 src/sysinfo/nvml.h
+1 −1 src/util/util_op_code.h
+2 −2 src/util/util_statuscode.h
+1 −1 tests/meson.build
+2 −4 tests/mock_factory.h
+3 −3 tests/nvapi_d3d.cpp
+5 −16 tests/nvapi_d3d11.cpp
+19 −16 tests/nvapi_d3d12.cpp
+1 −1 tests/nvapi_drs.cpp
+132 −13 tests/nvapi_sysinfo.cpp
+6 −6 tests/nvapi_sysinfo_hdr.cpp
+9 −1 tests/nvapi_sysinfo_mocks.h
+33 −3 tests/nvapi_sysinfo_nvml.cpp
+6 −6 tests/nvapi_sysinfo_topo.cpp
+12 −10 tests/nvapi_system.cpp
+53 −3 tests/resource_factory_util.cpp
+5 −2 tests/resource_factory_util.h
+1 −1 version.h.in
22 changes: 18 additions & 4 deletions proton
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -997,11 +997,14 @@ class CompatData:

# Try to detect known DLLs that ship with the NVIDIA Linux Driver
# and add them into the prefix
nvidia_wine_dll_dir = find_nvidia_wine_dll_dir()
if nvidia_wine_dll_dir:
if g_session.nvidia_wine_dll_dir:
for dll in ["_nvngx.dll", "nvngx.dll"]:
try_copy(nvidia_wine_dll_dir + "/" + dll, "drive_c/windows/system32", optional=True,
prefix=self.prefix_dir, track_file=tracked_files, link_debug=True)
try_copy(g_session.nvidia_wine_dll_dir + "/" + dll,
"drive_c/windows/system32",
optional=True,
prefix=self.prefix_dir,
track_file=tracked_files,
link_debug=True)

setup_game_dir_drive()
setup_steam_dir_drive()
Expand Down Expand Up @@ -1461,6 +1464,17 @@ class Session:
if "PROTON_CRASH_REPORT_DIR" in self.env:
self.env["WINE_CRASH_REPORT_DIR"] = self.env["PROTON_CRASH_REPORT_DIR"]

# NVIDIA software may check for the "DriverStore" by querying the
# NGXCore\NGXPath registry key via `D3DDDI_QUERYREGISTRY_SERVICEKEY` for
# a given adapter. In the case where this path cannot be found, the
# `NVIDIA_WINE_DLL_DIR` environment variable is read as a fallback.
#
# TODO: Add support for populating NGXCore\NGXPath so we can remove the
# NGX copies done in setup_prefix(), and this environment variable.
self.nvidia_wine_dll_dir = find_nvidia_wine_dll_dir()
if self.nvidia_wine_dll_dir:
self.env["NVIDIA_WINE_DLL_DIR"] = self.nvidia_wine_dll_dir

if "PROTON_LOG" in self.env and nonzero(self.env["PROTON_LOG"]):
if self.setup_logging(append_forever=False):
self.log_file.write("======================\n")
Expand Down
2 changes: 1 addition & 1 deletion vkd3d-proton
Open in desktop
Submodule vkd3d-proton updated 167 files
2 changes: 1 addition & 1 deletion wine
Open in desktop
Submodule wine updated 100 files