gaming/lutris
gaming/lutris
1
0
Fork 0
mirror of https://github.com/lutris/lutris synced 2024-09-15 22:09:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

No, we can do better with deteecting DRI_PRIME hardware. We can support AMD!

Browse source 
We can use the _get_graphics_adapters() function to test for the presense
of NVIDIA or AMD or Intel hardware.

This way, the check can support AMD hardware too.

The check prefers NVIDIA to AMD to Intel; I think that
should work for omst people.
This commit is contained in:
Daniel Johnson 2022-08-06 12:57:08 -04:00 committed by Mathieu Comandon
parent 5224443aaa
commit e5dbef6a7b
2 changed files with 26 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
lutris/sysoptions.py
View file

@ -7,7 +7,7 @@ from gettext import gettext as _
from lutris import runners
from lutris.util import linux, system
from lutris.util.display import DISPLAY_MANAGER, SCREEN_SAVER_INHIBITOR, USE_DRI_PRIME
from lutris.util.display import DISPLAY_MANAGER, SCREEN_SAVER_INHIBITOR, USE_DRI_PRIME, has_graphic_adapter_description
VULKAN_DATA_DIRS = [
"/usr/local/etc/vulkan", # standard site-local location
@ -106,19 +106,30 @@ def get_vk_icd_choices():
amdvlk_files = ":".join(amdvlk)
amdvlkpro_files = ":".join(amdvlkpro)
is_nvidia = bool(nvidia_files)
intel_name = _("Auto: Intel Open Source (MESA: ANV)")
amdradv_name = _("Auto: AMD RADV Open Source (MESA: RADV)")
nvidia_name = _("Auto: Nvidia Proprietary")
glxinfocmd = get_gpu_vendor_cmd(is_nvidia)
glxinfocmd = get_gpu_vendor_cmd(bool(nvidia_files))
with subprocess.Popen(glxinfocmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT) as glxvendorget:
glxvendor = glxvendorget.communicate()[0].decode("utf-8")
default_gpu = glxvendor
if "Intel" in default_gpu:
choices = [(_("Auto: Intel Open Source (MESA: ANV)"), intel_files)]
choices = [(intel_name, intel_files)]
elif "AMD" in default_gpu:
choices = [(_("Auto: AMD RADV Open Source (MESA: RADV)"), amdradv_files)]
elif "NVIDIA" in default_gpu or (USE_DRI_PRIME and is_nvidia):
choices = [(_("Auto: Nvidia Proprietary"), nvidia_files)]
choices = [(amdradv_name, amdradv_files)]
elif "NVIDIA" in default_gpu:
choices = [(nvidia_name, nvidia_files)]
elif USE_DRI_PRIME:
# We have multiple video chipsets, pick something that is instlaled if possible;
# we prefer NVIDIA and AMD over Intel, because don't we all?
if bool(nvidia_files) and has_graphic_adapter_description("NVIDIA"):
choices = [(nvidia_name, nvidia_files)]
elif bool(amdradv_files) and has_graphic_adapter_description("AMD"):
choices = [(amdradv_name, amdradv_files)]
elif bool(intel_files) and has_graphic_adapter_description("Intel"):
choices = [(intel_name, intel_files)]
if intel_files:
choices.append(("Intel Open Source (MESA: ANV)", intel_files))

8
lutris/util/display.py
View file

@ -55,6 +55,14 @@ def restore_gamma():
logger.warning("you do not have permission to call xgamma")
def has_graphic_adapter_description(match_text):
"""Returns True if a graphics adapter is found with 'match_text' in its description."""
for adapter in _get_graphics_adapters():
if match_text in adapter[1]:
return True
return False
def _get_graphics_adapters():
"""Return the list of graphics cards available on a system