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

Update logic for glxinfo command, prioritize nvidia detection

Browse source
This commit is contained in:
Mathieu Comandon 2022-07-18 16:52:25 -07:00
parent 703a613e45
commit 70548aac75
1 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
lutris/sysoptions.py
View file

@ -64,15 +64,13 @@ def get_optirun_choices():
return choices
def get_gpu_vendor_cmd(nvidia_files):
def get_gpu_vendor_cmd(is_nvidia):
"""Run glxinfo command to get vendor based on certain conditions"""
glxinfocmd = "glxinfo | grep -i opengl | grep -i vendor"
if USE_DRI_PRIME == 1:
glxinfocmd = "DRI_PRIME=1 glxinfo | grep -i opengl | grep -i vendor"
elif nvidia_files == 1:
glxinfocmd = "__GLX_VENDOR_LIBRARY_NAME=nvidia glxinfo | grep -i opengl | grep -i vendor"
return glxinfocmd
if is_nvidia:
return "__GLX_VENDOR_LIBRARY_NAME=nvidia glxinfo | grep -i opengl | grep -i vendor"
if USE_DRI_PRIME:
return "DRI_PRIME=1 glxinfo | grep -i opengl | grep -i vendor"
return "glxinfo | grep -i opengl | grep -i vendor"
def get_vk_icd_choices():
@ -108,9 +106,7 @@ def get_vk_icd_choices():
amdvlk_files = ":".join(amdvlk)
amdvlkpro_files = ":".join(amdvlkpro)
glxinfocmd = get_gpu_vendor_cmd(0)
if nvidia_files:
glxinfocmd = get_gpu_vendor_cmd(1)
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