proton: Populate NVIDIA_WINE_DLL_DIR when available #8087
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Plagman
pushed a commit
that referenced
this pull request
Sep 10, 2024
NVIDIA-software may check the environment variable `NVIDIA_WINE_DLL_DIR` for a path where DLLs provided by the NVIDIA Linux driver can be found. This needs to be set by `proton` script, as it is ran inside of the pressure-vessel environment, so the paths returned will be valid within the environment. Tested with an application that reads `NVIDIA_WINE_DLL_DIR` from the environment and tries to load a known DLL from it. As expected manually setting the environment variable to the on-disk location did not work, as the path is not accurate within the pressure-vessel environment. #8087
adamdmoss
approved these changes
Sep 16, 2024
There was a problem hiding this comment.
For what my ex-nvidia-employee opinion is worth: LGTM. I infer from the lack of specifics (and not privileged knowledge) that this is to enable some future tech work, but if there is an existing title which needs this then pointing it out would be good for verification purposes.
|
Noting from a side-discussion between myself @ivyl, pgofman, and zf. This environment variable isn't ideal because it creates wine/proton specific behavior. Since the way this would be read on Windows isn't currently supported in Wine, this environment variable will only be read as a fallback. That way, in the future if the primary path is supported, this logic could be removed. In the meantime there's some cleanup things to do here (like avoiding running through the C_DLL logic twice). |
NVIDIA-software may check the environment variable `NVIDIA_WINE_DLL_DIR` for a path where DLLs provided by the NVIDIA Linux driver can be found. This is done as a fallback for when the "DriverStore" cannot be detected via the D3DDDI functions for querying an adapter-specific registry key. Tested with an application that reads `NVIDIA_WINE_DLL_DIR` from the environment and tries to load a known DLL from it. As expected manually setting the environment variable to the on-disk location did not work, as the path is not accurate within the pressure-vessel environment.
liam-middlebrook
force-pushed
the
lmiddlebrook/nvidia-wine-dll-dir-env
branch
from
34e90a8
to
d380d66
Compare
Plagman
force-pushed
the
experimental_9.0
branch
from
f205ee9
to
a9ad958
Compare
Plagman
force-pushed
the
experimental_9.0
branch
3 times, most recently
from
124cdc3
to
2a4943d
Compare
vinifmor
pushed a commit
to vinifmor/Proton
that referenced
this pull request
Oct 3, 2024
NVIDIA-software may check the environment variable `NVIDIA_WINE_DLL_DIR` for a path where DLLs provided by the NVIDIA Linux driver can be found. This needs to be set by `proton` script, as it is ran inside of the pressure-vessel environment, so the paths returned will be valid within the environment. Tested with an application that reads `NVIDIA_WINE_DLL_DIR` from the environment and tries to load a known DLL from it. As expected manually setting the environment variable to the on-disk location did not work, as the path is not accurate within the pressure-vessel environment. ValveSoftware#8087
Plagman
force-pushed
the
experimental_9.0
branch
2 times, most recently
from
5d2111a
to
7f6b0ff
Compare
Plagman
force-pushed
the
experimental_9.0
branch
from
08a3c94
to
de3237c
Compare
Plagman
force-pushed
the
experimental_9.0
branch
from
de3237c
to
23b68e5
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
NVIDIA-software may check the environment variable
NVIDIA_WINE_DLL_DIRfor a path where DLLs provided by the NVIDIA Linux driver can be found. This needs to be set byprotonscript, as it is ran inside of the pressure-vessel environment, so the paths returned will be valid within the environment.Tested with an application that reads
NVIDIA_WINE_DLL_DIRfrom the environment and tries to load a known DLL from it. As expected manually setting the environment variable to the on-disk location did not work, as the path is not accurate within the pressure-vessel environment.