diff --git a/data_from_portwine/proton b/data_from_portwine/proton index 88623d1c..21559b87 100755 --- a/data_from_portwine/proton +++ b/data_from_portwine/proton @@ -15,10 +15,7 @@ import tarfile from filelock import FileLock -#To enable debug logging, copy "user_settings.sample.py" to "user_settings.py" -#and edit it if needed. - -CURRENT_PREFIX_VERSION="5.6-GE-2" +CURRENT_PREFIX_VERSION="5.8" PFX="Proton: " ld_path_var = "LD_LIBRARY_PATH" diff --git a/data_from_portwine/scripts/runlib b/data_from_portwine/scripts/runlib index 37ce4a21..ed065a8f 100755 --- a/data_from_portwine/scripts/runlib +++ b/data_from_portwine/scripts/runlib @@ -67,9 +67,6 @@ export PATH="${WINEDIR}/bin:${PATH}" export WINESTART="C:\\windows\\command\\start.exe" export STEAM_COMPAT_DATA_PATH="${PORT_WINE_PATH}/data/" ######################################################################## -export DXVK_STATE_CACHE_PATH="${PATH_TO_GAME}" -export DXVK_STATE_CACHE=1 - export urlg="http://portwine-linux.ru/donate" ######################################################################## START_PORTWINE () @@ -104,7 +101,7 @@ if [ -x "`which nvidia-settings 2>/dev/null`" ]; then fi export __NV_PRIME_RENDER_OFFLOAD=1 export __GLX_VENDOR_LIBRARY_NAME=nvidia -# export __GL_SYNC_TO_VBLANK=1 + export __GL_SYNC_TO_VBLANK=0 export __GL_SHADER_DISK_CACHE_PATH="${PATH_TO_GAME}" export __GL_SHADER_DISK_CACHE=1 export __GL_SHADER_DISK_CACHE_SIZE=1000000000 @@ -119,9 +116,8 @@ if [ -x "`which nvidia-settings 2>/dev/null`" ]; then echo "runtime libs is disabled" else export DRI_PRIME=1 -# export vblank_mode=1 + export vblank_mode=0 export mesa_glthread=true -# export RADV_DEBUG=nocache,nomemorycache local AMD_ATI="$(lspci | grep AMD/ATI)" if [ ! -z "${AMD_ATI}" ]; then # export DXVK_CONFIG_FILE="${PORT_WINE_PATH}/data/dxvk_amd.conf" @@ -133,7 +129,11 @@ else fi fi fi -if [ "${var_dxvk_on}" -eq "1" ]; then +export DXVK_STATE_CACHE_PATH="${PATH_TO_GAME}" +export DXVK_STATE_CACHE=1 +if [ "${var_dxvk_on}" -eq "0" ]; then + export DXVK_STATE_CACHE=0 +elif [ "${var_dxvk_on}" -eq "1" ]; then export DXVK_HUD=0 elif [ "${var_dxvk_on}" -eq "2" ]; then export DXVK_HUD="fps,devinfo,version" @@ -142,6 +142,7 @@ export def_pfx="${PORT_WINE_PATH}/data/dist/share/default_pfx/" if [ ! -d "${def_pfx}" ]; then "${PROTONRUN}" "run" | pwzen fi +export PROTON_NO_FSYNC=0 if [ "$(ulimit -n)" -lt 50000 ]; then export PROTON_NO_ESYNC=1 echo "ESYNC is disabled" diff --git a/data_from_portwine/scripts/start b/data_from_portwine/scripts/start index 0d25ceb3..6f610c6c 100755 --- a/data_from_portwine/scripts/start +++ b/data_from_portwine/scripts/start @@ -4,8 +4,8 @@ "${WINESERVER}" -k START_PORTWINE if [ ! -z ${optirun_on} ]; then - ${optirun_on} "${PROTONRUN}" "run" "${gamestart}" ${launch_parameters} + ${optirun_on} "${PROTONRUN}" "run" "${gamestart}" ${launch_parameters} &>/dev/null else - "${PROTONRUN}" "run" "${gamestart}" ${launch_parameters} + "${PROTONRUN}" "run" "${gamestart}" ${launch_parameters} &>/dev/null fi STOP_PORTWINE diff --git a/data_from_portwine/scripts/vars b/data_from_portwine/scripts/vars index 47371d5a..b3136bc0 100755 --- a/data_from_portwine/scripts/vars +++ b/data_from_portwine/scripts/vars @@ -9,14 +9,12 @@ export porturl="http://portwine-linux.ru/" export PATH_TO_GAME="${PORT_WINE_PATH}/data/pfx/drive_c/Program Files (x86)/${gamedir}" export gamestart="${PATH_TO_GAME}/.exe" ######################################################################## -export MESA_GL_VERSION_OVERRIDE=4.4COMPAT +#export MESA_GL_VERSION_OVERRIDE=4.4COMPAT export STAGING_SHARED_MEMORY=1 -export PROTON_FORCE_LARGE_ADDRESS_AWARE=0 +export PROTON_FORCE_LARGE_ADDRESS_AWARE=1 export PROTON_USE_SECCOMP=0 export WINEDLLOVERRIDES="winemenubuilder.exe=d" export WINEDEBUG="-all" -export kill_winedevice=0 -export kill_explorer=0 export PORTWINE_ACO=1 ######################################################################## ADD_IN_START_PORTWINE () @@ -31,7 +29,7 @@ then ###OPENGL### export PROTON_OLD_GL_STRING=0 else ###DXVK### export PROTON_USE_WINED3D=0 - export PW_DXGI_FOR_VKD3D=1 + export PW_DXGI_FOR_VKD3D=0 export PROTON_NO_D9VK=0 export PROTON_NO_D3D11=0 export PROTON_NO_D3D10=0