Commit e3973411 authored by Mikhail Tergoev's avatar Mikhail Tergoev

Added many variables

parent 3fe80df3
...@@ -357,6 +357,10 @@ class Session: ...@@ -357,6 +357,10 @@ class Session:
self.check_environment("PW_NO_VR", "novrclient") self.check_environment("PW_NO_VR", "novrclient")
self.check_environment("PW_NO_WINEMFPLAY", "nomfplay") self.check_environment("PW_NO_WINEMFPLAY", "nomfplay")
self.check_environment("PW_NO_WRITE_WATCH", "nowritewatch") self.check_environment("PW_NO_WRITE_WATCH", "nowritewatch")
self.check_environment("PW_DXVK_ASYNC", "dxvkasync")
self.check_environment("PW_NVAPI_DISABLE", "nonvapi")
self.check_environment("PW_WINEDBG_DISABLE", "nowinedbg")
self.check_environment("PW_PULSE_LOWLATENCY", "pulselowlat")
if not "noesync" in self.compat_config: if not "noesync" in self.compat_config:
self.env["WINEESYNC"] = "1" self.env["WINEESYNC"] = "1"
...@@ -375,6 +379,12 @@ class Session: ...@@ -375,6 +379,12 @@ class Session:
if "forcelgadd" in self.compat_config: if "forcelgadd" in self.compat_config:
self.env["WINE_LARGE_ADDRESS_AWARE"] = "1" self.env["WINE_LARGE_ADDRESS_AWARE"] = "1"
if "dxvkasync" in self.compat_config:
self.env["DXVK_ASYNC"] = "1"
if "pulselowlat" in self.compat_config:
self.env["PULSE_LATENCY_MSEC"] = "60"
g_compatdata.setup_prefix() g_compatdata.setup_prefix()
...@@ -401,7 +411,14 @@ class Session: ...@@ -401,7 +411,14 @@ class Session:
if "nowritewatch" in self.compat_config: if "nowritewatch" in self.compat_config:
self.env["WINE_DISABLE_WRITE_WATCH"] = "1" self.env["WINE_DISABLE_WRITE_WATCH"] = "1"
if "nonvapi" in self.compat_config:
self.dlloverrides["nvapi"] = "d"
self.dlloverrides["nvapi64"] = "d"
if "nowinedbg" in self.compat_config:
self.dlloverrides["winedbg.exe"] = "d"
s = "" s = ""
for dll in self.dlloverrides: for dll in self.dlloverrides:
setting = self.dlloverrides[dll] setting = self.dlloverrides[dll]
......
...@@ -35,9 +35,9 @@ if [ ! -e "${config_path}/${portname}_ver" ]; then ...@@ -35,9 +35,9 @@ if [ ! -e "${config_path}/${portname}_ver" ]; then
echo "10" > "${config_path}/${portname}_ver" echo "10" > "${config_path}/${portname}_ver"
fi fi
######################################################################## ########################################################################
export port_on_run="${PORT_WINE_PATH}/data/port_on"
export WINEDIR="${PORT_WINE_PATH}"/data/dist export WINEDIR="${PORT_WINE_PATH}"/data/dist
export WINELIB="${PORT_WINE_PATH}"/data/libs export WINELIB="${PORT_WINE_PATH}"/data/libs
export port_on_run="${PORT_WINE_PATH}/data/port_on"
export WINEARCH=win64 export WINEARCH=win64
export WINELOADER="${WINEDIR}/bin/wine" export WINELOADER="${WINEDIR}/bin/wine"
export WINEDLLPATH="${WINEDIR}/lib64/wine:${WINEDIR}/lib/wine" export WINEDLLPATH="${WINEDIR}/lib64/wine:${WINEDIR}/lib/wine"
...@@ -119,7 +119,6 @@ if [ "${var_dxvk_on}" != "off" ]; then ...@@ -119,7 +119,6 @@ if [ "${var_dxvk_on}" != "off" ]; then
export PW_NO_D9VK=0 export PW_NO_D9VK=0
export PW_NO_D3D11=0 export PW_NO_D3D11=0
export PW_NO_D3D10=0 export PW_NO_D3D10=0
export DXVK_ASYNC=0
echo "Use DXVK mod." echo "Use DXVK mod."
echo "DXVK_HUD=${var_dxvk_on}" echo "DXVK_HUD=${var_dxvk_on}"
else else
...@@ -152,6 +151,7 @@ if [ -x "`which nvidia-settings 2>/dev/null`" ]; then ...@@ -152,6 +151,7 @@ if [ -x "`which nvidia-settings 2>/dev/null`" ]; then
else else
export DRI_PRIME=1 export DRI_PRIME=1
export vblank_mode=0 export vblank_mode=0
export MESA_GLSL_CACHE_DIR="${PATH_TO_GAME}"
export mesa_glthread=true export mesa_glthread=true
export AMD_ATI="$(lspci | grep AMD/ATI)" export AMD_ATI="$(lspci | grep AMD/ATI)"
if [ ! -z "${AMD_ATI}" ]; then if [ ! -z "${AMD_ATI}" ]; then
...@@ -163,11 +163,6 @@ else ...@@ -163,11 +163,6 @@ else
fi fi
fi fi
fi fi
if [ ! -z "${WINEDLLOVERRIDES}" ]; then
export WINEDLLOVERRIDES="nvapi,nvapi64=;${WINEDLLOVERRIDES}"
else
export WINEDLLOVERRIDES="nvapi,nvapi64="
fi
export DXVK_CONFIG_FILE="${PORT_WINE_PATH}/data/dxvk.conf" export DXVK_CONFIG_FILE="${PORT_WINE_PATH}/data/dxvk.conf"
######################################################################## ########################################################################
export def_pfx="${PORT_WINE_PATH}/data/dist/share/default_pfx/" export def_pfx="${PORT_WINE_PATH}/data/dist/share/default_pfx/"
......
...@@ -18,9 +18,13 @@ export PW_LOG=0 ...@@ -18,9 +18,13 @@ export PW_LOG=0
export PW_ACO=1 export PW_ACO=1
export PW_NO_VR=1 export PW_NO_VR=1
export PW_FILELOCK=1 export PW_FILELOCK=1
export PW_DXVK_ASYNC=0
export PW_USE_SECCOMP=1 export PW_USE_SECCOMP=1
export PW_NO_WINEMFPLAY=1 export PW_NO_WINEMFPLAY=1
export PW_NVAPI_DISABLE=1
export PW_NO_WRITE_WATCH=1 export PW_NO_WRITE_WATCH=1
export PW_WINEDBG_DISABLE=1
export PW_PULSE_LOWLATENCY=1
export PW_FORCE_LARGE_ADDRESS_AWARE=1 export PW_FORCE_LARGE_ADDRESS_AWARE=1
######################################################################## ########################################################################
ADD_IN_START_PORTWINE () ADD_IN_START_PORTWINE ()
......
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