diff --git a/data_from_portwine/port_on b/data_from_portwine/port_on index 0fc59d2f..0fe18878 100755 --- a/data_from_portwine/port_on +++ b/data_from_portwine/port_on @@ -357,6 +357,10 @@ class Session: self.check_environment("PW_NO_VR", "novrclient") self.check_environment("PW_NO_WINEMFPLAY", "nomfplay") 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: self.env["WINEESYNC"] = "1" @@ -375,6 +379,12 @@ class Session: if "forcelgadd" in self.compat_config: 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() @@ -401,7 +411,14 @@ class Session: if "nowritewatch" in self.compat_config: 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 = "" for dll in self.dlloverrides: setting = self.dlloverrides[dll] diff --git a/data_from_portwine/scripts/runlib b/data_from_portwine/scripts/runlib index a991516c..0816120b 100755 --- a/data_from_portwine/scripts/runlib +++ b/data_from_portwine/scripts/runlib @@ -35,9 +35,9 @@ if [ ! -e "${config_path}/${portname}_ver" ]; then echo "10" > "${config_path}/${portname}_ver" fi ######################################################################## +export port_on_run="${PORT_WINE_PATH}/data/port_on" export WINEDIR="${PORT_WINE_PATH}"/data/dist export WINELIB="${PORT_WINE_PATH}"/data/libs -export port_on_run="${PORT_WINE_PATH}/data/port_on" export WINEARCH=win64 export WINELOADER="${WINEDIR}/bin/wine" export WINEDLLPATH="${WINEDIR}/lib64/wine:${WINEDIR}/lib/wine" @@ -119,7 +119,6 @@ if [ "${var_dxvk_on}" != "off" ]; then export PW_NO_D9VK=0 export PW_NO_D3D11=0 export PW_NO_D3D10=0 - export DXVK_ASYNC=0 echo "Use DXVK mod." echo "DXVK_HUD=${var_dxvk_on}" else @@ -152,6 +151,7 @@ if [ -x "`which nvidia-settings 2>/dev/null`" ]; then else export DRI_PRIME=1 export vblank_mode=0 + export MESA_GLSL_CACHE_DIR="${PATH_TO_GAME}" export mesa_glthread=true export AMD_ATI="$(lspci | grep AMD/ATI)" if [ ! -z "${AMD_ATI}" ]; then @@ -163,11 +163,6 @@ else 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 def_pfx="${PORT_WINE_PATH}/data/dist/share/default_pfx/" diff --git a/data_from_portwine/scripts/vars b/data_from_portwine/scripts/vars index 08163185..7187141d 100755 --- a/data_from_portwine/scripts/vars +++ b/data_from_portwine/scripts/vars @@ -18,9 +18,13 @@ export PW_LOG=0 export PW_ACO=1 export PW_NO_VR=1 export PW_FILELOCK=1 +export PW_DXVK_ASYNC=0 export PW_USE_SECCOMP=1 export PW_NO_WINEMFPLAY=1 +export PW_NVAPI_DISABLE=1 export PW_NO_WRITE_WATCH=1 +export PW_WINEDBG_DISABLE=1 +export PW_PULSE_LOWLATENCY=1 export PW_FORCE_LARGE_ADDRESS_AWARE=1 ######################################################################## ADD_IN_START_PORTWINE ()