diff --git a/data/tmp/_loc b/data/tmp/_loc deleted file mode 100644 index 5341709b..00000000 --- a/data/tmp/_loc +++ /dev/null @@ -1 +0,0 @@ -RUS diff --git a/data/tmp/_ver b/data/tmp/_ver deleted file mode 100644 index f599e28b..00000000 --- a/data/tmp/_ver +++ /dev/null @@ -1 +0,0 @@ -10 diff --git a/data/tmp/dxvk_on b/data/tmp/dxvk_on deleted file mode 100644 index 0cfbf088..00000000 --- a/data/tmp/dxvk_on +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/data/tmp/update_notifier b/data/tmp/update_notifier deleted file mode 100644 index d00491fd..00000000 --- a/data/tmp/update_notifier +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/data_from_portwine/scripts/debug b/data_from_portwine/scripts/debug index 5db6fce9..28c5055c 100755 --- a/data_from_portwine/scripts/debug +++ b/data_from_portwine/scripts/debug @@ -1,6 +1,7 @@ #!/bin/bash # Author: PortWINE-Linux.ru . "$(dirname $(readlink -f "$0"))/runlib" +"${WINESERVER}" -k START_PORTWINE echo "${port_deb1}" > "${PORT_WINE_PATH}/${portname}.log" echo "${port_deb2}" >> "${PORT_WINE_PATH}/${portname}.log" @@ -70,7 +71,7 @@ export WINE_MONO_TRACE="E:System.NotImplementedException" #"/usr/bin/xterm" -geometry 130x13 -sb -e 'echo "--------------------------------------------------------PORTWINE-LINUX.RU--------------------------------------------------------" && "${PROTONRUN}" "run" "${gamestart}" "${launch_parameters}" &>> "${PORT_WINE_PATH}/${portname}.log"' -${var_gamemode} "${PROTONRUN}" "run" "${gamestart}" ${launch_parameters} >> "${PORT_WINE_PATH}/${portname}.log" 2>&1 +"${optirun_on}" "${var_gamemode}" "${PROTONRUN}" "run" "${gamestart}" ${launch_parameters} >> "${PORT_WINE_PATH}/${portname}.log" 2>&1 KILL9_WINEDEVICE | pwzen STOP_PORTWINE | pwzen diff --git a/data_from_portwine/scripts/runlib b/data_from_portwine/scripts/runlib index bb884730..e6b43e33 100755 --- a/data_from_portwine/scripts/runlib +++ b/data_from_portwine/scripts/runlib @@ -93,20 +93,28 @@ export urlg="http://portwine-linux.ru/donate" ######################################################################## START_PORTWINE () { -"${WINESERVER}" -k sh "${link}"/port_update export PROTON_NO_FSYNC=0 if [ -x "`which nvidia-settings 2>/dev/null`" ] then - nvidia-settings -a [gpu:0]/GPUPowerMizerMode=1 > /dev/null - # export VK_ICD_FILENAMES=/usr/share/vulkan/icd.d/nvidia_icd.json #Использовать только с примусран + export optirun_on=env + if [ -x "`which primusrun 2>/dev/null`" ] + then + export optirun_on="primusrun" + export VK_ICD_FILENAMES=/usr/share/vulkan/icd.d/nvidia_icd.json + 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 + fi + export __NV_PRIME_RENDER_OFFLOAD=1 + export __GLX_VENDOR_LIBRARY_NAME=nvidia export __GL_SYNC_TO_VBLANK=1 export __GL_SHADER_DISK_CACHE_PATH="${PATH_TO_GAME}" export __GL_SHADER_DISK_CACHE=1 export __GL_SHADER_DISK_CACHE_SIZE=1000000000 export __GL_THREADED_OPTIMIZATIONS=1 -# export __NV_PRIME_RENDER_OFFLOAD=1 -# export __GLX_VENDOR_LIBRARY_NAME=nvidia + nvidia-settings -a [gpu:0]/GPUPowerMizerMode=1 > /dev/null else export DRI_PRIME=1 export vblank_mode=1 @@ -133,15 +141,18 @@ if [ ! -d "${def_pfx}" ] then "${PROTONRUN}" "run" | pwzen fi -#if grep ESYNC "${WINEDIR}/lib/wine/ntdll.dll.so"|| grep ESYNC "${WINEDIR}/lib64/wine/ntdll.dll.so" &>/dev/null -#then -# if ! ulimit -n 500000 &>/dev/null -# then - export PROTON_NO_ESYNC=1 -# else -# export PROTON_NO_ESYNC=0 -# fi +#if ! ulimit -n 500000 &>/dev/null +#the + export PROTON_NO_ESYNC=1 +#else +# export PROTON_NO_ESYNC=0 #fi +export int_xneur=0 +if [ $(pgrep xneur)>'0' ] +then + killall xneur + export int_xneur=1 +fi ADD_IN_START_PORTWINE } ######################################################################## @@ -172,7 +183,10 @@ STOP_PORTWINE () { WAIT_WINESERVER ADD_IN_STOP_PORTWINE -sleep 3 +if [ "$int_xneur" -eq "1" ] +then + xneur & +fi #killall -r -s9 winedevice rm -f "${PORT_WINE_PATH}"/0 rm -f "${link}"/0 diff --git a/data_from_portwine/scripts/start b/data_from_portwine/scripts/start index 527006f0..36ad4e7a 100755 --- a/data_from_portwine/scripts/start +++ b/data_from_portwine/scripts/start @@ -1,6 +1,7 @@ #!/bin/bash # Author: Tergoev M.A. . "$(dirname $(readlink -f "$0"))/runlib" +"${WINESERVER}" -k START_PORTWINE -"${var_gamemode}" "${PROTONRUN}" "run" "${gamestart}" ${launch_parameters} & KILL9_WINEDEVICE >&2 +"${optirun_on}" "${var_gamemode}" "${PROTONRUN}" "run" "${gamestart}" ${launch_parameters} & KILL9_WINEDEVICE >&2 STOP_PORTWINE diff --git a/data_from_portwine/scripts/wineboot b/data_from_portwine/scripts/wineboot index 1b0f99c7..0deff6ae 100755 --- a/data_from_portwine/scripts/wineboot +++ b/data_from_portwine/scripts/wineboot @@ -1,7 +1,7 @@ #!/bin/bash # Author: PortWINE-Linux.ru - . "$(dirname "`readlink -f "$0"`")"/runlib +"${WINESERVER}" -k rm -f ${link}/winetricks "/usr/bin/xterm" -e wget -T 3 --output-document="${link}/winetricks" https://raw.githubusercontent.com/Winetricks/winetricks/master/src/winetricks chmod +x "${link}/winetricks" diff --git a/data_from_portwine/scripts/winecfg b/data_from_portwine/scripts/winecfg index ab1b49dd..5bbc5187 100755 --- a/data_from_portwine/scripts/winecfg +++ b/data_from_portwine/scripts/winecfg @@ -2,6 +2,7 @@ # Author: PortWINE-Linux.ru runlib_path="$(dirname $(readlink -f "$0"))"/runlib . "$runlib_path" +"${WINESERVER}" -k START_PORTWINE "${PROTONRUN}" "run" "winecfg" STOP_PORTWINE diff --git a/data_from_portwine/scripts/winecmd b/data_from_portwine/scripts/winecmd index 0dcf56b7..28840ada 100755 --- a/data_from_portwine/scripts/winecmd +++ b/data_from_portwine/scripts/winecmd @@ -3,5 +3,5 @@ . "$(dirname $(readlink -f "$0"))/runlib" START_PORTWINE -"${PROTONRUN}" "run" "cmd" +"${optirun_on}" "${var_gamemode}" "${PROTONRUN}" "run" "cmd" >&2 STOP_PORTWINE diff --git a/data_from_portwine/scripts/winefile b/data_from_portwine/scripts/winefile index 7ff66c3b..5a50398e 100755 --- a/data_from_portwine/scripts/winefile +++ b/data_from_portwine/scripts/winefile @@ -2,5 +2,6 @@ # Author: PortWINE-Linux.ru . "$(dirname $(readlink -f "$0"))/runlib" START_PORTWINE -${var_gamemode} "${PROTONRUN}" "run" "explorer" & KILL9_WINEDEVICE +export WINEDEBUG="fixme-all" +"${optirun_on}" ${var_gamemode} "${PROTONRUN}" "run" "explorer" & KILL9_WINEDEVICE >&2 STOP_PORTWINE diff --git a/data_from_portwine/scripts/winereg b/data_from_portwine/scripts/winereg index ee18d435..9b925601 100755 --- a/data_from_portwine/scripts/winereg +++ b/data_from_portwine/scripts/winereg @@ -1,7 +1,7 @@ #!/bin/bash # Author: PortWINE-Linux.ru - . "$(dirname $(readlink -f "$0"))/runlib" +"${WINESERVER}" -k START_PORTWINE "${PROTONRUN}" "run" "regedit" STOP_PORTWINE diff --git a/data_from_portwine/scripts/winetricks-q-force b/data_from_portwine/scripts/winetricks-q-force index 681afe6c..3e331dcf 100755 --- a/data_from_portwine/scripts/winetricks-q-force +++ b/data_from_portwine/scripts/winetricks-q-force @@ -1,7 +1,7 @@ #!/bin/bash # Author: PortWINE-Linux.ru - . "$(dirname "`readlink -f "$0"`")"/runlib +"${WINESERVER}" -k rm -f ${link}/winetricks "/usr/bin/xterm" -e wget -T 3 --output-document="${link}/winetricks" https://raw.githubusercontent.com/Winetricks/winetricks/master/src/winetricks chmod +x "${link}/winetricks"