diff --git a/data_from_portwine/dxvk.conf b/data_from_portwine/dxvk.conf index 39f59676..6c303315 100644 --- a/data_from_portwine/dxvk.conf +++ b/data_from_portwine/dxvk.conf @@ -15,8 +15,8 @@ # # Supported values : 0 - 16 -dxgi.maxFrameLatency = 2 -d3d9.maxFrameLatency = 2 +# dxgi.maxFrameLatency = 2 +# d3d9.maxFrameLatency = 2 # Override PCI vendor and device IDs reported to the application. Can @@ -36,7 +36,7 @@ d3d9.maxFrameLatency = 2 # # Supported values: True, False -dxgi.nvapiHack = True +# dxgi.nvapiHack = True @@ -137,8 +137,8 @@ dxgi.nvapiHack = True # # Supported values: Any number between 0 and 16 - d3d11.samplerAnisotropy = 8 - d3d9.samplerAnisotropy = 8 +# d3d11.samplerAnisotropy = 8 +# d3d9.samplerAnisotropy = 8 # Declares vertex positions as invariant in order to solve diff --git a/data_from_portwine/gstreamer-1.0/registry.x86_64.bin b/data_from_portwine/gstreamer-1.0/registry.x86_64.bin new file mode 100755 index 00000000..555b4d3b Binary files /dev/null and b/data_from_portwine/gstreamer-1.0/registry.x86_64.bin differ diff --git a/data_from_portwine/proton b/data_from_portwine/proton index f483a253..111641b8 100755 --- a/data_from_portwine/proton +++ b/data_from_portwine/proton @@ -289,10 +289,10 @@ class CompatData: self.create_fonts_symlinks() if "wined3d" in g_session.compat_config: - dxvkfiles = [] + dxvkfiles = ["dxvk_config"] wined3dfiles = ["d3d11", "d3d10", "d3d10core", "d3d10_1", "d3d9"] else: - dxvkfiles = ["d3d11", "d3d10", "d3d10core", "d3d10_1", "d3d9"] + dxvkfiles = ["dxvk_config", "d3d11", "d3d10", "d3d10core", "d3d10_1", "d3d9"] wined3dfiles = [] #if the user asked for dxvk's dxgi (dxgi=n), then copy it into place @@ -362,9 +362,6 @@ class Session: self.env.pop("WINEARCH", "") - self.env["GST_PLUGIN_SYSTEM_PATH_1_0"] = g_proton.lib64_dir + "gstreamer-1.0" + ":" + g_proton.lib_dir + "gstreamer-1.0" - self.env["WINE_GST_REGISTRY_DIR"] = g_compatdata.path("gstreamer-1.0/") - if "PATH" in os.environ: self.env["PATH"] = g_proton.bin_dir + ":" + os.environ["PATH"] else: diff --git a/data_from_portwine/scripts/debug b/data_from_portwine/scripts/debug index 0a0320dc..a3004f3d 100755 --- a/data_from_portwine/scripts/debug +++ b/data_from_portwine/scripts/debug @@ -70,8 +70,12 @@ export DXVK_HUD="full" 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"' - -${optirun_on} "${var_gamemode}" "${PROTONRUN}" "run" "${gamestart}" ${launch_parameters} >> "${PORT_WINE_PATH}/${portname}.log" 2>&1 +if [ ! -z ${optirun_on} ] +then + ${optirun_on} "${var_gamemode}" "${PROTONRUN}" "run" "${gamestart}" ${launch_parameters} >> "${PORT_WINE_PATH}/${portname}.log" 2>&1 +else + "${var_gamemode}" "${PROTONRUN}" "run" "${gamestart}" ${launch_parameters} >> "${PORT_WINE_PATH}/${portname}.log" 2>&1 +fi KILL9_WINEDEVICE | pwzen STOP_PORTWINE | pwzen diff --git a/data_from_portwine/scripts/runlib b/data_from_portwine/scripts/runlib index adbb6582..ebc49dc3 100755 --- a/data_from_portwine/scripts/runlib +++ b/data_from_portwine/scripts/runlib @@ -59,10 +59,13 @@ read "var_dxvk_on" < "${config_path}/dxvk_on" export "var_dxvk_on" if [ -x "`which "gamemoderun" 2>/dev/null`" ] then - export LD_PRELOAD="/usr/lib/x86_64-linux-gnu/libgamemodeauto.so.0:${LD_PRELOAD}" - export var_gamemode=gamemoderun + if [ ! -z "${LD_PRELOAD}" ] + then + export LD_PRELOAD="/usr/lib/x86_64-linux-gnu/libgamemodeauto.so.0:${LD_PRELOAD}" + else + export LD_PRELOAD="/usr/lib/x86_64-linux-gnu/libgamemodeauto.so.0" + fi else - export var_gamemode="env" echo "Gamemod not installed!" fi ######################################################################## @@ -75,19 +78,32 @@ export WINEDLLPATH="${WINEDIR}/lib64/wine:${WINEDIR}/lib/wine" export WINESERVER="${WINEDIR}/bin/wineserver" export WINEBOOT="${WINEDIR}/bin/wineboot" export WINEPREFIX="${PORT_WINE_PATH}/data/pfx" -export PATH="${WINEDIR}/bin":${PATH} +export PATH="${WINEDIR}/bin:${PATH}" export WINESTART="C:\\windows\\command\\start.exe" export STEAM_COMPAT_DATA_PATH="${PORT_WINE_PATH}/data/" export OS_BASED="$(cat /etc/os-release | grep ID_LIKE | cut -d '=' -f2)" if [ -d "${WINELIB}" ] && [ "${OS_BASED}" != "arch" ] then - export LD_LIBRARY_PATH="${WINEDIR}/lib64/wine:${WINEDIR}/lib/wine:${WINELIB}/pinned_libs_32:${WINELIB}/pinned_libs_64:/usr/lib/x86_64-linux-gnu/libfakeroot:/lib/i386-linux-gnu:/usr/lib/i386-linux-gnu:/usr/local/lib:/lib/x86_64-linux-gnu:/usr/lib/x86_64-linux-gnu:/lib:/usr/lib:/usr/lib/i386-linux-gnu/i686:/usr/lib/i386-linux-gnu/sse2:/usr/lib/i386-linux-gnu/i686/sse2:${WINELIB}/i386/lib/i386-linux-gnu:${WINELIB}/i386/lib:${WINELIB}/i386/usr/lib/i386-linux-gnu:${WINELIB}/i386/usr/lib:${WINELIB}/amd64/lib/x86_64-linux-gnu:${WINELIB}/amd64/lib:${WINELIB}/amd64/usr/lib/x86_64-linux-gnu:${WINELIB}/amd64/usr/lib:${WINELIB}/usr/lib/i386-linux-gnu:${WINELIB}/usr/lib/x86_64-linux-gnu:${WINELIB}/amd64/usr/lib:${WINELIB}/lib/i386-linux-gnu:${WINELIB}/lib/x86_64-linux-gnu:${WINELIB}/lib:${LD_LIBRARY_PATH}" + if [ ! -z "${LD_LIBRARY_PATH}" ] + then + export LD_LIBRARY_PATH="${WINEDIR}/lib64:${WINEDIR}/lib:${WINELIB}/pinned_libs_32:${WINELIB}/pinned_libs_64:/usr/lib/x86_64-linux-gnu/libfakeroot:/lib/i386-linux-gnu:/usr/lib/i386-linux-gnu:/usr/local/lib:/lib/x86_64-linux-gnu:/usr/lib/x86_64-linux-gnu:/lib:/usr/lib:/usr/lib/i386-linux-gnu/i686:/usr/lib/i386-linux-gnu/sse2:/usr/lib/i386-linux-gnu/i686/sse2:${WINELIB}/i386/lib/i386-linux-gnu:${WINELIB}/i386/lib:${WINELIB}/i386/usr/lib/i386-linux-gnu:${WINELIB}/i386/usr/lib:${WINELIB}/amd64/lib/x86_64-linux-gnu:${WINELIB}/amd64/lib:${WINELIB}/amd64/usr/lib/x86_64-linux-gnu:${WINELIB}/amd64/usr/lib:${WINELIB}/usr/lib/i386-linux-gnu:${WINELIB}/usr/lib/x86_64-linux-gnu:${WINELIB}/amd64/usr/lib:${WINELIB}/lib/i386-linux-gnu:${WINELIB}/lib/x86_64-linux-gnu:${WINELIB}/lib:${LD_LIBRARY_PATH}" + else + export LD_LIBRARY_PATH="${WINEDIR}/lib64:${WINEDIR}/lib:${WINELIB}/pinned_libs_32:${WINELIB}/pinned_libs_64:/usr/lib/x86_64-linux-gnu/libfakeroot:/lib/i386-linux-gnu:/usr/lib/i386-linux-gnu:/usr/local/lib:/lib/x86_64-linux-gnu:/usr/lib/x86_64-linux-gnu:/lib:/usr/lib:/usr/lib/i386-linux-gnu/i686:/usr/lib/i386-linux-gnu/sse2:/usr/lib/i386-linux-gnu/i686/sse2:${WINELIB}/i386/lib/i386-linux-gnu:${WINELIB}/i386/lib:${WINELIB}/i386/usr/lib/i386-linux-gnu:${WINELIB}/i386/usr/lib:${WINELIB}/amd64/lib/x86_64-linux-gnu:${WINELIB}/amd64/lib:${WINELIB}/amd64/usr/lib/x86_64-linux-gnu:${WINELIB}/amd64/usr/lib:${WINELIB}/usr/lib/i386-linux-gnu:${WINELIB}/usr/lib/x86_64-linux-gnu:${WINELIB}/amd64/usr/lib:${WINELIB}/lib/i386-linux-gnu:${WINELIB}/lib/x86_64-linux-gnu:${WINELIB}/lib" + fi echo "runtime libs is enabled" else - export LD_LIBRARY_PATH="${WINEDIR}/lib64:${WINEDIR}/lib:${LD_LIBRARY_PATH}" + if [ ! -z "${LD_LIBRARY_PATH}" ] + then + export LD_LIBRARY_PATH="${WINEDIR}/lib64:${WINEDIR}/lib:${LD_LIBRARY_PATH}" + else + export LD_LIBRARY_PATH="${WINEDIR}/lib64:${WINEDIR}/lib}" + fi echo "runtime libs is disabled" fi + +export GST_PLUGIN_SYSTEM_PATH_1_0="${WINEDIR}/lib64/lib/gstreamer-1.0/:${WINEDIR}/lib/lib/gstreamer-1.0/" +export WINE_GST_REGISTRY_DIR="${PORT_WINE_PATH}/data/gstreamer-1.0/" ######################################################################## export DXVK_STATE_CACHE_PATH="${PATH_TO_GAME}" export DXVK_STATE_CACHE=1 @@ -98,7 +114,7 @@ START_PORTWINE () { sh "${link}"/port_update export PROTON_NO_FSYNC=0 -export optirun_on=env +export optirun_on="" if [ -x "`which nvidia-settings 2>/dev/null`" ] then if [ -x "`which primusrun 2>/dev/null`" ] @@ -122,6 +138,7 @@ else export DRI_PRIME=1 export vblank_mode=1 export mesa_glthread=true +# export RADV_DEBUG=nocache,nomemorycache local AMD_ATI="$(lspci | grep AMD/ATI)" if [ ! -z "${AMD_ATI}" ] && [ "${PORTWINE_ACO}" -eq "1" ] then diff --git a/data_from_portwine/scripts/start b/data_from_portwine/scripts/start index d87cf5de..245d25b7 100755 --- a/data_from_portwine/scripts/start +++ b/data_from_portwine/scripts/start @@ -3,5 +3,10 @@ . "$(dirname $(readlink -f "$0"))/runlib" "${WINESERVER}" -k START_PORTWINE -${optirun_on} "${var_gamemode}" "${PROTONRUN}" "run" "${gamestart}" ${launch_parameters} & KILL9_WINEDEVICE >&2 +if [ ! -z ${optirun_on} ] +then + ${optirun_on} "${PROTONRUN}" "run" "${gamestart}" ${launch_parameters} & KILL9_WINEDEVICE >&2 +else + "${PROTONRUN}" "run" "${gamestart}" ${launch_parameters} & KILL9_WINEDEVICE >&2 +fi STOP_PORTWINE diff --git a/data_from_portwine/scripts/winecmd b/data_from_portwine/scripts/winecmd index 35c8fc5f..15ca5ac9 100755 --- a/data_from_portwine/scripts/winecmd +++ b/data_from_portwine/scripts/winecmd @@ -2,5 +2,10 @@ # Author: PortWINE-Linux.ru . "$(dirname $(readlink -f "$0"))/runlib" START_PORTWINE -${optirun_on} "${var_gamemode}" "${PROTONRUN}" "run" "cmd" >&2 +if [ ! -z ${optirun_on} ] +then + ${optirun_on} "${PROTONRUN}" "run" "cmd" >&2 +else + "${PROTONRUN}" "run" "cmd" >&2 +fi STOP_PORTWINE diff --git a/data_from_portwine/scripts/winefile b/data_from_portwine/scripts/winefile index 497acd01..a428a382 100755 --- a/data_from_portwine/scripts/winefile +++ b/data_from_portwine/scripts/winefile @@ -3,5 +3,10 @@ . "$(dirname $(readlink -f "$0"))/runlib" START_PORTWINE export WINEDEBUG="fixme-all" -${optirun_on} ${var_gamemode} "${PROTONRUN}" "run" "explorer" & KILL9_WINEDEVICE >&2 +if [ ! -z ${optirun_on} ] +then + ${optirun_on} "${PROTONRUN}" "run" "explorer" & KILL9_WINEDEVICE >&2 +else + "${PROTONRUN}" "run" "explorer" & KILL9_WINEDEVICE >&2 +fi STOP_PORTWINE