CastroFidel/PortWINE
3
2
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Scripts version 2044

Browse Source
This commit is contained in:
castro-fidel 2021-11-05 21:47:51 +03:00
parent a03a9bda4c
commit f68fead817
3 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
data_from_portwine/changelog
View File

@ -7,6 +7,9 @@
* добавить проверку количества db файлов на один exe * добавить проверку количества db файлов на один exe
* заниматься только развитием проекта за счет вашей подписки на https://boosty.to/portwine-linux.ru * заниматься только развитием проекта за счет вашей подписки на https://boosty.to/portwine-linux.ru
----------------------------------------- -----------------------------------------
###Scripts version 2044###
* добавлена проверка для nvidia с нестандартными путями до nvidia_icd.json
###Scripts version 2043### ###Scripts version 2043###
* улучшена работа функции использования гибридной графики intel + nvidia * улучшена работа функции использования гибридной графики intel + nvidia

17
data_from_portwine/scripts/runlib
View File

@ -204,22 +204,29 @@ start_portwine () {
if [ -x "`which optimus-manager 2>/dev/null`" ]; then if [ -x "`which optimus-manager 2>/dev/null`" ]; then
export check_optimus_manager=`optimus-manager --status | grep Current | cut -f 2 -d':' | sed -e 's/^[[:space:]]*//'` export check_optimus_manager=`optimus-manager --status | grep Current | cut -f 2 -d':' | sed -e 's/^[[:space:]]*//'`
fi fi
check_vk_icd_file () {
if [[ -f "/usr/share/vulkan/icd.d/nvidia_icd.json" ]] ; then
export VK_ICD_FILENAMES="/usr/share/vulkan/icd.d/nvidia_icd.json"
elif [[ -f "/etc/vulkan/icd.d/nvidia_icd.json" ]] ; then
export VK_ICD_FILENAMES="/etc/vulkan/icd.d/nvidia_icd.json"
fi
}
if [[ ! -z "${PW_NVIDIA}" && "${check_optimus_manager}" != "intel" ]] ; then if [[ ! -z "${PW_NVIDIA}" && "${check_optimus_manager}" != "intel" ]] ; then
if [ "${check_optimus_manager}" = "nvidia" ]; then if [ "${check_optimus_manager}" = "nvidia" ]; then
export VK_ICD_FILENAMES=/usr/share/vulkan/icd.d/nvidia_icd.json check_vk_icd_file
elif [ -x "`which primusrun 2>/dev/null`" ]; then elif [ -x "`which primusrun 2>/dev/null`" ]; then
export optirun_on="primusrun" export optirun_on="primusrun"
export VK_ICD_FILENAMES=/usr/share/vulkan/icd.d/nvidia_icd.json check_vk_icd_file
elif [ -x "`which optirun 2>/dev/null`" ]; then elif [ -x "`which optirun 2>/dev/null`" ]; then
export optirun_on="optirun -b primus" export optirun_on="optirun -b primus"
export VK_ICD_FILENAMES=/usr/share/vulkan/icd.d/nvidia_icd.json check_vk_icd_file
elif [ -x "`which prime-run 2>/dev/null`" ]; then elif [ -x "`which prime-run 2>/dev/null`" ]; then
export optirun_on="prime-run" export optirun_on="prime-run"
export VK_ICD_FILENAMES=/usr/share/vulkan/icd.d/nvidia_icd.json check_vk_icd_file
elif [[ -x "`which nvidia-settings 2>/dev/null`" ]] ; then elif [[ -x "`which nvidia-settings 2>/dev/null`" ]] ; then
export __NV_PRIME_RENDER_OFFLOAD=1 export __NV_PRIME_RENDER_OFFLOAD=1
export __GLX_VENDOR_LIBRARY_NAME=nvidia export __GLX_VENDOR_LIBRARY_NAME=nvidia
export VK_ICD_FILENAMES=/usr/share/vulkan/icd.d/nvidia_icd.json check_vk_icd_file
fi fi
else else
export DRI_PRIME=1 export DRI_PRIME=1

2
data_from_portwine/scripts/var
View File

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
#Author: Castro-Fidel (PortWINE-Linux.ru) #Author: Castro-Fidel (PortWINE-Linux.ru)
#SCRIPTS_NEXT_VERSION=2043 #SCRIPTS_NEXT_VERSION=2044
#PORT_NEXT_VERSION=97 #PORT_NEXT_VERSION=97
######################################################################## ########################################################################
export PW_MANGOHUD=0 export PW_MANGOHUD=0