diff --git a/data_from_portwine/changelog b/data_from_portwine/changelog index a9b5386..75a92fa 100755 --- a/data_from_portwine/changelog +++ b/data_from_portwine/changelog @@ -7,6 +7,9 @@ * добавить проверку количества db файлов на один exe * заниматься только развитием проекта за счет вашей подписки на https://boosty.to/portwine-linux.ru ----------------------------------------- +###Scripts version 2044### +* добавлена проверка для nvidia с нестандартными путями до nvidia_icd.json + ###Scripts version 2043### * улучшена работа функции использования гибридной графики intel + nvidia diff --git a/data_from_portwine/scripts/runlib b/data_from_portwine/scripts/runlib index 1961885..05e5b3b 100755 --- a/data_from_portwine/scripts/runlib +++ b/data_from_portwine/scripts/runlib @@ -204,22 +204,29 @@ start_portwine () { 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:]]*//'` 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 [ "${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 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 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 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 export __NV_PRIME_RENDER_OFFLOAD=1 export __GLX_VENDOR_LIBRARY_NAME=nvidia - export VK_ICD_FILENAMES=/usr/share/vulkan/icd.d/nvidia_icd.json + check_vk_icd_file fi else export DRI_PRIME=1 diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index 36cd66c..656a9ba 100755 --- a/data_from_portwine/scripts/var +++ b/data_from_portwine/scripts/var @@ -1,6 +1,6 @@ #!/bin/bash #Author: Castro-Fidel (PortWINE-Linux.ru) -#SCRIPTS_NEXT_VERSION=2043 +#SCRIPTS_NEXT_VERSION=2044 #PORT_NEXT_VERSION=97 ######################################################################## export PW_MANGOHUD=0