gaming/lutris
gaming/lutris
1
0
Fork 0
mirror of https://github.com/lutris/lutris synced 2024-09-04 23:13:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

If AMDVLK/GPU-PRO ICD files are present, don't add them to the Auto list, and concatenate them properly

Browse source 
If the user has AMDGPU-PRO or AMDVLK ICD loaders installed, we don't want to use them unless explicitly set, so we need to remove them from the full 'Auto' list.

Additionally, since the ICD files for AMDVLK/PRO don't end in .i686 or .x86_64, they currently get parsed into individual choices instead of a single concatenated choice for both 32 and 64 bit. This fixes that.
This commit is contained in:
Thomas Crider 2021-11-04 12:29:41 -06:00 committed by Mathieu Comandon
parent d77f17be23
commit bf6252ff38
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lutris/sysoptions.py
View file

@ -66,6 +66,7 @@ def get_optirun_choices():
def get_vk_icd_choices():
"""Return available Vulkan ICD loaders"""
loaders = []
amdvlk = []
icd_files = defaultdict(list)
# Add loaders
for data_dir in VULKAN_DATA_DIRS:
@ -73,18 +74,23 @@ def get_vk_icd_choices():
for loader in glob.glob(path):
icd_key = os.path.basename(loader).split(".")[0]
icd_files[icd_key].append(os.path.join(path, loader))
loaders.append(loader)
if not "amd_icd" in loader:
loaders.append(loader)
else:
amdvlk.append(loader)
loader_files = ":".join(loaders)
amdvlk_files = ":".join(amdvlk)
choices = [(_("Auto"), loader_files)]
for icd_key in icd_files:
files = ":".join(icd_files[icd_key])
choices.append((icd_key.capitalize().replace("_icd", " ICD"), files))
if not "amd_icd" in icd_key:
files = ":".join(icd_files[icd_key])
choices.append((icd_key.capitalize().replace("_icd", " ICD"), files))
choices.append(("AMDVLK/AMDGPU-PRO", amdvlk_files))
return choices
system_options = [ # pylint: disable=invalid-name
{
"option": "game_path",