Commit 337a639d authored by Mikhail Tergoev's avatar Mikhail Tergoev

Check xneur, check primusrun and optirun

parent c4191d2b
#!/bin/bash #!/bin/bash
# Author: PortWINE-Linux.ru # Author: PortWINE-Linux.ru
. "$(dirname $(readlink -f "$0"))/runlib" . "$(dirname $(readlink -f "$0"))/runlib"
"${WINESERVER}" -k
START_PORTWINE START_PORTWINE
echo "${port_deb1}" > "${PORT_WINE_PATH}/${portname}.log" echo "${port_deb1}" > "${PORT_WINE_PATH}/${portname}.log"
echo "${port_deb2}" >> "${PORT_WINE_PATH}/${portname}.log" echo "${port_deb2}" >> "${PORT_WINE_PATH}/${portname}.log"
...@@ -70,7 +71,7 @@ export WINE_MONO_TRACE="E:System.NotImplementedException" ...@@ -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"' #"/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 KILL9_WINEDEVICE | pwzen
STOP_PORTWINE | pwzen STOP_PORTWINE | pwzen
......
...@@ -93,20 +93,28 @@ export urlg="http://portwine-linux.ru/donate" ...@@ -93,20 +93,28 @@ export urlg="http://portwine-linux.ru/donate"
######################################################################## ########################################################################
START_PORTWINE () START_PORTWINE ()
{ {
"${WINESERVER}" -k
sh "${link}"/port_update sh "${link}"/port_update
export PROTON_NO_FSYNC=0 export PROTON_NO_FSYNC=0
if [ -x "`which nvidia-settings 2>/dev/null`" ] if [ -x "`which nvidia-settings 2>/dev/null`" ]
then then
nvidia-settings -a [gpu:0]/GPUPowerMizerMode=1 > /dev/null export optirun_on=env
# export VK_ICD_FILENAMES=/usr/share/vulkan/icd.d/nvidia_icd.json #Использовать только с примусран 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_SYNC_TO_VBLANK=1
export __GL_SHADER_DISK_CACHE_PATH="${PATH_TO_GAME}" export __GL_SHADER_DISK_CACHE_PATH="${PATH_TO_GAME}"
export __GL_SHADER_DISK_CACHE=1 export __GL_SHADER_DISK_CACHE=1
export __GL_SHADER_DISK_CACHE_SIZE=1000000000 export __GL_SHADER_DISK_CACHE_SIZE=1000000000
export __GL_THREADED_OPTIMIZATIONS=1 export __GL_THREADED_OPTIMIZATIONS=1
# export __NV_PRIME_RENDER_OFFLOAD=1 nvidia-settings -a [gpu:0]/GPUPowerMizerMode=1 > /dev/null
# export __GLX_VENDOR_LIBRARY_NAME=nvidia
else else
export DRI_PRIME=1 export DRI_PRIME=1
export vblank_mode=1 export vblank_mode=1
...@@ -133,15 +141,18 @@ if [ ! -d "${def_pfx}" ] ...@@ -133,15 +141,18 @@ if [ ! -d "${def_pfx}" ]
then then
"${PROTONRUN}" "run" | pwzen "${PROTONRUN}" "run" | pwzen
fi fi
#if grep ESYNC "${WINEDIR}/lib/wine/ntdll.dll.so"|| grep ESYNC "${WINEDIR}/lib64/wine/ntdll.dll.so" &>/dev/null #if ! ulimit -n 500000 &>/dev/null
#then #the
# if ! ulimit -n 500000 &>/dev/null export PROTON_NO_ESYNC=1
# then #else
export PROTON_NO_ESYNC=1 # export PROTON_NO_ESYNC=0
# else
# export PROTON_NO_ESYNC=0
# fi
#fi #fi
export int_xneur=0
if [ $(pgrep xneur)>'0' ]
then
killall xneur
export int_xneur=1
fi
ADD_IN_START_PORTWINE ADD_IN_START_PORTWINE
} }
######################################################################## ########################################################################
...@@ -172,7 +183,10 @@ STOP_PORTWINE () ...@@ -172,7 +183,10 @@ STOP_PORTWINE ()
{ {
WAIT_WINESERVER WAIT_WINESERVER
ADD_IN_STOP_PORTWINE ADD_IN_STOP_PORTWINE
sleep 3 if [ "$int_xneur" -eq "1" ]
then
xneur &
fi
#killall -r -s9 winedevice #killall -r -s9 winedevice
rm -f "${PORT_WINE_PATH}"/0 rm -f "${PORT_WINE_PATH}"/0
rm -f "${link}"/0 rm -f "${link}"/0
......
#!/bin/bash #!/bin/bash
# Author: Tergoev M.A. # Author: Tergoev M.A.
. "$(dirname $(readlink -f "$0"))/runlib" . "$(dirname $(readlink -f "$0"))/runlib"
"${WINESERVER}" -k
START_PORTWINE 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 STOP_PORTWINE
#!/bin/bash #!/bin/bash
# Author: PortWINE-Linux.ru # Author: PortWINE-Linux.ru
. "$(dirname "`readlink -f "$0"`")"/runlib . "$(dirname "`readlink -f "$0"`")"/runlib
"${WINESERVER}" -k
rm -f ${link}/winetricks rm -f ${link}/winetricks
"/usr/bin/xterm" -e wget -T 3 --output-document="${link}/winetricks" https://raw.githubusercontent.com/Winetricks/winetricks/master/src/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" chmod +x "${link}/winetricks"
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
# Author: PortWINE-Linux.ru # Author: PortWINE-Linux.ru
runlib_path="$(dirname $(readlink -f "$0"))"/runlib runlib_path="$(dirname $(readlink -f "$0"))"/runlib
. "$runlib_path" . "$runlib_path"
"${WINESERVER}" -k
START_PORTWINE START_PORTWINE
"${PROTONRUN}" "run" "winecfg" "${PROTONRUN}" "run" "winecfg"
STOP_PORTWINE STOP_PORTWINE
...@@ -3,5 +3,5 @@ ...@@ -3,5 +3,5 @@
. "$(dirname $(readlink -f "$0"))/runlib" . "$(dirname $(readlink -f "$0"))/runlib"
START_PORTWINE START_PORTWINE
"${PROTONRUN}" "run" "cmd" "${optirun_on}" "${var_gamemode}" "${PROTONRUN}" "run" "cmd" >&2
STOP_PORTWINE STOP_PORTWINE
...@@ -2,5 +2,6 @@ ...@@ -2,5 +2,6 @@
# Author: PortWINE-Linux.ru # Author: PortWINE-Linux.ru
. "$(dirname $(readlink -f "$0"))/runlib" . "$(dirname $(readlink -f "$0"))/runlib"
START_PORTWINE 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 STOP_PORTWINE
#!/bin/bash #!/bin/bash
# Author: PortWINE-Linux.ru # Author: PortWINE-Linux.ru
. "$(dirname $(readlink -f "$0"))/runlib" . "$(dirname $(readlink -f "$0"))/runlib"
"${WINESERVER}" -k
START_PORTWINE START_PORTWINE
"${PROTONRUN}" "run" "regedit" "${PROTONRUN}" "run" "regedit"
STOP_PORTWINE STOP_PORTWINE
#!/bin/bash #!/bin/bash
# Author: PortWINE-Linux.ru # Author: PortWINE-Linux.ru
. "$(dirname "`readlink -f "$0"`")"/runlib . "$(dirname "`readlink -f "$0"`")"/runlib
"${WINESERVER}" -k
rm -f ${link}/winetricks rm -f ${link}/winetricks
"/usr/bin/xterm" -e wget -T 3 --output-document="${link}/winetricks" https://raw.githubusercontent.com/Winetricks/winetricks/master/src/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" chmod +x "${link}/winetricks"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment