diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index c0053b5a..9cc7b16c 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -1644,7 +1644,7 @@ init_wine_ver () { export WINELOADER="$WINE" WINESERVER="$RT_PREFIX$(command -v wineserver)" export WINESERVER - export PW_NO_FSYNC=1 + export PW_USE_FSYNC=0 unset WINEDLLPATH else if [[ -d "${PORT_WINE_PATH}/data/dist" ]] ; then @@ -2397,6 +2397,16 @@ pw_init_db () { source "${PORTWINE_DB_FILE}" elif [[ -f "${portwine_exe}".ppdb ]] ; then PORTWINE_DB_FILE="${portwine_exe}".ppdb + if grep -q "PW_NO_" "${PORTWINE_DB_FILE}" ; then + sed -i \ + -e "s/PW_NO_ESYNC=.*1.*/PW_USE_ESYNC=\"0\"/g" \ + -e "s/PW_NO_ESYNC=.*0.*/PW_USE_ESYNC=\"1\"/g" \ + -e "s/PW_NO_FSYNC=.*1.*/PW_USE_FSYNC=\"0\"/g" \ + -e "s/PW_NO_FSYNC=.*0.*/PW_USE_FSYNC=\"1\"/g" \ + -e "s/PW_NO_NTSYNC=.*1.*/PW_USE_NTSYNC=\"0\"/g" \ + -e "s/PW_NO_NTSYNC=.*0.*/PW_USE_NTSYNC=\"1\"/g" \ + "${PORTWINE_DB_FILE}" + fi # shellcheck source=/dev/null source "${PORTWINE_DB_FILE}" if echo "${portwine_exe}" | grep "/prefixes/" &>/dev/null ; then @@ -3364,12 +3374,12 @@ start_portwine () { if [[ $ULIMIT_HN -lt 524288 ]] ; then print_warning "ESYNC dont work! (ulimit -Hn $ULIMIT_HN < 524288)" export WINEESYNC="0" - elif [[ $PW_NO_ESYNC == "1" ]] + elif [[ $PW_USE_ESYNC == "0" ]] then export WINEESYNC="0" else export WINEESYNC="1" fi - if [[ $PW_NO_FSYNC == "1" ]] ; then + if [[ $PW_USE_FSYNC == "0" ]] ; then export WINEFSYNC="0" export WINEFSYNC_FUTEX2="0" else @@ -3378,7 +3388,7 @@ start_portwine () { check_variables WINEFSYNC_FUTEX2 0 fi - if [[ $PW_NO_NTSYNC == "0" ]] ; then + if [[ $PW_USE_NTSYNC == "1" ]] ; then if [[ -e "/dev/ntsync" ]] ; then export WINENTSYNC="1" export WINEFSYNC="0" @@ -5395,7 +5405,7 @@ export -f gui_proton_downloader gui_edit_db () { KEY_EDIT_DB_GUI=$RANDOM PW_EDIT_DB_LIST=(PW_MANGOHUD PW_MANGOHUD_USER_CONF PW_VKBASALT PW_VKBASALT_USER_CONF PW_DGVOODOO2 PW_GAMESCOPE - PW_NO_ESYNC PW_NO_FSYNC PW_NO_NTSYNC PW_USE_RAY_TRACING PW_USE_NVAPI_AND_DLSS PW_USE_OPTISCALER + PW_USE_ESYNC PW_USE_FSYNC PW_USE_NTSYNC PW_USE_RAY_TRACING PW_USE_NVAPI_AND_DLSS PW_USE_OPTISCALER PW_USE_LS_FRAME_GEN PW_WINE_FULLSCREEN_FSR PW_HIDE_NVIDIA_GPU PW_VIRTUAL_DESKTOP PW_USE_TERMINAL PW_GUI_DISABLED_CS PW_USE_GAMEMODE PW_USE_D3D_EXTRAS PW_FIX_VIDEO_IN_GAME PW_REDUCE_PULSE_LATENCY PW_USE_US_LAYOUT PW_USE_GSTREAMER PW_USE_SHADER_CACHE PW_USE_WINE_DXGI PW_USE_EAC_AND_BE PW_USE_SYSTEM_VK_LAYERS PW_USE_OBS_VKCAPTURE @@ -5422,9 +5432,9 @@ gui_edit_db () { Super + S : Take screenshot (currently goes to /tmp/gamescope_DATE.png) Super + G : Toggle keyboard grab Super + C : Update clipboard]} - PW_NO_ESYNC_INFO=${translations[Do not use in-process synchronization primitives based on eventfd. (It is recommended not to change the value.)]} - PW_NO_FSYNC_INFO=${translations[Do not use futex-based in-process synchronization primitives. (Automatically disabled on systems without FUTEX_WAIT_MULTIPLE support) (It is recommended not to change the value)]} - PW_NO_NTSYNC_INFO=${translations[Do not use in-process synchronization via the Linux ntsync driver. (Automatically disabled on systems without loaded ntsync module) (Experimental)]} + PW_USE_ESYNC_INFO=${translations[Enable in-process synchronization primitives based on eventfd. (It is recommended not to change the value.)]} + PW_USE_FSYNC_INFO=${translations[Enable futex-based in-process synchronization primitives. (Automatically disabled on systems without FUTEX_WAIT_MULTIPLE support) (It is recommended not to change the value)]} + PW_USE_NTSYNC_INFO=${translations[Enable in-process synchronization via the Linux ntsync driver. (Automatically disabled on systems without loaded ntsync module) (Experimental)]} PW_USE_RAY_TRACING_INFO=${translations[Enable vkd3d support - Ray Tracing]} PW_USE_NVAPI_AND_DLSS_INFO=${translations[Enable DLSS on supported NVIDIA graphics cards]} PW_USE_OPTISCALER_INFO=${translations[Enable OptiScaler. It is a tool that lets you replace upscalers in games that already support DLSS2+ / FSR2+ / XeSS, now also supports enabling frame generation in those same games (through Nukem dlssg-to-fsr3 or OptiFG)]} @@ -5482,7 +5492,7 @@ gui_edit_db () { DISABLE_EDIT_DB_LIST+=" PW_USE_SUPPLIED_DXVK_VKD3D" fi - [[ ! -e "/dev/ntsync" ]] && DISABLE_EDIT_DB_LIST+=" PW_NO_NTSYNC" + [[ ! -e "/dev/ntsync" ]] && DISABLE_EDIT_DB_LIST+=" PW_USE_NTSYNC" if check_wayland_session then DISABLE_EDIT_DB_LIST+=" PW_USE_US_LAYOUT" @@ -7315,8 +7325,8 @@ pw_autoinstall_from_db () { export PW_NO_WRITE_WATCH=0 export PW_VULKAN_USE=1 export PW_USE_EAC_AND_BE=0 - export PW_NO_FSYNC=1 - export PW_NO_ESYNC=1 + export PW_USE_FSYNC=0 + export PW_USE_ESYNC=0 unset PORTWINE_CREATE_SHORTCUT_NAME export PW_DISABLED_CREATE_DB=1 export PW_MANGOHUD=0 diff --git a/data_from_portwine/scripts/portwine_db/AC4BFSP.ppdb b/data_from_portwine/scripts/portwine_db/AC4BFSP.ppdb index 54964e63..fd290d10 100644 --- a/data_from_portwine/scripts/portwine_db/AC4BFSP.ppdb +++ b/data_from_portwine/scripts/portwine_db/AC4BFSP.ppdb @@ -4,5 +4,5 @@ #Rating=1-5 #####################examples########################### export PW_VULKAN_USE=1 -export PW_NO_FSYNC=1 -export PW_NO_ESYNC=1 +export PW_USE_FSYNC=0 +export PW_USE_ESYNC=0 diff --git a/data_from_portwine/scripts/portwine_db/ACIII.ppdb b/data_from_portwine/scripts/portwine_db/ACIII.ppdb index 0e8d1b57..bf329498 100644 --- a/data_from_portwine/scripts/portwine_db/ACIII.ppdb +++ b/data_from_portwine/scripts/portwine_db/ACIII.ppdb @@ -6,8 +6,8 @@ #####################examples########################### export PW_VULKAN_USE="2" export PW_WINE_USE="WINE_LG_9-12-2" -export PW_NO_ESYNC="1" -export PW_NO_FSYNC="0" +export PW_USE_ESYNC="0" +export PW_USE_FSYNC="1" export PW_WINE_FULLSCREEN_FSR="1" export PW_HIDE_NVIDIA_GPU="0" export PW_VIRTUAL_DESKTOP="0" diff --git a/data_from_portwine/scripts/portwine_db/ACOdyssey.ppdb b/data_from_portwine/scripts/portwine_db/ACOdyssey.ppdb index 61442982..fc4a524a 100644 --- a/data_from_portwine/scripts/portwine_db/ACOdyssey.ppdb +++ b/data_from_portwine/scripts/portwine_db/ACOdyssey.ppdb @@ -3,7 +3,7 @@ #ACOdyssey.exe #Rating=4 #####################examples########################### -export PW_NO_ESYNC="0" +export PW_USE_ESYNC="1" export PW_USE_GSTREAMER="0" export PW_PREFIX_NAME="ACO" export PW_WINE_USE="WINE_LG" diff --git a/data_from_portwine/scripts/portwine_db/ACOrigins.ppdb b/data_from_portwine/scripts/portwine_db/ACOrigins.ppdb index 8c3ff0b4..26fd16ad 100644 --- a/data_from_portwine/scripts/portwine_db/ACOrigins.ppdb +++ b/data_from_portwine/scripts/portwine_db/ACOrigins.ppdb @@ -5,7 +5,7 @@ export PW_VULKAN_USE="2" export PW_WINE_USE="PROTON_LG" export PORTPROTON_NAME="ACOrigins" -export PW_NO_ESYNC="0" -export PW_NO_FSYNC="0" +export PW_USE_ESYNC="1" +export PW_USE_FSYNC="1" export PW_WINE_FULLSCREEN_FSR="1" export PW_USE_GSTREAMER="0" diff --git a/data_from_portwine/scripts/portwine_db/APlagueTaleInnocence_x64.ppdb b/data_from_portwine/scripts/portwine_db/APlagueTaleInnocence_x64.ppdb index 88d6a2fc..9014e778 100644 --- a/data_from_portwine/scripts/portwine_db/APlagueTaleInnocence_x64.ppdb +++ b/data_from_portwine/scripts/portwine_db/APlagueTaleInnocence_x64.ppdb @@ -6,8 +6,8 @@ export PW_VULKAN_USE="2" export PW_WINE_USE="PROTON_LG" export PW_PREFIX_NAME="PLAGUE" export PORTPROTON_NAME="A Plague Tale: Innocence" -export PW_NO_ESYNC="0" -export PW_NO_FSYNC="1" +export PW_USE_ESYNC="1" +export PW_USE_FSYNC="0" export PW_WINE_FULLSCREEN_FSR="1" export PW_HIDE_NVIDIA_GPU="0" export PW_VIRTUAL_DESKTOP="0" diff --git a/data_from_portwine/scripts/portwine_db/AliceMadnessReturns.ppdb b/data_from_portwine/scripts/portwine_db/AliceMadnessReturns.ppdb index 4e283498..15d57fa4 100644 --- a/data_from_portwine/scripts/portwine_db/AliceMadnessReturns.ppdb +++ b/data_from_portwine/scripts/portwine_db/AliceMadnessReturns.ppdb @@ -4,7 +4,7 @@ #Rating=5 #####################examples########################### export PW_WINDOWS_VER="10" -export PW_NO_FSYNC="1" -export PW_NO_ESYNC="1" +export PW_USE_FSYNC="0" +export PW_USE_ESYNC="0" export PW_USE_GSTREAMER="1" export PW_WINE_USE="PROTON_LG" diff --git a/data_from_portwine/scripts/portwine_db/AloneInTheDark-Win64-Shipping.ppdb b/data_from_portwine/scripts/portwine_db/AloneInTheDark-Win64-Shipping.ppdb index bb1eb391..afff8513 100644 --- a/data_from_portwine/scripts/portwine_db/AloneInTheDark-Win64-Shipping.ppdb +++ b/data_from_portwine/scripts/portwine_db/AloneInTheDark-Win64-Shipping.ppdb @@ -10,8 +10,8 @@ export LAUNCH_PARAMETERS="" export PW_VULKAN_USE="2" export PW_HIDE_NVIDIA_GPU="0" export PW_VIRTUAL_DESKTOP="0" -export PW_NO_FSYNC="0" -export PW_NO_ESYNC="1" +export PW_USE_FSYNC="1" +export PW_USE_ESYNC="0" export PW_USE_GSTREAMER="1" export PW_REDUCE_PULSE_LATENCY="0" export PW_USE_TERMINAL="0" diff --git a/data_from_portwine/scripts/portwine_db/Bioshock2HD.ppdb b/data_from_portwine/scripts/portwine_db/Bioshock2HD.ppdb index a05cbec4..b1af7b5b 100644 --- a/data_from_portwine/scripts/portwine_db/Bioshock2HD.ppdb +++ b/data_from_portwine/scripts/portwine_db/Bioshock2HD.ppdb @@ -6,8 +6,8 @@ export PW_VULKAN_USE="2" export PW_WINE_USE="WINE_LG" export PW_PREFIX_NAME="DEFAULT" export PW_VKBASALT="1" -export PW_NO_ESYNC="1" -export PW_NO_FSYNC="1" +export PW_USE_ESYNC="0" +export PW_USE_FSYNC="0" export PW_USE_D3D_EXTRAS="1" export PW_USE_GSTREAMER="1" export PW_USE_SHADER_CACHE="1" diff --git a/data_from_portwine/scripts/portwine_db/BioshockHD.ppdb b/data_from_portwine/scripts/portwine_db/BioshockHD.ppdb index 556446dc..4769a2da 100644 --- a/data_from_portwine/scripts/portwine_db/BioshockHD.ppdb +++ b/data_from_portwine/scripts/portwine_db/BioshockHD.ppdb @@ -6,8 +6,8 @@ export PW_VULKAN_USE="2" export PW_WINE_USE="WINE_LG" export PW_PREFIX_NAME="DEFAULT" export PW_VKBASALT="1" -export PW_NO_ESYNC="1" -export PW_NO_FSYNC="1" +export PW_USE_ESYNC="0" +export PW_USE_FSYNC="0" export PW_USE_D3D_EXTRAS="1" export PW_USE_GSTREAMER="1" export PW_USE_SHADER_CACHE="1" diff --git a/data_from_portwine/scripts/portwine_db/BsgLauncher.ppdb b/data_from_portwine/scripts/portwine_db/BsgLauncher.ppdb index dfa0e3e5..ddcd2e48 100644 --- a/data_from_portwine/scripts/portwine_db/BsgLauncher.ppdb +++ b/data_from_portwine/scripts/portwine_db/BsgLauncher.ppdb @@ -5,8 +5,8 @@ #EscapeFromTarkov_BE.exe #Rating=1-5 #####################examples########################### -export PW_NO_FSYNC="1" -export PW_NO_ESYNC="1" +export PW_USE_FSYNC="0" +export PW_USE_ESYNC="0" export PW_PREFIX_NAME="DOTNET" # add_in_start_portwine () { diff --git a/data_from_portwine/scripts/portwine_db/DXHRDC.ppdb b/data_from_portwine/scripts/portwine_db/DXHRDC.ppdb index 01ad7ae6..2c5848e2 100644 --- a/data_from_portwine/scripts/portwine_db/DXHRDC.ppdb +++ b/data_from_portwine/scripts/portwine_db/DXHRDC.ppdb @@ -7,7 +7,7 @@ #####################examples########################### export WINEDLLOVERRIDES="WINMM=n,b" export PW_VULKAN_USE=1 -export PW_NO_FSYNC=0 # Do not use futex-based in-process synchronization primitives. (Automatically disabled on systems with no FUTEX_WAIT_MULTIPLE support. -export PW_NO_ESYNC=0 # Do not use eventfd-based in-process synchronization primitives +export PW_USE_FSYNC=1 # Do not use futex-based in-process synchronization primitives. (Automatically disabled on systems with no FUTEX_WAIT_MULTIPLE support. +export PW_USE_ESYNC=1 # Do not use eventfd-based in-process synchronization primitives export PW_USE_GSTREAMER=0 # 0 - disabled use winegstreamer diff --git a/data_from_portwine/scripts/portwine_db/DaysGone.ppdb b/data_from_portwine/scripts/portwine_db/DaysGone.ppdb index 48f386ce..39671986 100644 --- a/data_from_portwine/scripts/portwine_db/DaysGone.ppdb +++ b/data_from_portwine/scripts/portwine_db/DaysGone.ppdb @@ -4,5 +4,5 @@ #Rating=1-5 #####################examples########################### export PW_DLL_INSTALL="vcrun2019" # Install DLL in port prefix (used winetricks) -export PW_NO_FSYNC=0 # Do not use futex-based in-process synchronization primitives. (Automatically disabled on systems with no FUTEX_WAIT_MULTIPLE support. -export PW_NO_ESYNC=0 # Do not use eventfd-based in-process synchronization primitives +export PW_USE_FSYNC=1 # Do not use futex-based in-process synchronization primitives. (Automatically disabled on systems with no FUTEX_WAIT_MULTIPLE support. +export PW_USE_ESYNC=1 # Do not use eventfd-based in-process synchronization primitives diff --git a/data_from_portwine/scripts/portwine_db/Deathloop.ppdb b/data_from_portwine/scripts/portwine_db/Deathloop.ppdb index d812280c..d9b025a0 100644 --- a/data_from_portwine/scripts/portwine_db/Deathloop.ppdb +++ b/data_from_portwine/scripts/portwine_db/Deathloop.ppdb @@ -12,7 +12,7 @@ export PW_VULKAN_USE="1" export WINEDLLOVERRIDES="xaudio2_8,xaudio2_9=" export PW_DINPUT_PROTOCOL="1" export PW_WINDOWS_VER="10" -export PW_NO_ESYNC="1" -export PW_NO_FSYNC="1" +export PW_USE_ESYNC="0" +export PW_USE_FSYNC="0" export PW_PREFIX_NAME="DEATHLOOP" export PW_WINE_USE="PROTON_LG" diff --git a/data_from_portwine/scripts/portwine_db/EALauncher.ppdb b/data_from_portwine/scripts/portwine_db/EALauncher.ppdb index 2c236ae4..a0e252dd 100644 --- a/data_from_portwine/scripts/portwine_db/EALauncher.ppdb +++ b/data_from_portwine/scripts/portwine_db/EALauncher.ppdb @@ -7,6 +7,6 @@ export PW_VULKAN_USE="2" export PW_WINE_USE="PROTON_LG" export PW_PREFIX_NAME="EAAPP" -export PW_NO_ESYNC="1" -export PW_NO_FSYNC="0" +export PW_USE_ESYNC="0" +export PW_USE_FSYNC="1" add_in_start_portwine () { export LC_CTYPE=C ;} diff --git a/data_from_portwine/scripts/portwine_db/FL64.ppdb b/data_from_portwine/scripts/portwine_db/FL64.ppdb index dc9cb81a..51070865 100644 --- a/data_from_portwine/scripts/portwine_db/FL64.ppdb +++ b/data_from_portwine/scripts/portwine_db/FL64.ppdb @@ -6,5 +6,5 @@ #####################examples########################### export PW_VULKAN_USE=0 export WINEDLLOVERRIDES="FLEngine,FLEngine_x64=n" -export PW_NO_FSYNC=1 # Do not use futex-based in-process synchronization primitives. (Automatically disabled on systems with no FUTEX_WAIT_MULTIPLE support. -export PW_NO_ESYNC=1 # Do not use eventfd-based in-process synchronization primitives +export PW_USE_FSYNC=0 # Do not use futex-based in-process synchronization primitives. (Automatically disabled on systems with no FUTEX_WAIT_MULTIPLE support. +export PW_USE_ESYNC=0 # Do not use eventfd-based in-process synchronization primitives diff --git a/data_from_portwine/scripts/portwine_db/Far Cry 1.ppdb b/data_from_portwine/scripts/portwine_db/Far Cry 1.ppdb index 8baec6ea..039abb91 100644 --- a/data_from_portwine/scripts/portwine_db/Far Cry 1.ppdb +++ b/data_from_portwine/scripts/portwine_db/Far Cry 1.ppdb @@ -5,5 +5,5 @@ ################################# export PW_VULKAN_USE=0 export WINEDLLOVERRIDES="cgD3D9,cgD3D9d=n" -export PW_NO_FSYNC=1 # Do not use futex-based in-process synchronization primitives. (Automatically disabled on systems with no FUTEX_WAIT_MULTIPLE support. -export PW_NO_ESYNC=1 # Do not use eventfd-based in-process synchronization primitives +export PW_USE_FSYNC=0 # Do not use futex-based in-process synchronization primitives. (Automatically disabled on systems with no FUTEX_WAIT_MULTIPLE support. +export PW_USE_ESYNC=0 # Do not use eventfd-based in-process synchronization primitives diff --git a/data_from_portwine/scripts/portwine_db/GTAIV.ppdb b/data_from_portwine/scripts/portwine_db/GTAIV.ppdb index 508b5672..22bf4cd5 100644 --- a/data_from_portwine/scripts/portwine_db/GTAIV.ppdb +++ b/data_from_portwine/scripts/portwine_db/GTAIV.ppdb @@ -4,5 +4,5 @@ #Rating=1-5 ################################################ export LAUNCH_PARAMETERS="-nomemrestrict -norestrictions -percentvidmem 100 -availablevidmem 2048 -noprecache -novblank -heapsize 2097152" # Additional launch options -export PW_NO_ESYNC=0 -export PW_NO_FSYNC=1 +export PW_USE_ESYNC=1 +export PW_USE_FSYNC=0 diff --git a/data_from_portwine/scripts/portwine_db/Konung3.ppdb b/data_from_portwine/scripts/portwine_db/Konung3.ppdb index c661d9e9..c4bd5c27 100644 --- a/data_from_portwine/scripts/portwine_db/Konung3.ppdb +++ b/data_from_portwine/scripts/portwine_db/Konung3.ppdb @@ -6,6 +6,6 @@ export PW_VULKAN_USE="0" export PW_OLD_GL_STRING="0" export PW_VIRTUAL_DESKTOP="1" -export PW_NO_FSYNC="0" -export PW_NO_ESYNC="1" +export PW_USE_FSYNC="1" +export PW_USE_ESYNC="0" diff --git a/data_from_portwine/scripts/portwine_db/Larry.ppdb b/data_from_portwine/scripts/portwine_db/Larry.ppdb index 96e245e1..7cb7a046 100644 --- a/data_from_portwine/scripts/portwine_db/Larry.ppdb +++ b/data_from_portwine/scripts/portwine_db/Larry.ppdb @@ -3,7 +3,7 @@ #Larry.exe #Rating=5 ################################################ -export PW_NO_FSYNC=1 -export PW_NO_ESYNC=1 +export PW_USE_FSYNC=0 +export PW_USE_ESYNC=0 export PW_WINDOWS_VER=7 diff --git a/data_from_portwine/scripts/portwine_db/League of Legends.ppdb b/data_from_portwine/scripts/portwine_db/League of Legends.ppdb index 01e9e9bf..4e6ac0a3 100644 --- a/data_from_portwine/scripts/portwine_db/League of Legends.ppdb +++ b/data_from_portwine/scripts/portwine_db/League of Legends.ppdb @@ -17,8 +17,8 @@ export PW_WINE_USE=WINE_LOL_GE_8.27 export PW_VULKAN_USE=1 export PW_MUST_HAVE_DLL="" export PW_PREFIX_NAME="LEAGUE_OF_LEGENDS" -export PW_NO_FSYNC=1 -export PW_NO_ESYNC=1 +export PW_USE_FSYNC=0 +export PW_USE_ESYNC=0 export PW_DISABLED_CREATE_DB=1 export PW_USE_D3D_EXTRAS=1 export DISABLE_CP_DEFPFX=1 diff --git a/data_from_portwine/scripts/portwine_db/Lineage2_NewRP.ppdb b/data_from_portwine/scripts/portwine_db/Lineage2_NewRP.ppdb index ccb5dc6f..c2735aa8 100644 --- a/data_from_portwine/scripts/portwine_db/Lineage2_NewRP.ppdb +++ b/data_from_portwine/scripts/portwine_db/Lineage2_NewRP.ppdb @@ -4,5 +4,5 @@ #Rating=5 #####################examples########################### export PW_USE_GSTREAMER=0 -export PW_NO_FSYNC=0 -export PW_NO_ESYNC=0 +export PW_USE_FSYNC=1 +export PW_USE_ESYNC=1 diff --git a/data_from_portwine/scripts/portwine_db/Matrix3.ppdb b/data_from_portwine/scripts/portwine_db/Matrix3.ppdb index ab387211..4221929a 100644 --- a/data_from_portwine/scripts/portwine_db/Matrix3.ppdb +++ b/data_from_portwine/scripts/portwine_db/Matrix3.ppdb @@ -6,8 +6,8 @@ export PW_VULKAN_USE="2" export PW_WINE_USE="PROTON_LG" export PW_PREFIX_NAME="DEFAULT" export PORTPROTON_NAME="Matrix3" -export PW_NO_ESYNC="1" -export PW_NO_FSYNC="1" +export PW_USE_ESYNC="0" +export PW_USE_FSYNC="0" export PW_WINE_FULLSCREEN_FSR="1" export PW_HIDE_NVIDIA_GPU="0" export PW_VIRTUAL_DESKTOP="0" diff --git a/data_from_portwine/scripts/portwine_db/P4G.ppdb b/data_from_portwine/scripts/portwine_db/P4G.ppdb index ca6f7a7f..b0747c40 100644 --- a/data_from_portwine/scripts/portwine_db/P4G.ppdb +++ b/data_from_portwine/scripts/portwine_db/P4G.ppdb @@ -6,8 +6,8 @@ export PW_VULKAN_USE="2" export PW_WINE_USE="PROTON_LG" export PW_PREFIX_NAME="PERSONA" export PORTPROTON_NAME="P4G" -export PW_NO_ESYNC="1" -export PW_NO_FSYNC="0" +export PW_USE_ESYNC="0" +export PW_USE_FSYNC="1" export PW_WINE_FULLSCREEN_FSR="1" export PW_HIDE_NVIDIA_GPU="0" export PW_VIRTUAL_DESKTOP="0" diff --git a/data_from_portwine/scripts/portwine_db/RDR.ppdb b/data_from_portwine/scripts/portwine_db/RDR.ppdb index 7f9134b5..7693c8c5 100644 --- a/data_from_portwine/scripts/portwine_db/RDR.ppdb +++ b/data_from_portwine/scripts/portwine_db/RDR.ppdb @@ -4,7 +4,7 @@ #Rating=1-5 export PW_WINE_USE="WINE_LG" export LAUNCH_PARAMETERS="-nomemrestrict -norestrictions -percentvidmem 100 -availablevidmem 2048 -noprecache -novblank -heapsize 2097152" -export PW_NO_ESYNC="0" -export PW_NO_FSYNC="1" +export PW_USE_ESYNC="1" +export PW_USE_FSYNC="0" export PORTPROTON_NAME="PlayRDR" export PW_VULKAN_USE="2" diff --git a/data_from_portwine/scripts/portwine_db/SimCity.ppdb b/data_from_portwine/scripts/portwine_db/SimCity.ppdb index ab8a64f8..bad05f9b 100644 --- a/data_from_portwine/scripts/portwine_db/SimCity.ppdb +++ b/data_from_portwine/scripts/portwine_db/SimCity.ppdb @@ -4,5 +4,5 @@ #Rating=1-5 ######################################################## export PW_DLL_INSTALL="vcrun2012 vcrun2019 d3dcompiler_43 d3dcompiler_47 d3dx9" # Install DDL in port prefix (used winetricks) -export PW_NO_FSYNC=1 # Do not use futex-based in-process synchronization primitives. (Automatically disabled on systems with no FUTEX_WAIT_MULTIPLE support. -export PW_NO_ESYNC=1 +export PW_USE_FSYNC=0 # Do not use futex-based in-process synchronization primitives. (Automatically disabled on systems with no FUTEX_WAIT_MULTIPLE support. +export PW_USE_ESYNC=0 diff --git a/data_from_portwine/scripts/portwine_db/Singularity.ppdb b/data_from_portwine/scripts/portwine_db/Singularity.ppdb index 51b48cc9..f4e88440 100644 --- a/data_from_portwine/scripts/portwine_db/Singularity.ppdb +++ b/data_from_portwine/scripts/portwine_db/Singularity.ppdb @@ -9,8 +9,8 @@ export PW_WINE_USE="PROTON_LG" export PW_VKBASALT_EFFECTS="FilmGrain2:Curves:cas" export PW_VKBASALT_FFX_CAS="0.75" export PW_VKBASALT="1" -export PW_NO_ESYNC="1" -export PW_NO_FSYNC="0" +export PW_USE_ESYNC="0" +export PW_USE_FSYNC="1" export PW_USE_GSTREAMER="1" export PW_USE_SHADER_CACHE="1" export PW_USE_WINE_DXGI="0" diff --git a/data_from_portwine/scripts/portwine_db/TMNT.ppdb b/data_from_portwine/scripts/portwine_db/TMNT.ppdb index c22bc5ce..bcddb801 100644 --- a/data_from_portwine/scripts/portwine_db/TMNT.ppdb +++ b/data_from_portwine/scripts/portwine_db/TMNT.ppdb @@ -6,8 +6,8 @@ export PW_VULKAN_USE="2" export PW_WINE_USE="PROTON_LG" export PW_PREFIX_NAME="DEFAULT" export PORTPROTON_NAME="TMNT.EXE" -export PW_NO_ESYNC="1" -export PW_NO_FSYNC="1" +export PW_USE_ESYNC="0" +export PW_USE_FSYNC="0" export PW_WINE_FULLSCREEN_FSR="1" export PW_HIDE_NVIDIA_GPU="0" export PW_VIRTUAL_DESKTOP="0" diff --git a/data_from_portwine/scripts/portwine_db/TMNT2.ppdb b/data_from_portwine/scripts/portwine_db/TMNT2.ppdb index 1454e392..e71fb63a 100644 --- a/data_from_portwine/scripts/portwine_db/TMNT2.ppdb +++ b/data_from_portwine/scripts/portwine_db/TMNT2.ppdb @@ -6,8 +6,8 @@ export PW_VULKAN_USE="2" export PW_WINE_USE="PROTON_LG" export PW_PREFIX_NAME="DEFAULT" export PORTPROTON_NAME="TMNT2" -export PW_NO_ESYNC="1" -export PW_NO_FSYNC="1" +export PW_USE_ESYNC="0" +export PW_USE_FSYNC="0" export PW_WINE_FULLSCREEN_FSR="1" export PW_HIDE_NVIDIA_GPU="0" export PW_VIRTUAL_DESKTOP="0" diff --git a/data_from_portwine/scripts/portwine_db/TimeShift.ppdb b/data_from_portwine/scripts/portwine_db/TimeShift.ppdb index 420c41a3..b2e60dc4 100644 --- a/data_from_portwine/scripts/portwine_db/TimeShift.ppdb +++ b/data_from_portwine/scripts/portwine_db/TimeShift.ppdb @@ -6,8 +6,8 @@ export PW_VULKAN_USE="2" export PW_WINE_USE="PROTON_LG" export PW_PREFIX_NAME="DEFAULT" export PW_VKBASALT="1" -export PW_NO_ESYNC="1" -export PW_NO_FSYNC="1" +export PW_USE_ESYNC="0" +export PW_USE_FSYNC="0" export PW_WINE_FULLSCREEN_FSR="1" export PW_USE_GSTREAMER="1" export PW_USE_SHADER_CACHE="1" diff --git a/data_from_portwine/scripts/portwine_db/WorldOfSeaBattle.ppdb b/data_from_portwine/scripts/portwine_db/WorldOfSeaBattle.ppdb index 01b1bef9..48d5315a 100644 --- a/data_from_portwine/scripts/portwine_db/WorldOfSeaBattle.ppdb +++ b/data_from_portwine/scripts/portwine_db/WorldOfSeaBattle.ppdb @@ -7,7 +7,7 @@ export PW_COMMENT_DB="" export PW_WINDOWS_VER="10" export PW_VULKAN_USE="2" export WINEDLLOVERRIDES="vulkan-1=n,b" -export PW_NO_ESYNC="1" +export PW_USE_ESYNC="0" export PW_USE_D3D_EXTRAS="1" export PW_USE_GSTREAMER="1" export PW_USE_SHADER_CACHE="1" diff --git a/data_from_portwine/scripts/portwine_db/arizona-starter.ppdb b/data_from_portwine/scripts/portwine_db/arizona-starter.ppdb index a0a94438..d4f26033 100644 --- a/data_from_portwine/scripts/portwine_db/arizona-starter.ppdb +++ b/data_from_portwine/scripts/portwine_db/arizona-starter.ppdb @@ -5,6 +5,6 @@ #Rating=1-5 #####################examples########################### # export PW_VULKAN_USE="0" -export PW_NO_ESYNC="0" -export PW_NO_FSYNC="1" +export PW_USE_ESYNC="1" +export PW_USE_FSYNC="0" # export WINEDLLOVERRIDES="d3d8,drvmgt,mss32=n,b" diff --git a/data_from_portwine/scripts/portwine_db/gamesvoice.ppdb b/data_from_portwine/scripts/portwine_db/gamesvoice.ppdb index 5c14aa19..ceb4df62 100644 --- a/data_from_portwine/scripts/portwine_db/gamesvoice.ppdb +++ b/data_from_portwine/scripts/portwine_db/gamesvoice.ppdb @@ -7,8 +7,8 @@ export PW_COMMENT_DB="!!! ВНИМАНИЕ !!! Для русификации игры в \"STEAM\", выберите в установщике диск \"S:\" и в нём нужную игру." export PW_VULKAN_USE="1" export PW_MANGOHUD="0" -export PW_NO_FSYNC="1" -export PW_NO_ESYNC="1" +export PW_USE_FSYNC="0" +export PW_USE_ESYNC="0" export PW_USE_GAMEMODE="0" export PW_PREFIX_NAME="DOTNET" export PW_DLL_INSTALL="" diff --git a/data_from_portwine/scripts/portwine_db/iw4sp.ppdb b/data_from_portwine/scripts/portwine_db/iw4sp.ppdb index dfc5277e..01a51f56 100644 --- a/data_from_portwine/scripts/portwine_db/iw4sp.ppdb +++ b/data_from_portwine/scripts/portwine_db/iw4sp.ppdb @@ -4,5 +4,5 @@ #Rating=1-5 #####################examples########################### export PW_DLL_INSTALL="vcrun2019 d3dx9" -export PW_NO_FSYNC=1 +export PW_USE_FSYNC=0 export PW_VIRTUAL_DESKTOP=1 diff --git a/data_from_portwine/scripts/portwine_db/student.ppdb b/data_from_portwine/scripts/portwine_db/student.ppdb index cfda6240..6fb0340a 100644 --- a/data_from_portwine/scripts/portwine_db/student.ppdb +++ b/data_from_portwine/scripts/portwine_db/student.ppdb @@ -7,6 +7,6 @@ export PW_WINE_USE="PROTON_LG" export PW_PREFIX_NAME="STUDENT" export PW_DISABLED_CREATE_DB="1" export WINEDLLOVERRIDES="mscoree,mshtml=" -export PW_NO_FSYNC="1" -export PW_NO_ESYNC="1" +export PW_USE_FSYNC="0" +export PW_USE_ESYNC="0" export DISABLE_CP_DEFPFX="1" diff --git a/data_from_portwine/scripts/portwine_db/teacher.ppdb b/data_from_portwine/scripts/portwine_db/teacher.ppdb index b367e93d..526659d4 100644 --- a/data_from_portwine/scripts/portwine_db/teacher.ppdb +++ b/data_from_portwine/scripts/portwine_db/teacher.ppdb @@ -7,6 +7,6 @@ export PW_WINE_USE="PROTON_LG" export PW_PREFIX_NAME="TEACHER" export PW_DISABLED_CREATE_DB="1" export WINEDLLOVERRIDES="mscoree,mshtml=" -export PW_NO_FSYNC="1" -export PW_NO_ESYNC="1" +export PW_USE_FSYNC="0" +export PW_USE_ESYNC="0" export DISABLE_CP_DEFPFX="1" diff --git a/data_from_portwine/scripts/portwine_db/win_install_student.ppdb b/data_from_portwine/scripts/portwine_db/win_install_student.ppdb index c4afae68..0973850d 100644 --- a/data_from_portwine/scripts/portwine_db/win_install_student.ppdb +++ b/data_from_portwine/scripts/portwine_db/win_install_student.ppdb @@ -7,8 +7,8 @@ export PW_WINE_USE="PROTON_LG" export PW_PREFIX_NAME="STUDENT" export PW_DISABLED_CREATE_DB="1" export PW_ICON_FOR_YAD="${PORT_WINE_PATH}/data/img/setup.png" -export PW_NO_FSYNC="1" -export PW_NO_ESYNC="1" +export PW_USE_FSYNC="0" +export PW_USE_ESYNC="0" export PW_DLL_INSTALL="" export WINEDLLOVERRIDES="mscoree,mshtml=" export DISABLE_CP_DEFPFX="1" diff --git a/data_from_portwine/scripts/portwine_db/win_install_teacher.ppdb b/data_from_portwine/scripts/portwine_db/win_install_teacher.ppdb index b609d950..3886f26a 100644 --- a/data_from_portwine/scripts/portwine_db/win_install_teacher.ppdb +++ b/data_from_portwine/scripts/portwine_db/win_install_teacher.ppdb @@ -7,8 +7,8 @@ export PW_WINE_USE="PROTON_LG" export PW_PREFIX_NAME="TEACHER" export PW_DISABLED_CREATE_DB="1" export PW_ICON_FOR_YAD="${PORT_WINE_PATH}/data/img/setup.png" -export PW_NO_FSYNC="1" -export PW_NO_ESYNC="1" +export PW_USE_FSYNC="0" +export PW_USE_ESYNC="0" export PW_DLL_INSTALL="" export WINEDLLOVERRIDES="mscoree,mshtml=" export DISABLE_CP_DEFPFX="1" diff --git a/data_from_portwine/scripts/portwine_db/witcher3.ppdb b/data_from_portwine/scripts/portwine_db/witcher3.ppdb index 3648eef2..47e3825a 100644 --- a/data_from_portwine/scripts/portwine_db/witcher3.ppdb +++ b/data_from_portwine/scripts/portwine_db/witcher3.ppdb @@ -9,8 +9,8 @@ export PW_USE_WINE_DXGI="0" export PORTPROTON_NAME="The Witcher 3" export PW_WINE_USE="PROTON_LG" export PW_PREFIX_NAME="DEFAULT" -export PW_NO_ESYNC="1" -export PW_NO_FSYNC="0" +export PW_USE_ESYNC="0" +export PW_USE_FSYNC="1" export PW_WINE_FULLSCREEN_FSR="1" export PW_HIDE_NVIDIA_GPU="0" export PW_VIRTUAL_DESKTOP="0" diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh index 2f69423b..72b4a6f1 100755 --- a/data_from_portwine/scripts/start.sh +++ b/data_from_portwine/scripts/start.sh @@ -97,13 +97,13 @@ else unset PW_GUI_DISABLED_CS fi -unset MANGOHUD PW_NO_ESYNC PW_NO_FSYNC PW_VULKAN_USE WINEDLLOVERRIDES PW_NO_WRITE_WATCH PW_YAD_SET -unset PW_CHECK_AUTOINSTALL PW_VKBASALT_EFFECTS PW_VKBASALT_FFX_CAS PORTWINE_DB PORTWINE_DB_FILE RADV_PERFTEST +unset MANGOHUD PW_VULKAN_USE WINEDLLOVERRIDES PW_NO_WRITE_WATCH PW_YAD_SET PW_CPU_NUMA_NODE_INDEX PW_TASKSET_SLR +unset PW_CHECK_AUTOINSTALL PW_VKBASALT_EFFECTS PW_VKBASALT_FFX_CAS PORTWINE_DB PORTWINE_DB_FILE RADV_PERFTEST PW_USE_RUNTIME unset CHK_SYMLINK_FILE PW_MESA_GL_VERSION_OVERRIDE PW_VKD3D_FEATURE_LEVEL PATH_TO_GAME PW_START_DEBUG PORTPROTON_NAME PW_PATH -unset PW_PREFIX_NAME VULKAN_MOD PW_WINE_VER PW_ADD_TO_ARGS_IN_RUNTIME PW_GAMEMODERUN_SLR PW_WINE_CPU_TOPOLOGY -unset MANGOHUD_CONFIG FPS_LIMIT PW_WINE_USE WINEDLLPATH WINE WINEDIR WINELOADER WINESERVER PW_USE_RUNTIME PORTWINE_CREATE_SHORTCUT_NAME MIRROR +unset PW_PREFIX_NAME VULKAN_MOD PW_WINE_VER PW_ADD_TO_ARGS_IN_RUNTIME PW_GAMEMODERUN_SLR PW_WINE_CPU_TOPOLOGY LAUNCH_URI +unset MANGOHUD_CONFIG FPS_LIMIT PW_WINE_USE WINEDLLPATH WINE WINEDIR WINELOADER WINESERVER PORTWINE_CREATE_SHORTCUT_NAME MIRROR unset PW_LOCALE_SELECT PW_SETTINGS_INDICATION PW_GUI_START PW_AUTOINSTALL_EXE NOSTSTDIR RADV_DEBUG PW_NO_AUTO_CREATE_SHORTCUT -unset PW_TERM PW_EXEC_FROM_DESKTOP WEBKIT_DISABLE_DMABUF_RENDERER PW_AMD_VULKAN_USE PW_VK_ICD_FILENAMES LAUNCH_URI PW_USE_SETUP_FILE PW_CPU_NUMA_NODE_INDEX PW_TASKSET_SLR +unset PW_TERM PW_EXEC_FROM_DESKTOP WEBKIT_DISABLE_DMABUF_RENDERER PW_AMD_VULKAN_USE PW_VK_ICD_FILENAMES PW_USE_SETUP_FILE export PORT_WINE_TMP_PATH="${PORT_WINE_PATH}/data/tmp" rm -f "$PORT_WINE_TMP_PATH"/*{exe,msi,tar}* @@ -335,9 +335,9 @@ if [[ ${portwine_exe,,} =~ (setup|install|.msi$) ]] ; then export PW_DISABLED_CREATE_DB="1" export PW_VULKAN_USE="1" export PW_MANGOHUD="0" - export PW_NO_NTSYNC="1" - export PW_NO_FSYNC="1" - export PW_NO_ESYNC="1" + export PW_USE_NTSYNC="0" + export PW_USE_FSYNC="0" + export PW_USE_ESYNC="0" export PW_USE_GAMEMODE="0" export PW_DLL_INSTALL="" # export WINEDLLOVERRIDES="mscoree,mshtml=" diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index 064617e6..507d5aa3 100755 --- a/data_from_portwine/scripts/var +++ b/data_from_portwine/scripts/var @@ -14,9 +14,9 @@ export PW_USE_RUNTIME="1" export PW_RT_MOUNT_RO=("") export PW_RT_MOUNT_RW=("/media" "/mnt" "/run/media/${USER}" "${PORT_WINE_PATH}") #export PW_SANDBOX_HOME_PATH="${PORT_WINE_PATH}" -export PW_NO_ESYNC="0" -export PW_NO_FSYNC="0" -export PW_NO_NTSYNC="1" +export PW_USE_ESYNC="1" +export PW_USE_FSYNC="1" +export PW_USE_NTSYNC="0" export PW_USE_GAMEMODE="0" export PW_USE_TERMINAL="0" export PW_WINDOWS_VER="10"