Valve/Proton
1
0
Fork 0
mirror of https://github.com/ValveSoftware/Proton.git synced 2025-08-01 01:51:45 +03:00
Code Issues Packages Projects Releases Wiki Activity

proton: Simplify find_nvidia_wine_dll_dir libdl discovery

Browse Source 
After testing DLSS+Proton on a different system than I normally use I
discovered that the call to `find_library("dl")` wasn't properly
discovering libdl.so.2

To simplify things here, just remove usage of find_library altogether.

Reviewed-by: Adam Moss <amoss@nvidia.com>
This commit is contained in:
Liam Middlebrook 2021-06-09 09:43:04 -07:00 committed by Andrew Eikum
parent f7b8a814cb
commit ae13658e1f
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
proton
View File

@ -23,7 +23,6 @@ from ctypes import cast
from ctypes import c_int from ctypes import c_int
from ctypes import c_char_p from ctypes import c_char_p
from ctypes import c_void_p from ctypes import c_void_p
from ctypes.util import find_library
from filelock import FileLock from filelock import FileLock
@ -155,14 +154,8 @@ def try_get_game_library_dir():
# On failure, returns None # On failure, returns None
def find_nvidia_wine_dll_dir(): def find_nvidia_wine_dll_dir():
try: try:
libdl_soname = find_library("dl") libdl = CDLL("libdl.so.2")
except (OSError):
# If we couldn't determine the proper soname for libdl, bail out.
if libdl_soname is None:
return None
libdl = CDLL(libdl_soname)
except (FileNotFoundError, OSError):
return None return None
try: try: