From 249fb822a3a388eaac9bea5b995b3854277730d8 Mon Sep 17 00:00:00 2001 From: Mikhail Tergoev Date: Sun, 3 Sep 2023 14:21:20 +0300 Subject: [PATCH] Scripts version 2218 --- data_from_portwine/changelog_eng | 8 ++ data_from_portwine/changelog_rus | 14 +- data_from_portwine/scripts/functions_helper | 121 +++++++++++------- .../scripts/portwine_db/AC4BFSP | 2 - data_from_portwine/scripts/portwine_db/ACIII | 41 +----- .../scripts/portwine_db/ALOTInstaller | 27 +--- data_from_portwine/scripts/portwine_db/Anno4 | 1 - .../scripts/portwine_db/AnomalyLauncher | 1 - data_from_portwine/scripts/portwine_db/Arthur | 36 +----- .../scripts/portwine_db/Battle.net_Launcher | 2 - .../scripts/portwine_db/Biomutant | 1 - .../scripts/portwine_db/BsgLauncher | 54 +------- .../scripts/portwine_db/Cinebench | 1 - .../scripts/portwine_db/Control_DX11 | 1 - .../scripts/portwine_db/Control_DX12 | 1 - .../scripts/portwine_db/Cyberpunk2077 | 26 +--- .../scripts/portwine_db/DAOriginsLauncher | 2 - .../scripts/portwine_db/DOOM Eternal | 1 - data_from_portwine/scripts/portwine_db/DXHRDC | 2 - .../scripts/portwine_db/DaysGone | 1 - .../scripts/portwine_db/Deponia | 2 - .../scripts/portwine_db/Diablo_II | 1 - .../scripts/portwine_db/Dolphin | 1 - data_from_portwine/scripts/portwine_db/EoCApp | 1 - .../scripts/portwine_db/EpicGamesLauncher | 1 - data_from_portwine/scripts/portwine_db/FL64 | 1 - .../scripts/portwine_db/Far Cry 1 | 1 - .../scripts/portwine_db/FarCry6 | 33 +---- .../scripts/portwine_db/FarLoneSails | 1 - .../scripts/portwine_db/Far_Cry_3_d3d11 | 1 - .../scripts/portwine_db/Far_Cry_3_d3d9 | 1 - .../scripts/portwine_db/Far_Cry_4 | 1 - .../scripts/portwine_db/Forsaken_World | 2 - data_from_portwine/scripts/portwine_db/GoW | 1 - .../scripts/portwine_db/HITMAN3 | 1 - data_from_portwine/scripts/portwine_db/Hades | 1 - .../scripts/portwine_db/Half-Life2 | 1 - .../scripts/portwine_db/HogwartsLegacy | 46 ------- .../scripts/portwine_db/Inscryption | 1 - .../scripts/portwine_db/Konung3 | 3 - data_from_portwine/scripts/portwine_db/LOF2 | 1 - .../scripts/portwine_db/Lineage2_NewRP | 32 ----- .../scripts/portwine_db/LostEmber | 38 +----- data_from_portwine/scripts/portwine_db/MWO | 5 +- .../scripts/portwine_db/MWO_Portal.exe.ppdb | 45 +------ .../scripts/portwine_db/MassEffect | 1 - .../scripts/portwine_db/MassEffect2 | 26 ---- .../scripts/portwine_db/MassEffectConfig | 2 - .../scripts/portwine_db/MassEffectLauncher | 34 ----- .../scripts/portwine_db/MikuMikuDance | 33 ----- data_from_portwine/scripts/portwine_db/NovaRO | 1 - .../scripts/portwine_db/Oddworld_Soulstorm | 2 - data_from_portwine/scripts/portwine_db/Panzar | 32 +---- .../scripts/portwine_db/PlariumPlay | 4 - data_from_portwine/scripts/portwine_db/Quake4 | 2 - .../scripts/portwine_db/QuickSFV | 2 - data_from_portwine/scripts/portwine_db/RDR2 | 29 ----- data_from_portwine/scripts/portwine_db/SR2_pc | 1 - data_from_portwine/scripts/portwine_db/Sam3 | 1 - data_from_portwine/scripts/portwine_db/SamSM | 3 - .../scripts/portwine_db/Sheltered2 | 3 - .../portwine_db/ShelteredWindows64_EOS | 2 - .../scripts/portwine_db/Sirus Launcher | 1 - .../scripts/portwine_db/StarCraft | 1 - .../scripts/portwine_db/StarCraft Launcher | 1 - data_from_portwine/scripts/portwine_db/Suite | 1 - .../scripts/portwine_db/SystemShockRemake | 4 - .../scripts/portwine_db/Torchlight | 3 - .../scripts/portwine_db/TwoWorlds2 | 2 - .../scripts/portwine_db/TwoWorlds2_DX10 | 38 +----- .../scripts/portwine_db/UNDERTALE | 31 ----- .../scripts/portwine_db/UbisoftConnect | 1 - .../scripts/portwine_db/VampireLife_2 | 1 - .../scripts/portwine_db/WarGame3 | 1 - .../scripts/portwine_db/WolfNewOrder | 3 - .../portwine_db/WorldOfSeaBattleClient | 2 - .../scripts/portwine_db/alanwake | 1 - .../scripts/portwine_db/arizona-starter | 1 - .../scripts/portwine_db/default | 2 - .../scripts/portwine_db/dontstarve | 1 - data_from_portwine/scripts/portwine_db/ePSXe | 2 - data_from_portwine/scripts/portwine_db/eve | 1 - .../scripts/portwine_db/factorio | 1 - .../scripts/portwine_db/fc3_blooddragon_d3d11 | 28 ---- .../scripts/portwine_db/gfclient | 1 - data_from_portwine/scripts/portwine_db/gta3 | 37 ------ data_from_portwine/scripts/portwine_db/gu | 1 - .../scripts/portwine_db/gu_addon | 1 - data_from_portwine/scripts/portwine_db/hl2 | 1 - data_from_portwine/scripts/portwine_db/iw3sp | 1 - data_from_portwine/scripts/portwine_db/iw4sp | 1 - data_from_portwine/scripts/portwine_db/metro | 2 - .../scripts/portwine_db/risen-1 | 1 - .../scripts/portwine_db/s1_sp64_ship | 1 - .../scripts/portwine_db/saferun | 2 - .../scripts/portwine_db/sanitarium_XP | 2 - .../scripts/portwine_db/sprally2 | 1 - data_from_portwine/scripts/portwine_db/trine | 1 - .../scripts/portwine_db/vocaloid4_4.3.0_setup | 1 - data_from_portwine/scripts/portwine_db/wgc | 4 - .../scripts/portwine_db/witcher3 | 3 - .../scripts/portwine_db/wotblitz | 1 - .../scripts/pw_autoinstall/PW_PLARIUM_PLAY | 4 - .../scripts/pw_autoinstall/PW_STALCRAFT | 2 +- data_from_portwine/scripts/runlib | 18 +-- data_from_portwine/scripts/start.sh | 59 +++++---- data_from_portwine/scripts/var | 7 +- data_from_portwine/scripts/zen_yad_gui | 11 +- 108 files changed, 163 insertions(+), 870 deletions(-) diff --git a/data_from_portwine/changelog_eng b/data_from_portwine/changelog_eng index 3993f2d8..fc900aaa 100755 --- a/data_from_portwine/changelog_eng +++ b/data_from_portwine/changelog_eng @@ -2,6 +2,14 @@ You can help us in the development of the project on the website: https://linux- ----------------------------------------- Changelog: +###Scripts version 2218### Date: 02.09.2023 / Download update size: 8 megabytes +* improved verification of RTX 4000 series video cards +* added a check for NVIDIA + intel/amd hybrid graphics (thanks to Boria138) +* added the variable __VK_LAYER_NV_optimus=NVIDIA_only when PRIME_RENDER_OFFLOAD is enabled (thanks to Boria138) +* deleting previous versions of lib and plugins occurs only when new versions are downloaded successfully (if there are problems with downloading, you can skip and use PP with previous versions of libraries) +* by default, PROTON_LG and WINE_x.x_LG are selected +* added the ability to use stable versions of DXVK and VKD3D by default (by adding export PW_VULCAN_USE=1 to user.conf) + ###Scripts version 2217### Date: 31.08.2023 / Download update size: 8 megabytes * the latest versions of DXVK and VKD3D are selected by default diff --git a/data_from_portwine/changelog_rus b/data_from_portwine/changelog_rus index d4197734..e63080c5 100755 --- a/data_from_portwine/changelog_rus +++ b/data_from_portwine/changelog_rus @@ -2,6 +2,18 @@ ----------------------------------------- История изменений: +###Scripts version 2218### Дата: 03.09.2023 / Размер скачиваемого обновления: 8 мегабайт +* улучшена проверка RTX видеокарт +* добавлена проверка на гибридную графику NVIDIA + intel/amd (спасибо Boria138) +* добавлена переменная "__VK_LAYER_NV_optimus=NVIDIA_only" при включении "PRIME_RENDER_OFFLOAD" (спасибо Boria138) +* включена докачка файлов при проблемах со скачиванием +* удаление предыдущих версий libs и plugins происходит только при успешном завершении скачивания новых версий +* скачивание можно пропустить и использовать PP с предыдущими версиями библиотек (кроме WINE и библиотек Vulkan API) +* по умолчанию сделан выбор PROTON_LG и WINE_x.x_LG +* добавлена возможность использования по умолчанию стабильных версий DXVK и VKD3D (добавлением export PW_VULKAN_USE=1 в user.conf) +* исправлена ошибка c VKD3D_FEATURE_LEVEL 12_0 с запуском игр на стабильных версиях DXVK и VKD3D +* исправлена установка STALCRAFT + ###Scripts version 2217### Дата: 31.08.2023 / Размер скачиваемого обновления: 8 мегабайт * временно отключено определение Vulkan API из за возможных проблем на стороне vulkaninfo * новейшие версии DXVK и VKD3D выбраны по умолчанию (более востребованы для новейших игр) @@ -15,7 +27,7 @@ DXVK_GIT_VER="2.2-164" VKD3D_STABLE_VER="1.1-3445" VKD3D_GIT_VER="1.1-3556" -* Обновлен пакет библиотек libs_v44: +* обновлен пакет библиотек libs_v44: pressure-vessel 0.20230718.0 sniper 0.20230718.55074 * добавлено автоматическое определение видеокарт NVIDIA RTX (спасибо Boria138) diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index e4cb5d83..f626bd17 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -31,6 +31,8 @@ print_var () { } export -f print_var +check_variables () { [[ -z ${!1} ]] && export $1="$2" ;} + try_copy_file () { if [ ! -f "$1" ] ; then print_info "file $1 not found for copy" && return 1 elif [ -z "$2" ] ; then print_error "no way to copy file $1" && return 1 @@ -115,21 +117,19 @@ export -f check_process try_download () { PW_DOWNLOAD_FILE_NAME="$(basename $1)" set -o pipefail - wget -O "$2" --read-timeout 300 --retry-connrefused --timeout 4 --tries 2 --no-dns-cache --no-cache \ + wget -c -O "$2" --read-timeout 300 --retry-connrefused --timeout 3 --tries 2 --no-dns-cache --no-cache \ --user-agent="Mozilla/5.0 (compatible; Konqueror/2.1.1; X11)" "$1" 2>&1 | \ tr '\r' '\n' | sed -u 's/.* \([0-9]\+%\)\ \+\([0-9,.]\+.\) \(.*\)/\1\n#Downloading at \1\/, \2\/s, ETA \3/; s/^20[0-9][0-9].*/#Done./' | \ zenity --progress --percentage=0 --title="Download ${PW_DOWNLOAD_FILE_NAME}" --text=Starting... --auto-close --width=500 --height=90 if [ "${PIPESTATUS[0]}" != 0 ] ; then print_error "Failed to download ${PW_DOWNLOAD_FILE_NAME} from GitHub." print_info "Try download ${PW_DOWNLOAD_FILE_NAME} from FTP" - try_remove_file "$2" - wget -O "$2" --read-timeout 300 --retry-connrefused --timeout 4 --tries 2 --no-dns-cache --no-cache \ + wget -c -O "$2" --read-timeout 300 --retry-connrefused --timeout 3 --tries 2 --no-dns-cache --no-cache \ --user-agent="Mozilla/5.0 (compatible; Konqueror/2.1.1; X11)" --ftp-user=anonymous "ftp://171.22.215.18/archives/${PW_DOWNLOAD_FILE_NAME}" 2>&1 | \ tr '\r' '\n' | sed -u 's/.* \([0-9]\+%\)\ \+\([0-9,.]\+.\) \(.*\)/\1\n#Downloading at \1\/, \2\/s, ETA \3/; s/^20[0-9][0-9].*/#Done./' | \ zenity --progress --percentage=0 --title="Try download ${PW_DOWNLOAD_FILE_NAME} from FTP" --text=Starting... --auto-close --width=500 --height=90 if [ "${PIPESTATUS[0]}" != 0 ] ; then print_error "Failed to download ${PW_DOWNLOAD_FILE_NAME} from FTP." - try_remove_file "$2" return 1 fi fi @@ -327,7 +327,7 @@ init_wine_ver () { if [[ ! -z `echo "${PW_WINE_USE}" | grep "^PROTON_LG$"` ]] then export PW_WINE_USE="${PW_PROTON_LG_VER}" elif [[ ! -z `echo "${PW_WINE_USE}" | grep "^PROTON_GE$"` ]] - then export PW_WINE_USE="${PW_PROTON_GE_VER}" + then export PW_WINE_USE="${PW_WINE_LG_VER}" fi [ ! -z "${PW_WINE_VER}" ] && export PW_WINE_USE=`echo "${PW_WINE_VER}" | tr [[:lower:]] [[:upper:]]` [ ! -z "${PW_WINE_USE}" ] && export PW_WINE_USE=`echo "${PW_WINE_USE}" | tr [[:lower:]] [[:upper:]]` @@ -408,7 +408,7 @@ init_wine_ver () { pw_init_runtime () { - if [[ -n "$(grep "ROSA Fresh" "/etc/os-release")" ]] ; then + if [[ -n "$(grep -E '(ROSA Fresh|RED OS)' "/etc/os-release")" ]] ; then export LOCPATH="/run/host/usr/share/locale/" elif [[ -n "$(grep "altlinux" "/etc/os-release")" ]] ; then export LIBGL_DRIVERS_PATH="/usr/lib/X11/modules/dri:/usr/lib64/X11/modules/dri" @@ -624,12 +624,6 @@ stop_portwine () { export -f stop_portwine pw_download_libs () { - if [ ! -z "`ls ${PORT_WINE_TMP_PATH} | grep libs_v | grep -v libs${PW_LIBS_VER}`" ] ; then - for RM_LIBS in `ls ${PORT_WINE_TMP_PATH} | grep libs_v | grep -v libs${PW_LIBS_VER}` - do try_remove_dir "${PORT_WINE_TMP_PATH}/${RM_LIBS}" - done - pw_clear_pfx - fi if [[ ! -e "${PW_WINELIB}/portable/bin/yad" || ! -e "${PW_WINELIB}/portable/lib/p7zip/7z" \ || ! -e "${PW_WINELIB}/runtime/files/bin/vkcube" || -e "${PORT_WINE_TMP_PATH}/libs${PW_LIBS_VER}.tar.xz" ]] ; then @@ -637,13 +631,29 @@ pw_download_libs () { if try_download "github.com/Castro-Fidel/PortWINE/releases/download/libs${PW_LIBS_VER}/libs${PW_LIBS_VER}.tar.xz" "${PORT_WINE_TMP_PATH}/libs${PW_LIBS_VER}.tar.xz" ; then if unpack_tar_xz "${PORT_WINE_TMP_PATH}/libs${PW_LIBS_VER}.tar.xz" "${PORT_WINE_TMP_PATH}/" ; then try_remove_file "${PORT_WINE_TMP_PATH}/libs${PW_LIBS_VER}.tar.xz" + if [ ! -z "`ls ${PORT_WINE_TMP_PATH} | grep libs_v | grep -v libs${PW_LIBS_VER}`" ] ; then + for RM_LIBS in `ls ${PORT_WINE_TMP_PATH} | grep libs_v | grep -v libs${PW_LIBS_VER}` + do try_remove_dir "${PORT_WINE_TMP_PATH}/${RM_LIBS}" + done + pw_clear_pfx + fi else try_remove_dir "${PORT_WINE_TMP_PATH}/libs${PW_LIBS_VER}" try_remove_file "${PORT_WINE_TMP_PATH}/libs${PW_LIBS_VER}.tar.xz" - zenity_error_download && pw_download_libs + if zenity_error_download + then pw_download_libs + else + export PW_LIBS_VER="$(echo _v$(($(echo $PW_LIBS_VER | sed 's/_v//') - 1)))" + export PW_WINELIB="${PORT_WINE_TMP_PATH}/libs${PW_LIBS_VER}" + fi fi else - zenity_error_download && pw_download_libs + if zenity_error_download + then pw_download_libs + else + export PW_LIBS_VER="$(echo _v$(($(echo $PW_LIBS_VER | sed 's/_v//') - 1)))" + export PW_WINELIB="${PORT_WINE_TMP_PATH}/libs${PW_LIBS_VER}" + fi fi fi export pw_yad="${PW_WINELIB}/portable/bin/yad" @@ -664,10 +674,10 @@ pw_check_and_download_wine () { if [[ "${PW_WINE_USE}" == "GET-OTHER-WINE" ]] ; then gui_proton_downloader fi - if [[ ! -z `echo "${PW_WINE_USE}" | grep "^PROTON_LG$"` ]] + if [[ $PW_WINE_USE == PROTON_LG ]] then export PW_WINE_USE="${PW_PROTON_LG_VER}" - elif [[ ! -z `echo "${PW_WINE_USE}" | grep "^PROTON_GE$"` ]] - then export PW_WINE_USE="${PW_PROTON_GE_VER}" + elif [[ PW_WINE_USE == WINE_*_LG ]] + then export PW_WINE_USE="${PW_WINE_LG_VER}" fi if [ ! -d "${PORT_WINE_PATH}/data/dist/${PW_WINE_USE}" ] ; then print_info "Download and install ${PW_WINE_USE}..." @@ -681,10 +691,10 @@ pw_check_and_download_wine () { try_remove_dir "${PORT_WINE_PATH}/data/tmp/${PW_WINE_USE}" try_remove_dir "${PORT_WINE_PATH}/data/dist/${PW_WINE_USE}" - zenity_error_download && pw_check_and_download_wine + zenity_error_download && pw_check_and_download_wine || exit 1 fi else - zenity_error_download && pw_check_and_download_wine + zenity_error_download && pw_check_and_download_wine || exit 1 fi fi return 0 @@ -702,7 +712,7 @@ pw_check_and_download_dxvk_and_vkd3d () { try_remove_file "${PW_VULKAN_DIR}/dxvk-${DXVK_VAR_VER}.tar.xz" try_remove_dir dxvk-${DXVK_VAR_VER} - zenity_error_download && pw_check_and_download_dxvk_and_vkd3d + zenity_error_download && pw_check_and_download_dxvk_and_vkd3d || exit 1 fi elif try_download "https://github.com/doitsujin/dxvk/releases/download/v${DXVK_VAR_VER}/dxvk-${DXVK_VAR_VER}.tar.gz" "${PW_VULKAN_DIR}/dxvk-${DXVK_VAR_VER}.tar.gz" ; then if unpack_tar_gz "${PW_VULKAN_DIR}/dxvk-${DXVK_VAR_VER}.tar.gz" "${PW_VULKAN_DIR}" ; then @@ -711,10 +721,10 @@ pw_check_and_download_dxvk_and_vkd3d () { try_remove_file "${PW_VULKAN_DIR}/dxvk-${DXVK_VAR_VER}.tar.gz" try_remove_dir dxvk-${DXVK_VAR_VER} - zenity_error_download && pw_check_and_download_dxvk_and_vkd3d + zenity_error_download && pw_check_and_download_dxvk_and_vkd3d || exit 1 fi else - zenity_error_download && pw_check_and_download_dxvk_and_vkd3d + zenity_error_download && pw_check_and_download_dxvk_and_vkd3d || exit 1 fi fi done @@ -730,7 +740,7 @@ pw_check_and_download_dxvk_and_vkd3d () { try_remove_file "${PW_VULKAN_DIR}/vkd3d-proton-${VKD3D_VAR_VER}.tar.xz" try_remove_dir vkd3d-proton-${VKD3D_VAR_VER} - zenity_error_download && pw_check_and_download_dxvk_and_vkd3d + zenity_error_download && pw_check_and_download_dxvk_and_vkd3d || exit 1 fi elif try_download "https://github.com/HansKristian-Work/vkd3d-proton/releases/download/v${VKD3D_VAR_VER}/vkd3d-proton-${VKD3D_VAR_VER}.tar.zst" "${PW_VULKAN_DIR}/vkd3d-proton-${VKD3D_VAR_VER}.tar.zst" ; then if unpack_tar_zst "${PW_VULKAN_DIR}/vkd3d-proton-${VKD3D_VAR_VER}.tar.zst" "${PW_VULKAN_DIR}" ; then @@ -739,10 +749,10 @@ pw_check_and_download_dxvk_and_vkd3d () { try_remove_file "${PW_VULKAN_DIR}/vkd3d-proton-${VKD3D_VAR_VER}.tar.zst" try_remove_dir vkd3d-proton-${VKD3D_VAR_VER} - zenity_error_download && pw_check_and_download_dxvk_and_vkd3d + zenity_error_download && pw_check_and_download_dxvk_and_vkd3d || exit 1 fi else - zenity_error_download && pw_check_and_download_dxvk_and_vkd3d + zenity_error_download && pw_check_and_download_dxvk_and_vkd3d || exit 1 fi fi done @@ -757,10 +767,10 @@ pw_check_and_download_dxvk_and_vkd3d () { try_remove_file "${PW_VULKAN_DIR}/d8vk-${D8VK_VER}.tar.xz" try_remove_dir "d8vk-${D8VK_VER}" - zenity_error_download && pw_check_and_download_dxvk_and_vkd3d + zenity_error_download && pw_check_and_download_dxvk_and_vkd3d || exit 1 fi else - zenity_error_download && pw_check_and_download_dxvk_and_vkd3d + zenity_error_download && pw_check_and_download_dxvk_and_vkd3d || exit 1 fi fi @@ -768,45 +778,57 @@ pw_check_and_download_dxvk_and_vkd3d () { } pw_check_and_download_plugins () { - if [ ! -z "`ls ${PORT_WINE_TMP_PATH} | grep plugins_v | grep -v plugins${PW_PLUGINS_VER}`" ] ; then - for RM_PLUGINS in `ls ${PORT_WINE_TMP_PATH} | grep plugins_v | grep -v plugins${PW_PLUGINS_VER}` - do try_remove_dir "${PORT_WINE_TMP_PATH}/${RM_PLUGINS}" - done - fi if [[ ! -d "${PW_PLUGINS_PATH}/fake_dlss" ]] || [[ ! -d "${PW_PLUGINS_PATH}/nvapi" ]] ; then print_info "Download and install plugins${PW_PLUGINS_VER}..." if try_download "github.com/Castro-Fidel/wine_builds/releases/download/plugins${PW_PLUGINS_VER}/plugins${PW_PLUGINS_VER}.tar.xz" "${PORT_WINE_TMP_PATH}/plugins${PW_PLUGINS_VER}.tar.xz" ; then if unpack_tar_xz "${PORT_WINE_TMP_PATH}/plugins${PW_PLUGINS_VER}.tar.xz" "${PORT_WINE_TMP_PATH}" ; then try_remove_file "${PORT_WINE_TMP_PATH}/plugins${PW_PLUGINS_VER}.tar.xz" + if [ ! -z "`ls ${PORT_WINE_TMP_PATH} | grep plugins_v | grep -v plugins${PW_PLUGINS_VER}`" ] ; then + for RM_PLUGINS in `ls ${PORT_WINE_TMP_PATH} | grep plugins_v | grep -v plugins${PW_PLUGINS_VER}` + do try_remove_dir "${PORT_WINE_TMP_PATH}/${RM_PLUGINS}" + done + fi else try_remove_file "${PORT_WINE_TMP_PATH}/plugins${PW_PLUGINS_VER}.tar.xz" try_remove_dir "${PORT_WINE_TMP_PATH}/plugins${PW_PLUGINS_VER}" - - zenity_error_download && pw_check_and_download_wine + if zenity_error_download + then pw_check_and_download_plugins + else + export PW_PLUGINS_VER="$(echo _v$(($(echo $PW_PLUGINS_VER | sed 's/_v//') - 1)))" + export PW_PLUGINS_PATH="${PORT_WINE_TMP_PATH}/plugins${PW_PLUGINS_VER}" + fi fi else - zenity_error_download && pw_check_and_download_wine + if zenity_error_download + then pw_check_and_download_plugins + else + export PW_PLUGINS_VER="$(echo _v$(($(echo $PW_PLUGINS_VER | sed 's/_v//') - 1)))" + export PW_PLUGINS_PATH="${PORT_WINE_TMP_PATH}/plugins${PW_PLUGINS_VER}" + fi fi fi return 0 } -nvidia_check_rtx () { - lspci_output=$(lspci | grep VGA) - if echo "$lspci_output" | grep -i "nvidia" ; then +check_nvidia_rtx () { + if echo "$LSPCI_VGA" | grep -i "nvidia" ; then # Turing (without nvidia 16XX) - nv_arch=$(echo "$lspci_output" | sed -rn 's/.*(TU[0-9]*).*/\1/p') - [[ $nv_arch == TU[0-9]* ]] && [[ $nv_arch != TU11[6-7]* ]] && return 0 + [[ "$LSPCI_VGA" == *TU[0-9]* ]] && [[ "$LSPCI_VGA" != *TU11[6-7]* ]] && return 0 # Ampere - nv_arch=$(echo "$lspci_output" | sed -rn 's/.*(GA[0-9]*).*/\1/p') - [[ $nv_arch == GA[0-9]* ]] && return 0 + [[ "$LSPCI_VGA" == *GA[0-9]* ]] && return 0 # Ada_Lovelace - nv_arch=$(echo "$lspci_output" | sed -rn 's/.*(AD[0-9]*).*/\1/p') - [[ $nv_arch == AD[0-9]* ]] && return 0 + [[ "$LSPCI_VGA" == *AD[0-9]* ]] || [[ "$LSPCI_VGA" == *2[6-8][0-9]* ]] && return 0 fi return 1 } +check_hybrid_graphicks () { + if echo "$LSPCI_VGA" | grep -i nvidia | grep -iE '(intel|amd)' + then return 0 + else return 1 + fi +} + pw_init_db () { if [[ ! -z "${portwine_exe}" ]] ; then try_remove_file "${PORT_SCRIPTS_PATH}/portwine_db/setup" @@ -870,11 +892,12 @@ pw_init_db () { print_info "Automatic added fix for unity games: WINE_CPU_TOPOLOGY=8:0,1,2,3,4,5,6,7" fi - if nvidia_check_rtx ; then - export PW_USE_NVAPI_AND_DLSS=1 - export PW_USE_FAKE_DLSS=0 - export PW_USE_RAY_TRACING=1 + if check_nvidia_rtx ; then + check_variables PW_USE_NVAPI_AND_DLSS "1" + check_variables PW_USE_FAKE_DLSS "0" + check_variables PW_USE_RAY_TRACING "1" fi + check_hybrid_graphicks && check_variables PW_PRIME_RENDER_OFFLOAD "1" fi return 0 } @@ -950,7 +973,7 @@ pw_port_update () { exit 0 fi else - zenity_error_download && pw_port_update + zenity_error_download && pw_port_update || exit 1 fi ;; "${scripts_upd5}") echo " " ;; diff --git a/data_from_portwine/scripts/portwine_db/AC4BFSP b/data_from_portwine/scripts/portwine_db/AC4BFSP index b713b268..7fbe90ff 100755 --- a/data_from_portwine/scripts/portwine_db/AC4BFSP +++ b/data_from_portwine/scripts/portwine_db/AC4BFSP @@ -8,12 +8,10 @@ ##export PW_DLL_INSTALL="vcrun2017" # Install DDL in port prefix (used winetricks) ##export WINEDLLOVERRIDES="blabla=n,b" ##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')" # Additional launch options -export PW_WINE_USE=PROTON_GE export PW_VULKAN_USE=1 export PW_USE_DXR10=0 ##export PW_DLSS_ON=1 export PW_VULKAN_NO_ASYNC=0 -export PW_USE_NVAPI_AND_DLSS=0 export PW_OLD_GL_STRING=0 export PW_HIDE_NVIDIA_GPU=0 export PW_FORCE_USE_VSYNC=0 diff --git a/data_from_portwine/scripts/portwine_db/ACIII b/data_from_portwine/scripts/portwine_db/ACIII index 609e3731..3eab423d 100755 --- a/data_from_portwine/scripts/portwine_db/ACIII +++ b/data_from_portwine/scripts/portwine_db/ACIII @@ -1,39 +1,8 @@ #!/usr/bin/env bash - #Author: xuser - #ACIII.exe - #ACLiberation.exe - #Rating=1-5 - ################################################ -# export PW_VULKAN_USE=dxvk +#Author: xuser +#ACIII.exe +#ACLiberation.exe +#Rating=1-5 #####################examples########################### -##export PW_COMMENT_DB="blablabla" -##export PW_DXVK_VER=1.8.1 -##export PW_VKD3D_VER=2.2 export WINEDLLOVERRIDES="xinput1_3,d3dcompiler_43=n,b" -##export PW_DLL_INSTALL="d3dcompiler_43" # Install DDL in port prefix (used winetricks) -##export PW_LOG=0 # Enable debug mode fo terminal -##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_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN -##export PW_USE_TERMINAL=0 # Force run in terminal -##export PW_OLD_GL_STRING=0 -##export PW_USE_NVAPI_AND_DLSS=0 -##export PW_VKD3D_FEATURE_LEVEL=0 -##export PW_NO_WRITE_WATCH=0 # Disable support for memory write watches in ntdll. This is a very dangerous hack and should only be applied if you have verified that the game can operate without write watches. This improves performance for some very specific games (e.g. CoreRT-based games). -##export PW_HIDE_NVIDIA_GPU=0 -##export PW_FORCE_USE_VSYNC=2 # Vsync: 0-FORCE_OFF, 1-FORCE_ON, 2-BY_DEFAULT -##export PW_WINEDBG_DISABLE=1 # Disabled WINEDBG -##export PW_USE_GAMEMODE=0 # Force disabele gamemod -##export PW_FORCE_LARGE_ADDRESS_AWARE=1 # Force Wine to enable the LARGE_ADDRESS_AWARE flag for all executables. Enabled by default. -##export PULSE_LATENCY_MSEC=60 # Fix crackling audio in games -##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')" # Additional launch options -##export PW_GUI_DISABLED_CS=1 # 1 = disabled GUI -##export VKD3D_CONFIG=force_bindless_texel_buffer,multi_queue,dxr -##export PW_WINDOWS_VER=10 # Set windows version 10, 7 or XP -##export PW_VIRTUAL_DESKTOP=1 -##export DXVK_HUD=fps,devinfo -##export PW_HEAP_DELAY_FREE=0 -##export PW_DXGI_FROM_DXVK=0 -##export WINEARCH=win32 # defaut = win64 -##export WINEPREFIX= -##add_in_start_portwine () { commands ; } + diff --git a/data_from_portwine/scripts/portwine_db/ALOTInstaller b/data_from_portwine/scripts/portwine_db/ALOTInstaller index c4af41d5..c011bb28 100755 --- a/data_from_portwine/scripts/portwine_db/ALOTInstaller +++ b/data_from_portwine/scripts/portwine_db/ALOTInstaller @@ -9,29 +9,4 @@ ##export WINEDLLOVERRIDES="blabla=n,b" ##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')" # Additional launch options export PW_VULKAN_USE=0 -##export PW_DXR_ON=1 -##export PW_DLSS_ON=1 -##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN -##export PW_USE_NVAPI_AND_DLSS=0 -##export PW_OLD_GL_STRING=1 -##export PW_HIDE_NVIDIA_GPU=1 -##export PW_FORCE_USE_VSYNC=0 # Vsync: 0-FORCE_OFF, 1-FORCE_ON, 2-BY_DEFAULT -##export PW_VIRTUAL_DESKTOP=1 -##export VKD3D_CONFIG=force_bindless_texel_buffer,multi_queue -##export ENABLE_VKBASALT=1 -##export PW_VKBASALT_EFFECTS="FakeHDR:cas" # Use Reshade in others games (dx9-12 to vulkan only) -##export PW_VKBASALT_FFX_CAS="0.75" # FidelityFX Contrast Adaptive Sharpening (min 0 - max 1) -##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=0 # Do not use eventfd-based in-process synchronization primitives -##export PW_USE_GSTREAMER=1 # 0 - disabled use winegstreamer -##export PULSE_LATENCY_MSEC=60 # Fix crackling audio in games -##export PW_NO_WRITE_WATCH=1 # Disable support for memory write watches in ntdll. This is a very dangerous hack and should only be applied if you have verified that the game can operate without write watches. This improves performance for some very specific games (e.g. CoreRT-based games). -##export PW_HEAP_DELAY_FREE=1 -##export PW_WINE_ALLOW_XIM=1 # Disable XIM support until libx11 >= 1.7 is widespread -##export WINEARCH=win32 # defaut = win64 -##export WINEPREFIX= -##export PW_WINEDBG_DISABLE=1 # Disabled WINEDBG -##export PW_USE_TERMINAL=1 # Force run in terminal -##export PW_GUI_DISABLED_CS=1 # 1 = disabled GUI -##export PATH_TO_GAME= -##add_in_start_portwine () { commands ; } + diff --git a/data_from_portwine/scripts/portwine_db/Anno4 b/data_from_portwine/scripts/portwine_db/Anno4 index f1b32de8..0edf97f9 100755 --- a/data_from_portwine/scripts/portwine_db/Anno4 +++ b/data_from_portwine/scripts/portwine_db/Anno4 @@ -11,7 +11,6 @@ export PW_COMMENT_DB="If after the first launch you see a black screen,\njust re export PW_VULKAN_USE=1 ##export PW_USE_DXR10=1 ##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN -##export PW_USE_NVAPI_AND_DLSS=0 ##export PW_OLD_GL_STRING=1 ##export PW_HIDE_NVIDIA_GPU=1 ##export PW_FORCE_USE_VSYNC=0 # Vsync: 0-FORCE_OFF, 1-FORCE_ON, 2-BY_DEFAULT diff --git a/data_from_portwine/scripts/portwine_db/AnomalyLauncher b/data_from_portwine/scripts/portwine_db/AnomalyLauncher index a1244918..27686b21 100755 --- a/data_from_portwine/scripts/portwine_db/AnomalyLauncher +++ b/data_from_portwine/scripts/portwine_db/AnomalyLauncher @@ -12,7 +12,6 @@ export PW_WINE_USE=PROTON_LG export PW_VULKAN_USE=1 export PW_USE_DXR10=0 export PW_VULKAN_NO_ASYNC=0 -export PW_USE_NVAPI_AND_DLSS=0 export PW_OLD_GL_STRING=0 export PW_HIDE_NVIDIA_GPU=0 export PW_FORCE_USE_VSYNC=0 diff --git a/data_from_portwine/scripts/portwine_db/Arthur b/data_from_portwine/scripts/portwine_db/Arthur index aa73fae2..5a403e9a 100755 --- a/data_from_portwine/scripts/portwine_db/Arthur +++ b/data_from_portwine/scripts/portwine_db/Arthur @@ -3,39 +3,7 @@ #Arthur.exe #Rating=1-5 ######################################################## -export PW_VULKAN_USE=dxvk +export PW_VULKAN_USE=2 #####################examples########################### -##export PW_COMMENT_DB="blablabla" -##export PW_WINDOWS_VER=10 # Set windows version 10, 7 or XP -##export PW_DLL_INSTALL="vcrun2017" # Install DDL in port prefix (used winetricks) -##export WINEDLLOVERRIDES="blabla=n,b" -##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')" # Additional launch options -##export PW_VULKAN_USE=dxvk # dxvk, vkd3d or 0 for OpenGL -##export PW_DXVK_VER=1.8.1 -##export PW_VKD3D_VER=2.2 -##export PW_USE_DXR10=1 -##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN -##export PW_USE_NVAPI_AND_DLSS=0 -##export PW_OLD_GL_STRING=1 -##export PW_HIDE_NVIDIA_GPU=1 -##export PW_FORCE_USE_VSYNC=0 # Vsync: 0-FORCE_OFF, 1-FORCE_ON, 2-BY_DEFAULT -##export PW_VKD3D_FEATURE_LEVEL=1 -##export PW_DXGI_FROM_DXVK=1 -##export PW_VIRTUAL_DESKTOP=1 -##export VKD3D_CONFIG=force_bindless_texel_buffer,multi_queue -##export ENABLE_VKBASALT=1 -##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 PULSE_LATENCY_MSEC=90 # Fix crackling audio in games -##export PW_USE_GAMEMODE=1 # Force disabele gamemod -##export PW_FORCE_LARGE_ADDRESS_AWARE=1 # Force Wine to enable the LARGE_ADDRESS_AWARE flag for all executables. Enabled by default. -##export PW_NO_WRITE_WATCH=1 # Disable support for memory write watches in ntdll. This is a very dangerous hack and should only be applied if you have verified that the game can operate without write watches. This improves performance for some very specific games (e.g. CoreRT-based games). -##export PW_HEAP_DELAY_FREE=1 -##export PW_WINE_ALLOW_XIM=1 # Disable XIM support until libx11 >= 1.7 is widespread -##export WINEARCH=win32 # defaut = win64 -##export WINEPREFIX= -##export PW_WINEDBG_DISABLE=1 # Disabled WINEDBG -##export PW_USE_TERMINAL=1 # Force run in terminal -##export PW_LOG=1 # Enable debug mode fo terminal -##export PW_GUI_DISABLED_CS=1 # 1 = disabled GUI -##add_in_start_portwine () { commands ; } + diff --git a/data_from_portwine/scripts/portwine_db/Battle.net_Launcher b/data_from_portwine/scripts/portwine_db/Battle.net_Launcher index f8af8f3e..f5f0cb95 100755 --- a/data_from_portwine/scripts/portwine_db/Battle.net_Launcher +++ b/data_from_portwine/scripts/portwine_db/Battle.net_Launcher @@ -5,8 +5,6 @@ #Battle.net.exe #Rating=5 ################################################ -#export PW_COMMENT_DB="We recommend using PROTON_GE + VULKAN!" -# export PW_WINE_USE=PROTON_GE export PW_VULKAN_USE=1 export LAUNCH_PARAMETERS="" export WINEDLLOVERRIDES="locationapi=" diff --git a/data_from_portwine/scripts/portwine_db/Biomutant b/data_from_portwine/scripts/portwine_db/Biomutant index 6c29a1f7..ab48c733 100755 --- a/data_from_portwine/scripts/portwine_db/Biomutant +++ b/data_from_portwine/scripts/portwine_db/Biomutant @@ -12,7 +12,6 @@ export PW_DLL_INSTALL="vcrun2019" # Install DDL in port prefix (us ##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')" # Additional launch options ##export PW_USE_DXR10=1 ##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN -##export PW_USE_NVAPI_AND_DLSS=0 ##export PW_OLD_GL_STRING=1 ##export PW_HIDE_NVIDIA_GPU=1 ##export PW_FORCE_USE_VSYNC=0 # Vsync: 0-FORCE_OFF, 1-FORCE_ON, 2-BY_DEFAULT diff --git a/data_from_portwine/scripts/portwine_db/BsgLauncher b/data_from_portwine/scripts/portwine_db/BsgLauncher index dc0e8172..f664bb00 100644 --- a/data_from_portwine/scripts/portwine_db/BsgLauncher +++ b/data_from_portwine/scripts/portwine_db/BsgLauncher @@ -7,56 +7,12 @@ #####################examples########################### ##export PW_COMMENT_DB="blablabla" export PW_WINDOWS_VER="10" -export PW_DLL_INSTALL="" -export WINEDLLOVERRIDES="" -export LAUNCH_PARAMETERS="" -export PW_WINE_USE="PROTON_LG" -export PW_VULKAN_USE="1" -export PW_USE_DXR10="0" -##export PW_DLSS_ON=1 -##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN -export PW_USE_NVAPI_AND_DLSS="0" -export PW_OLD_GL_STRING="0" -export PW_HIDE_NVIDIA_GPU="0" -##export PW_FORCE_USE_VSYNC=0 # Vsync: 0-FORCE_OFF, 1-FORCE_ON, 2-BY_DEFAULT -export PW_VIRTUAL_DESKTOP="0" -##export VKD3D_CONFIG=force_bindless_texel_buffer,multi_queue -export ENABLE_VKBASALT="0" -##export PW_VKBASALT_EFFECTS="FakeHDR:cas" # Use Reshade in others games (dx9-12 to vulkan only) -##export PW_VKBASALT_FFX_CAS="0.75" # FidelityFX Contrast Adaptive Sharpening (min 0 - max 1) export PW_NO_FSYNC="1" export PW_NO_ESYNC="1" -##export PW_USE_GSTREAMER=1 # 0 - disabled use winegstreamer -##export PULSE_LATENCY_MSEC=60 # Fix crackling audio in games -##export PW_NO_WRITE_WATCH=1 # Disable support for memory write watches in ntdll. This is a very dangerous hack and should only be applied if you have verified that the game can operate without write watches. This improves performance for some very specific games (e.g. CoreRT-based games). -##export PW_HEAP_DELAY_FREE=1 -##export PW_WINE_ALLOW_XIM=1 # Disable XIM support until libx11 >= 1.7 is widespread -##export WINEARCH=win32 # defaut = win64 -##export WINEPREFIX= -##export PW_WINEDBG_DISABLE=1 # Disabled WINEDBG -export PW_USE_TERMINAL="0" -export PW_GUI_DISABLED_CS="0" -##export PATH_TO_GAME= -##add_in_start_portwine () { commands ; } export PW_PREFIX_NAME="DOTNET" -export PW_MANGOHUD="0" -export PW_MANGOHUD_x32="0" -export PW_MANGOHUD_USER_CONF="0" -export PW_USE_DXR11="0" -export PW_USE_FAKE_DLSS="0" -export PW_WINE_FULLSCREEN_FSR="1" -export PW_USE_GAMEMODE="0" -export PW_DX12_DISABLE="0" -export PW_PRIME_RENDER_OFFLOAD="0" -export PW_USE_D3D_EXTRAS="1" -export PW_FIX_VIDEO_IN_GAME="0" -export PW_FORCE_LARGE_ADDRESS_AWARE="1" -export PW_USE_SHADER_CACHE="1" -export PW_USE_WINE_DXGI="0" -export MANGOHUD_CONFIG="cpu_stats,cpu_temp,cpu_mhz,cpu_color=2e97cb,cpu_text=CPU,gpu_stats,gpu_temp,gpu_core_clock,gpu_mem_clock,vulkan_driver,gpu_name,gpu_color=2e9762,gpu_text=GPU,vram,vram_color=ad64c1,ram,ram_color=c26693,io_color=a491d3,frame_timing=1,frametime_color=00ff00,time,arch,wine,wine_color=eb5b5b,engine_color=eb5b5b,background_alpha=0.2,font_size=48,background_color=020202,text_color=ffffff,toggle_hud=Shift_R+F12,resolution,vkbasalt" -add_in_start_portwine () { - if [[ ! -f "${PATH_TO_GAME}/dxvk.conf" ]] ; then - echo "d3d9.shaderModel = 1" > "${PATH_TO_GAME}/dxvk.conf" - fi -} +# add_in_start_portwine () { +# if [[ ! -f "${PATH_TO_GAME}/dxvk.conf" ]] ; then +# echo "d3d9.shaderModel = 1" > "${PATH_TO_GAME}/dxvk.conf" +# fi +# } diff --git a/data_from_portwine/scripts/portwine_db/Cinebench b/data_from_portwine/scripts/portwine_db/Cinebench index 60d8a931..f193353a 100755 --- a/data_from_portwine/scripts/portwine_db/Cinebench +++ b/data_from_portwine/scripts/portwine_db/Cinebench @@ -8,7 +8,6 @@ ##export PW_DLL_INSTALL="vcrun2017" # Install DDL in port prefix (used winetricks) ##export WINEDLLOVERRIDES="blabla=n,b" ##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')" # Additional launch options -export PW_WINE_USE=PROTON_GEC_PW2 export PW_VULKAN_USE=1 ##export PW_DXR_ON=1 ##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN diff --git a/data_from_portwine/scripts/portwine_db/Control_DX11 b/data_from_portwine/scripts/portwine_db/Control_DX11 index 6a80973b..6c5101bf 100755 --- a/data_from_portwine/scripts/portwine_db/Control_DX11 +++ b/data_from_portwine/scripts/portwine_db/Control_DX11 @@ -17,7 +17,6 @@ export PW_DLL_INSTALL="physx" ##export PW_VULKAN_USE=dxvk # dxvk, vkd3d or 0 for OpenGL ##export PW_USE_DXR10=1 ##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN -##export PW_USE_NVAPI_AND_DLSS=0 ##export PW_OLD_GL_STRING=1 ##export PW_HIDE_NVIDIA_GPU=1 ##export PW_FORCE_USE_VSYNC=0 # Vsync: 0-FORCE_OFF, 1-FORCE_ON, 2-BY_DEFAULT diff --git a/data_from_portwine/scripts/portwine_db/Control_DX12 b/data_from_portwine/scripts/portwine_db/Control_DX12 index f05b6d04..53998bb7 100755 --- a/data_from_portwine/scripts/portwine_db/Control_DX12 +++ b/data_from_portwine/scripts/portwine_db/Control_DX12 @@ -17,7 +17,6 @@ export WINEDLLOVERRIDES="d3d12,d3d_rmdwin10_f,renderer_rmdwin10_f,apw_rmdwin10_f ##export PW_VULKAN_USE=dxvk # dxvk, vkd3d or 0 for OpenGL ##export PW_USE_DXR10=1 ##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN -##export PW_USE_NVAPI_AND_DLSS=0 ##export PW_OLD_GL_STRING=1 ##export PW_HIDE_NVIDIA_GPU=1 ##export PW_FORCE_USE_VSYNC=0 # Vsync: 0-FORCE_OFF, 1-FORCE_ON, 2-BY_DEFAULT diff --git a/data_from_portwine/scripts/portwine_db/Cyberpunk2077 b/data_from_portwine/scripts/portwine_db/Cyberpunk2077 index f3f3e0cd..2f507707 100755 --- a/data_from_portwine/scripts/portwine_db/Cyberpunk2077 +++ b/data_from_portwine/scripts/portwine_db/Cyberpunk2077 @@ -3,33 +3,9 @@ #Cyberpunk2077.exe #Rating=1-5 #####################examples########################### -export PW_VULKAN_USE=1 -##export PW_COMMENT_DB="blablabla" export WINEDLLOVERRIDES="Crash*,REDEngineErrorReporter.exe=" -##export PW_DLL_INSTALL="d3dcompiler_47" # Install DDL in port prefix (used winetricks) -##export PW_LOG=0 # Enable debug mode fo terminal -##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_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN -##export PW_USE_TERMINAL=0 # Force run in terminal -##export PW_OLD_GL_STRING=0 -##export PW_USE_NVAPI_AND_DLSS=0 -##export PW_VKD3D_FEATURE_LEVEL=1 -##export PW_NO_WRITE_WATCH=0 # Disable support for memory write watches in ntdll. This is a very dangerous hack and should only be applied if you have verified that the game can operate without write watches. This improves performance for some very specific games (e.g. CoreRT-based games). -##export PW_HIDE_NVIDIA_GPU=0 -##export PW_FORCE_USE_VSYNC=0 # Vsync: 0-FORCE_OFF, 1-FORCE_ON, 2-BY_DEFAULT -##export PW_WINEDBG_DISABLE=1 # Disabled WINEDBG -##export PW_USE_GAMEMODE=1 # Force disabele gamemod -##export PW_FORCE_LARGE_ADDRESS_AWARE=1 # Force Wine to enable the LARGE_ADDRESS_AWARE flag for all executables. Enabled by default. export PULSE_LATENCY_MSEC=40 # Fix crackling audio in games export LAUNCH_PARAMETERS=("--launcher-skip") # Additional launch options -##export PW_GUI_DISABLED_CS=1 # 1 = disabled GUI export VKD3D_CONFIG=force_bindless_texel_buffer,multi_queue export PW_WINDOWS_VER=10 # Set windows version 10, 7 or XP -##export PW_VIRTUAL_DESKTOP=1 -##export DXVK_HUD=fps,devinfo -export PW_HEAP_DELAY_FREE=0 -##export PW_DXGI_FROM_DXVK=0 -##export WINEARCH=win32 # defaut = win64 -##export WINEPREFIX= -#add_in_start_portwine () { "${pw_runtime}" "$WINESERVER" -w } + diff --git a/data_from_portwine/scripts/portwine_db/DAOriginsLauncher b/data_from_portwine/scripts/portwine_db/DAOriginsLauncher index 7c778341..deca4140 100755 --- a/data_from_portwine/scripts/portwine_db/DAOriginsLauncher +++ b/data_from_portwine/scripts/portwine_db/DAOriginsLauncher @@ -8,12 +8,10 @@ ##export PW_DLL_INSTALL="vcrun2017" # Install DDL in port prefix (used winetricks) ##export WINEDLLOVERRIDES="blabla=n,b" ##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')" # Additional launch options -export PW_WINE_USE=PROTON_GE export PW_VULKAN_USE=1 export PW_DXR_ON=0 ##export PW_DLSS_ON=1 export PW_VULKAN_NO_ASYNC=0 -export PW_USE_NVAPI_AND_DLSS=0 export PW_OLD_GL_STRING=0 export PW_HIDE_NVIDIA_GPU=0 export PW_FORCE_USE_VSYNC=0 diff --git a/data_from_portwine/scripts/portwine_db/DOOM Eternal b/data_from_portwine/scripts/portwine_db/DOOM Eternal index 5d80ad54..55e790e3 100755 --- a/data_from_portwine/scripts/portwine_db/DOOM Eternal +++ b/data_from_portwine/scripts/portwine_db/DOOM Eternal @@ -11,7 +11,6 @@ export PW_NO_ESYNC=1 # Do not use eventfd-based in-process synchronizatio #export PW_VULKAN_NO_ASYNC=1 #export PW_USE_TERMINAL=1 #export PW_OLD_GL_STRING=0 -#export PW_USE_NVAPI_AND_DLSS=0 #export PW_VKD3D_FEATURE_LEVEL=0 #export PW_NO_WRITE_WATCH=0 # Disable support for memory write watches in ntdll. This is a very dangerous hack and should only be applied if you have verified that the game can operate without write watches. This improves performance for some very specific games (e.g. CoreRT-based games). #export PW_HIDE_NVIDIA_GPU=0 diff --git a/data_from_portwine/scripts/portwine_db/DXHRDC b/data_from_portwine/scripts/portwine_db/DXHRDC index 5fd21f33..5100616f 100755 --- a/data_from_portwine/scripts/portwine_db/DXHRDC +++ b/data_from_portwine/scripts/portwine_db/DXHRDC @@ -10,12 +10,10 @@ ##export PW_DLL_INSTALL="vcrun2017" # Install DDL in port prefix (used winetricks) export WINEDLLOVERRIDES="WINMM=n,b" ##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')" # Additional launch options -export PW_WINE_USE=PROTON_GE export PW_VULKAN_USE=1 ##export PW_USE_DXR10=1 ##export PW_DLSS_ON=1 ##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN -##export PW_USE_NVAPI_AND_DLSS=0 ##export PW_OLD_GL_STRING=1 ##export PW_HIDE_NVIDIA_GPU=1 ##export PW_FORCE_USE_VSYNC=0 # Vsync: 0-FORCE_OFF, 1-FORCE_ON, 2-BY_DEFAULT diff --git a/data_from_portwine/scripts/portwine_db/DaysGone b/data_from_portwine/scripts/portwine_db/DaysGone index da8eb182..83bd0c91 100755 --- a/data_from_portwine/scripts/portwine_db/DaysGone +++ b/data_from_portwine/scripts/portwine_db/DaysGone @@ -12,7 +12,6 @@ export PW_DLL_INSTALL="vcrun2019" # Install DDL in port prefix (us ##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')" # Additional launch options ##export PW_USE_DXR10=1 ##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN -##export PW_USE_NVAPI_AND_DLSS=0 ##export PW_OLD_GL_STRING=1 ##export PW_HIDE_NVIDIA_GPU=1 ##export PW_FORCE_USE_VSYNC=0 # Vsync: 0-FORCE_OFF, 1-FORCE_ON, 2-BY_DEFAULT diff --git a/data_from_portwine/scripts/portwine_db/Deponia b/data_from_portwine/scripts/portwine_db/Deponia index 42d5cdb4..b0a1371f 100755 --- a/data_from_portwine/scripts/portwine_db/Deponia +++ b/data_from_portwine/scripts/portwine_db/Deponia @@ -8,12 +8,10 @@ ##export PW_DLL_INSTALL="vcrun2017" # Install DDL in port prefix (used winetricks) ##export WINEDLLOVERRIDES="blabla=n,b" ##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')" # Additional launch options -export PW_WINE_USE=PROTON_GEC_PW2 export PW_VULKAN_USE=0 ##export PW_USE_DXR10=1 ##export PW_DLSS_ON=1 ##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN -##export PW_USE_NVAPI_AND_DLSS=0 ##export PW_OLD_GL_STRING=1 ##export PW_HIDE_NVIDIA_GPU=1 ##export PW_FORCE_USE_VSYNC=0 # Vsync: 0-FORCE_OFF, 1-FORCE_ON, 2-BY_DEFAULT diff --git a/data_from_portwine/scripts/portwine_db/Diablo_II b/data_from_portwine/scripts/portwine_db/Diablo_II index 807785a1..24c9498a 100755 --- a/data_from_portwine/scripts/portwine_db/Diablo_II +++ b/data_from_portwine/scripts/portwine_db/Diablo_II @@ -14,7 +14,6 @@ export PW_VULKAN_USE=0 ##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN ##export PW_USE_TERMINAL=0 # Force run in terminal ##export PW_OLD_GL_STRING=0 -##export PW_USE_NVAPI_AND_DLSS=0 ##export PW_VKD3D_FEATURE_LEVEL=0 ##export PW_NO_WRITE_WATCH=0 # Disable support for memory write watches in ntdll. This is a very dangerous hack and should only be applied if you have verified that the game can operate without write watches. This improves performance for some very specific games (e.g. CoreRT-based games). ##export PW_HIDE_NVIDIA_GPU=0 diff --git a/data_from_portwine/scripts/portwine_db/Dolphin b/data_from_portwine/scripts/portwine_db/Dolphin index 6449a28e..f25c9132 100755 --- a/data_from_portwine/scripts/portwine_db/Dolphin +++ b/data_from_portwine/scripts/portwine_db/Dolphin @@ -13,7 +13,6 @@ export PW_VULKAN_USE=1 ##export PW_USE_DXR10=1 ##export PW_DLSS_ON=1 ##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN -##export PW_USE_NVAPI_AND_DLSS=0 ##export PW_OLD_GL_STRING=1 ##export PW_HIDE_NVIDIA_GPU=1 ##export PW_FORCE_USE_VSYNC=0 # Vsync: 0-FORCE_OFF, 1-FORCE_ON, 2-BY_DEFAULT diff --git a/data_from_portwine/scripts/portwine_db/EoCApp b/data_from_portwine/scripts/portwine_db/EoCApp index 30c919ce..dd6bef78 100755 --- a/data_from_portwine/scripts/portwine_db/EoCApp +++ b/data_from_portwine/scripts/portwine_db/EoCApp @@ -8,7 +8,6 @@ ##export PW_DLL_INSTALL="vcrun2017" # Install DDL in port prefix (used winetricks) ##export WINEDLLOVERRIDES="blabla=n,b" ##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')" # Additional launch options -export PW_WINE_USE=PROTON_GE export PW_VULKAN_USE=dxvk export PW_DXR_ON=0 export PW_VULKAN_NO_ASYNC=0 diff --git a/data_from_portwine/scripts/portwine_db/EpicGamesLauncher b/data_from_portwine/scripts/portwine_db/EpicGamesLauncher index 7fb0035d..7ae068ee 100755 --- a/data_from_portwine/scripts/portwine_db/EpicGamesLauncher +++ b/data_from_portwine/scripts/portwine_db/EpicGamesLauncher @@ -4,7 +4,6 @@ #Rating=5 ############################################## #export PW_COMMENT_DB="PortWINE database file for Epic Games Launcher" -# export PW_WINE_USE=PROTON_GE export PW_VULKAN_USE=1 export LAUNCH_PARAMETERS="-SkipBuildPatchPrereq" export PW_DLL_INSTALL="vcrun2012 vcrun2013 vcrun2019" diff --git a/data_from_portwine/scripts/portwine_db/FL64 b/data_from_portwine/scripts/portwine_db/FL64 index b4b48dbf..96419740 100755 --- a/data_from_portwine/scripts/portwine_db/FL64 +++ b/data_from_portwine/scripts/portwine_db/FL64 @@ -15,7 +15,6 @@ export WINEDLLOVERRIDES="FLEngine,FLEngine_x64=n" ##export PW_VKD3D_VER=2.2 ##export PW_USE_DXR10=1 ##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN -##export PW_USE_NVAPI_AND_DLSS=0 ##export PW_OLD_GL_STRING=0 ##export PW_HIDE_NVIDIA_GPU=0 ##export PW_FORCE_USE_VSYNC=2 # Vsync: 0-FORCE_OFF, 1-FORCE_ON, 2-BY_DEFAULT diff --git a/data_from_portwine/scripts/portwine_db/Far Cry 1 b/data_from_portwine/scripts/portwine_db/Far Cry 1 index bb8ae2ae..f5507f35 100755 --- a/data_from_portwine/scripts/portwine_db/Far Cry 1 +++ b/data_from_portwine/scripts/portwine_db/Far Cry 1 @@ -11,7 +11,6 @@ export PW_NO_ESYNC=1 # Do not use eventfd-based in-process synchronizatio export PW_DXVK_ASYNC=0 #export PW_USE_TERMINAL=0 export PW_OLD_GL_STRING=1 -#export PW_USE_NVAPI_AND_DLSS=0 #export PW_NO_WRITE_WATCH=0 # Disable support for memory write watches in ntdll. This is a very dangerous hack and should only be applied if you have verified that the game can operate without write watches. This improves performance for some very specific games (e.g. CoreRT-based games). #export PW_HIDE_NVIDIA_GPU=0 #export PW_FORCE_USE_VSYNC=2 # Vsync: 0-FORCE_OFF, 1-FORCE_ON, 2-BY_DEFAULT diff --git a/data_from_portwine/scripts/portwine_db/FarCry6 b/data_from_portwine/scripts/portwine_db/FarCry6 index 93d9c048..f157b4d6 100755 --- a/data_from_portwine/scripts/portwine_db/FarCry6 +++ b/data_from_portwine/scripts/portwine_db/FarCry6 @@ -3,36 +3,5 @@ #FarCry6.exe #Rating=1-5 #####################examples########################### -##export PW_COMMENT_DB="blablabla" -##export PW_WINDOWS_VER=10 # Set windows version 10, 7 or XP -##export PW_DLL_INSTALL="vcrun2017" # Install DDL in port prefix (used winetricks) -##export WINEDLLOVERRIDES="blabla=n,b" -##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')" # Additional launch options export VK_FORMAT_A8_UNORM=1 -export PW_VULKAN_USE=1 -export PW_DXR_ON=0 -##export PW_DLSS_ON=1 -export PW_VULKAN_NO_ASYNC=0 -export PW_USE_NVAPI_AND_DLSS=0 -export PW_OLD_GL_STRING=0 -export PW_HIDE_NVIDIA_GPU=0 -export PW_FORCE_USE_VSYNC=0 -export PW_VIRTUAL_DESKTOP=0 -##export VKD3D_CONFIG=force_bindless_texel_buffer,multi_queue -export ENABLE_VKBASALT=1 -##export PW_VKBASALT_EFFECTS="FakeHDR:cas" # Use Reshade in others games (dx9-12 to vulkan only) -##export PW_VKBASALT_FFX_CAS="0.75" # FidelityFX Contrast Adaptive Sharpening (min 0 - max 1) -export PW_NO_FSYNC=0 -export PW_NO_ESYNC=1 -export PW_USE_GSTREAMER=1 -##export PULSE_LATENCY_MSEC=60 # Fix crackling audio in games -export PW_NO_WRITE_WATCH=0 -export PW_HEAP_DELAY_FREE=0 -export PW_WINE_ALLOW_XIM=0 -##export WINEARCH=win32 # defaut = win64 -##export WINEPREFIX= -export PW_WINEDBG_DISABLE=1 -export PW_USE_TERMINAL=0 -export PW_GUI_DISABLED_CS=0 -##export PATH_TO_GAME= -##add_in_start_portwine () { commands ; } + diff --git a/data_from_portwine/scripts/portwine_db/FarLoneSails b/data_from_portwine/scripts/portwine_db/FarLoneSails index 8a0959bb..16fdd5cd 100755 --- a/data_from_portwine/scripts/portwine_db/FarLoneSails +++ b/data_from_portwine/scripts/portwine_db/FarLoneSails @@ -14,7 +14,6 @@ ##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN ##export PW_USE_TERMINAL=0 # Force run in terminal ##export PW_OLD_GL_STRING=0 -##export PW_USE_NVAPI_AND_DLSS=0 ##export PW_VKD3D_FEATURE_LEVEL=0 ##export PW_NO_WRITE_WATCH=0 # Disable support for memory write watches in ntdll. This is a very dangerous hack and should only be applied if you have verified that the game can operate without write watches. This improves performance for some very specific games (e.g. CoreRT-based games). ##export PW_HIDE_NVIDIA_GPU=0 diff --git a/data_from_portwine/scripts/portwine_db/Far_Cry_3_d3d11 b/data_from_portwine/scripts/portwine_db/Far_Cry_3_d3d11 index 29568124..50c2b595 100755 --- a/data_from_portwine/scripts/portwine_db/Far_Cry_3_d3d11 +++ b/data_from_portwine/scripts/portwine_db/Far_Cry_3_d3d11 @@ -15,7 +15,6 @@ export PW_DLL_INSTALL="d3dx11_42 d3dx11_43" ##export PW_VULKAN_USE=dxvk # dxvk, vkd3d or 0 for OpenGL ##export PW_USE_DXR10=1 ##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN -##export PW_USE_NVAPI_AND_DLSS=0 ##export PW_OLD_GL_STRING=1 ##export PW_HIDE_NVIDIA_GPU=1 ##export PW_FORCE_USE_VSYNC=0 # Vsync: 0-FORCE_OFF, 1-FORCE_ON, 2-BY_DEFAULT diff --git a/data_from_portwine/scripts/portwine_db/Far_Cry_3_d3d9 b/data_from_portwine/scripts/portwine_db/Far_Cry_3_d3d9 index 809101d3..be409502 100755 --- a/data_from_portwine/scripts/portwine_db/Far_Cry_3_d3d9 +++ b/data_from_portwine/scripts/portwine_db/Far_Cry_3_d3d9 @@ -15,7 +15,6 @@ export PW_VULKAN_USE=0 ##export PW_VULKAN_USE=dxvk # dxvk, vkd3d or 0 for OpenGL ##export PW_USE_DXR10=1 ##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN -##export PW_USE_NVAPI_AND_DLSS=0 ##export PW_OLD_GL_STRING=1 ##export PW_HIDE_NVIDIA_GPU=1 ##export PW_FORCE_USE_VSYNC=0 # Vsync: 0-FORCE_OFF, 1-FORCE_ON, 2-BY_DEFAULT diff --git a/data_from_portwine/scripts/portwine_db/Far_Cry_4 b/data_from_portwine/scripts/portwine_db/Far_Cry_4 index 6c02a901..ea6f21e6 100755 --- a/data_from_portwine/scripts/portwine_db/Far_Cry_4 +++ b/data_from_portwine/scripts/portwine_db/Far_Cry_4 @@ -13,7 +13,6 @@ export PW_DLL_INSTALL="d3dcompiler_43 d3dcompiler_47" # Install DD ##export PW_VULKAN_USE=dxvk # dxvk, vkd3d or 0 for OpenGL ##export PW_USE_DXR10=1 ##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN -##export PW_USE_NVAPI_AND_DLSS=0 ##export PW_OLD_GL_STRING=1 ##export PW_HIDE_NVIDIA_GPU=1 ##export PW_FORCE_USE_VSYNC=0 # Vsync: 0-FORCE_OFF, 1-FORCE_ON, 2-BY_DEFAULT diff --git a/data_from_portwine/scripts/portwine_db/Forsaken_World b/data_from_portwine/scripts/portwine_db/Forsaken_World index 27886540..5596476c 100755 --- a/data_from_portwine/scripts/portwine_db/Forsaken_World +++ b/data_from_portwine/scripts/portwine_db/Forsaken_World @@ -13,7 +13,6 @@ export PW_VULKAN_USE="1" export PW_USE_DXR10="0" ##export PW_DLSS_ON=1 ##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN -export PW_USE_NVAPI_AND_DLSS="0" export PW_OLD_GL_STRING="0" export PW_HIDE_NVIDIA_GPU="0" export PW_FORCE_USE_VSYNC="0" @@ -41,7 +40,6 @@ export PW_USE_DXR11="0" export PW_WINE_FULLSCREEN_FSR="0" export PW_USE_GAMEMODE="1" export PW_DX12_DISABLE="0" -export PW_PRIME_RENDER_OFFLOAD="0" export PW_USE_D3D_EXTRAS="1" export PW_FIX_VIDEO_IN_GAME="0" export PW_USE_AMDVLK_DRIVER="0" diff --git a/data_from_portwine/scripts/portwine_db/GoW b/data_from_portwine/scripts/portwine_db/GoW index f7d76889..bd5b13f2 100755 --- a/data_from_portwine/scripts/portwine_db/GoW +++ b/data_from_portwine/scripts/portwine_db/GoW @@ -13,7 +13,6 @@ export PW_VULKAN_USE=1 export PW_USE_DXR10=0 ##export PW_DLSS_ON=1 export PW_VULKAN_NO_ASYNC=0 -export PW_USE_NVAPI_AND_DLSS=1 export PW_OLD_GL_STRING=0 export PW_HIDE_NVIDIA_GPU=0 export PW_FORCE_USE_VSYNC=0 diff --git a/data_from_portwine/scripts/portwine_db/HITMAN3 b/data_from_portwine/scripts/portwine_db/HITMAN3 index f7f2e29a..3167ae26 100755 --- a/data_from_portwine/scripts/portwine_db/HITMAN3 +++ b/data_from_portwine/scripts/portwine_db/HITMAN3 @@ -7,4 +7,3 @@ export PW_VULKAN_USE=vkd3d export LAUNCH_PARAMETERS="" export PW_DXGI_FROM_DXVK=1 #export MANGOHUD=1 -#export PW_USE_NVAPI_AND_DLSS=0 # for nvidia gpu diff --git a/data_from_portwine/scripts/portwine_db/Hades b/data_from_portwine/scripts/portwine_db/Hades index 6a3e6a0f..cb84d2f9 100755 --- a/data_from_portwine/scripts/portwine_db/Hades +++ b/data_from_portwine/scripts/portwine_db/Hades @@ -12,7 +12,6 @@ export PW_VULKAN_USE=dxvk #dxvk or vkd3d #export PW_VULKAN_NO_ASYNC=1 #export PW_USE_TERMINAL=0 #export PW_OLD_GL_STRING=0 -#export PW_USE_NVAPI_AND_DLSS=0 #export PW_VKD3D_FEATURE_LEVEL=0 #export PW_NO_WRITE_WATCH=0 # Disable support for memory write watches in ntdll. This is a very dangerous hack and should only be applied if you have verified that the game can operate without write watches. This improves performance for some very specific games (e.g. CoreRT-based games). #export PW_HIDE_NVIDIA_GPU=0 diff --git a/data_from_portwine/scripts/portwine_db/Half-Life2 b/data_from_portwine/scripts/portwine_db/Half-Life2 index 91247541..cfe7fe10 100755 --- a/data_from_portwine/scripts/portwine_db/Half-Life2 +++ b/data_from_portwine/scripts/portwine_db/Half-Life2 @@ -13,7 +13,6 @@ export PW_VULKAN_USE=1 ##export PW_DXR_ON=1 ##export PW_DLSS_ON=1 ##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN -##export PW_USE_NVAPI_AND_DLSS=0 ##export PW_OLD_GL_STRING=1 ##export PW_HIDE_NVIDIA_GPU=1 ##export PW_FORCE_USE_VSYNC=0 # Vsync: 0-FORCE_OFF, 1-FORCE_ON, 2-BY_DEFAULT diff --git a/data_from_portwine/scripts/portwine_db/HogwartsLegacy b/data_from_portwine/scripts/portwine_db/HogwartsLegacy index 47a449a0..3dadd7ca 100644 --- a/data_from_portwine/scripts/portwine_db/HogwartsLegacy +++ b/data_from_portwine/scripts/portwine_db/HogwartsLegacy @@ -9,53 +9,7 @@ clearcpuid=514 в раздел GRUB_CMDLINE_LINUX_DEFAULT в файле /etc/default/grub. Для упрощения можно использовать утилиту Grub Customizer" fi -export PW_WINDOWS_VER="10" -export PW_DLL_INSTALL="" -export WINEDLLOVERRIDES="" -export LAUNCH_PARAMETERS="" -export PW_WINE_USE="PROTON_LG" export PW_VULKAN_USE="2" -export PW_USE_DXR10="0" -##export PW_DLSS_ON=1 -##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN -export PW_USE_NVAPI_AND_DLSS="0" -export PW_OLD_GL_STRING="0" -export PW_HIDE_NVIDIA_GPU="0" -##export PW_FORCE_USE_VSYNC=0 # Vsync: 0-FORCE_OFF, 1-FORCE_ON, 2-BY_DEFAULT -export PW_VIRTUAL_DESKTOP="0" -##export VKD3D_CONFIG=force_bindless_texel_buffer,multi_queue -export ENABLE_VKBASALT="0" -##export PW_VKBASALT_EFFECTS="FakeHDR:cas" # Use Reshade in others games (dx9-12 to vulkan only) -##export PW_VKBASALT_FFX_CAS="0.75" # FidelityFX Contrast Adaptive Sharpening (min 0 - max 1) -export PW_NO_FSYNC="0" -export PW_NO_ESYNC="1" -##export PW_USE_GSTREAMER=1 # 0 - disabled use winegstreamer -##export PULSE_LATENCY_MSEC=60 # Fix crackling audio in games -##export PW_NO_WRITE_WATCH=1 # Disable support for memory write watches in ntdll. This is a very dangerous hack and should only be applied if you have verified that the game can operate without write watches. This improves performance for some very specific games (e.g. CoreRT-based games). -##export PW_HEAP_DELAY_FREE=1 -##export PW_WINE_ALLOW_XIM=1 # Disable XIM support until libx11 >= 1.7 is widespread -##export WINEARCH=win32 # defaut = win64 -##export WINEPREFIX= -##export PW_WINEDBG_DISABLE=1 # Disabled WINEDBG -export PW_USE_TERMINAL="0" -export PW_GUI_DISABLED_CS="0" -##export PATH_TO_GAME= -##add_in_start_portwine () { commands ; } -export PW_PREFIX_NAME="DEFAULT" -export PW_MANGOHUD="0" -export PW_MANGOHUD_x32="0" -export PW_MANGOHUD_USER_CONF="0" -export PW_USE_DXR11="0" -export PW_USE_FAKE_DLSS="0" -export PW_WINE_FULLSCREEN_FSR="1" -export PW_USE_GAMEMODE="1" -export PW_DX12_DISABLE="0" -export PW_PRIME_RENDER_OFFLOAD="0" -export PW_USE_D3D_EXTRAS="1" -export PW_FIX_VIDEO_IN_GAME="0" -export PW_FORCE_LARGE_ADDRESS_AWARE="1" -export PW_USE_SHADER_CACHE="1" -export PW_USE_WINE_DXGI="0" add_in_start_portwine () { if [ "${update_loc}" = "RUS" ] ; then diff --git a/data_from_portwine/scripts/portwine_db/Inscryption b/data_from_portwine/scripts/portwine_db/Inscryption index 038955f1..bd426afc 100755 --- a/data_from_portwine/scripts/portwine_db/Inscryption +++ b/data_from_portwine/scripts/portwine_db/Inscryption @@ -3,5 +3,4 @@ #Inscryption.exe #Rating=5 #####################examples########################### -export PW_WINE_USE=PROTON_GE export PW_VULKAN_USE=1 diff --git a/data_from_portwine/scripts/portwine_db/Konung3 b/data_from_portwine/scripts/portwine_db/Konung3 index 72d73eef..cbf558a6 100644 --- a/data_from_portwine/scripts/portwine_db/Konung3 +++ b/data_from_portwine/scripts/portwine_db/Konung3 @@ -13,7 +13,6 @@ export PW_VULKAN_USE="0" export PW_USE_DXR10="0" ##export PW_DLSS_ON=1 ##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN -export PW_USE_NVAPI_AND_DLSS="0" export PW_OLD_GL_STRING="0" export PW_HIDE_NVIDIA_GPU="0" ##export PW_FORCE_USE_VSYNC=0 # Vsync: 0-FORCE_OFF, 1-FORCE_ON, 2-BY_DEFAULT @@ -40,11 +39,9 @@ export PW_PREFIX_NAME="DEFAULT" export PW_MANGOHUD="1" export PW_MANGOHUD_USER_CONF="1" export PW_USE_DXR11="0" -export PW_USE_FAKE_DLSS="0" export PW_WINE_FULLSCREEN_FSR="0" export PW_USE_GAMEMODE="1" export PW_DX12_DISABLE="0" -export PW_PRIME_RENDER_OFFLOAD="0" export PW_USE_D3D_EXTRAS="1" export PW_FIX_VIDEO_IN_GAME="0" export PW_FORCE_LARGE_ADDRESS_AWARE="1" diff --git a/data_from_portwine/scripts/portwine_db/LOF2 b/data_from_portwine/scripts/portwine_db/LOF2 index 99d10987..e1161cd6 100755 --- a/data_from_portwine/scripts/portwine_db/LOF2 +++ b/data_from_portwine/scripts/portwine_db/LOF2 @@ -14,7 +14,6 @@ export PW_VULKAN_USE=dxvk ##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN ##export PW_USE_TERMINAL=0 # Force run in terminal ##export PW_OLD_GL_STRING=0 -##export PW_USE_NVAPI_AND_DLSS=0 ##export PW_VKD3D_FEATURE_LEVEL=0 ##export PW_NO_WRITE_WATCH=0 # Disable support for memory write watches in ntdll. This is a very dangerous hack and should only be applied if you have verified that the game can operate without write watches. This improves performance for some very specific games (e.g. CoreRT-based games). ##export PW_HIDE_NVIDIA_GPU=0 diff --git a/data_from_portwine/scripts/portwine_db/Lineage2_NewRP b/data_from_portwine/scripts/portwine_db/Lineage2_NewRP index e2c1bdd0..7ccf632b 100755 --- a/data_from_portwine/scripts/portwine_db/Lineage2_NewRP +++ b/data_from_portwine/scripts/portwine_db/Lineage2_NewRP @@ -3,41 +3,9 @@ #NewRP.exe #Rating=5 #####################examples########################### -##export PW_COMMENT_DB="blablabla" -##export PW_WINDOWS_VER=10 # Set windows version 10, 7 or XP -##export PW_DLL_INSTALL="vcrun2017" # Install DDL in port prefix (used winetricks) -##export WINEDLLOVERRIDES="blabla=n,b" -##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')" # Additional launch options -export PW_WINE_USE=PROTON_GE -export PW_VULKAN_USE=1 -export PW_USE_DXR10=0 -##export PW_DLSS_ON=1 -export PW_VULKAN_NO_ASYNC=0 -export PW_USE_NVAPI_AND_DLSS=0 -export PW_OLD_GL_STRING=0 -export PW_HIDE_NVIDIA_GPU=0 -export PW_FORCE_USE_VSYNC=0 -export PW_VIRTUAL_DESKTOP=0 -##export VKD3D_CONFIG=force_bindless_texel_buffer,multi_queue export ENABLE_VKBASALT=1 export PW_VKBASALT_EFFECTS=cas:Curves:SMAA:LumaSharpen export PW_VKBASALT_FFX_CAS=1 export PW_NO_FSYNC=0 export PW_NO_ESYNC=0 export PW_USE_GSTREAMER=0 -##export PULSE_LATENCY_MSEC=60 # Fix crackling audio in games -export PW_NO_WRITE_WATCH=0 -export PW_HEAP_DELAY_FREE=0 -export PW_WINE_ALLOW_XIM=0 -##export WINEARCH=win32 # defaut = win64 -##export WINEPREFIX= -export PW_WINEDBG_DISABLE=1 -export PW_USE_TERMINAL=0 -export PW_GUI_DISABLED_CS=0 -##export PATH_TO_GAME= -##add_in_start_portwine () { commands ; } -export PW_USE_DXR11=0 -export PW_USE_GAMEMODE=1 -export PW_DX12_DISABLE=1 -export PW_USE_WINE_DXGI=0 -export PW_PRIME_RENDER_OFFLOAD=0 diff --git a/data_from_portwine/scripts/portwine_db/LostEmber b/data_from_portwine/scripts/portwine_db/LostEmber index 5b2b191e..3be6fdca 100755 --- a/data_from_portwine/scripts/portwine_db/LostEmber +++ b/data_from_portwine/scripts/portwine_db/LostEmber @@ -1,37 +1,7 @@ #!/usr/bin/env bash - #Author: xuser - #LostEmber-Win64-Shipping.exe - #Rating=1-5 - ################################################ - export PW_VULKAN_USE=vkd3d +#Author: xuser +#LostEmber-Win64-Shipping.exe +#Rating=1-5 #####################examples########################### -##export PW_COMMENT_DB="blablabla" -##export PW_VULKAN_USE=dxvk # dxvk, vkd3d or 0 for OpenGL -##export WINEDLLOVERRIDES="blabla=n,b" -##export PW_DLL_INSTALL="vcrun2019 " # Install DDL in port prefix (used winetricks) -##export PW_LOG=0 # Enable debug mode fo terminal -##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_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN -##export PW_USE_TERMINAL=0 # Force run in terminal -##export PW_OLD_GL_STRING=0 -export PW_USE_NVAPI_AND_DLSS=0 -##export PW_VKD3D_FEATURE_LEVEL=0 -##export PW_NO_WRITE_WATCH=0 # Disable support for memory write watches in ntdll. This is a very dangerous hack and should only be applied if you have verified that the game can operate without write watches. This improves performance for some very specific games (e.g. CoreRT-based games). -##export PW_HIDE_NVIDIA_GPU=0 -##export PW_FORCE_USE_VSYNC=2 # Vsync: 0-FORCE_OFF, 1-FORCE_ON, 2-BY_DEFAULT -##export PW_WINEDBG_DISABLE=1 # Disabled WINEDBG -##export PW_USE_GAMEMODE=0 # Force disabele gamemod -##export PW_FORCE_LARGE_ADDRESS_AWARE=1 # Force Wine to enable the LARGE_ADDRESS_AWARE flag for all executables. Enabled by default. -##export PULSE_LATENCY_MSEC=60 # Fix crackling audio in games -##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')" # Additional launch options -##export PW_GUI_DISABLED_CS=1 # 1 = disabled GUI -##export VKD3D_CONFIG=force_bindless_texel_buffer,multi_queue,dxr -##export PW_WINDOWS_VER=10 # Set windows version 10, 7 or XP -##export PW_VIRTUAL_DESKTOP=1 -##export DXVK_HUD=fps,devinfo export PW_HEAP_DELAY_FREE=1 -##export PW_DXGI_FROM_DXVK=1 -##export WINEARCH=win32 # defaut = win64 -##export WINEPREFIX= -##add_in_start_portwine () { commands ; } + diff --git a/data_from_portwine/scripts/portwine_db/MWO b/data_from_portwine/scripts/portwine_db/MWO index d3657f9b..6bea3e66 100644 --- a/data_from_portwine/scripts/portwine_db/MWO +++ b/data_from_portwine/scripts/portwine_db/MWO @@ -11,7 +11,6 @@ export WINEDLLOVERRIDES="steam_api,steam_api64,steamclient,steamclient64=n;dotne export LAUNCH_PARAMETERS="" export PW_WINE_USE="PROTON_LG" export PW_VULKAN_USE="1" -export PW_USE_NVAPI_AND_DLSS="0" export PW_HIDE_NVIDIA_GPU="0" export PW_VIRTUAL_DESKTOP="0" export ENABLE_VKBASALT="0" @@ -24,12 +23,10 @@ export PW_PREFIX_NAME="METAL_WAR_ONLINE" export PW_MANGOHUD="1" export PW_MANGOHUD_x32="1" export PW_MANGOHUD_USER_CONF="0" -export PW_USE_RAY_TRACING="0" -export PW_USE_FAKE_DLSS="0" export PW_WINE_FULLSCREEN_FSR="1" export PW_USE_GAMEMODE="1" export PW_DX12_DISABLE="0" -export PW_PRIME_RENDER_OFFLOAD="0" +export ="0" export PW_USE_D3D_EXTRAS="1" export PW_FIX_VIDEO_IN_GAME="1" export PW_FORCE_LARGE_ADDRESS_AWARE="1" diff --git a/data_from_portwine/scripts/portwine_db/MWO_Portal.exe.ppdb b/data_from_portwine/scripts/portwine_db/MWO_Portal.exe.ppdb index 1ee08ac7..f5637770 100755 --- a/data_from_portwine/scripts/portwine_db/MWO_Portal.exe.ppdb +++ b/data_from_portwine/scripts/portwine_db/MWO_Portal.exe.ppdb @@ -4,48 +4,5 @@ #Rating=1-5 #####################examples########################### ##export PW_COMMENT_DB="blablabla" -export PW_WINDOWS_VER="10" -export PW_DLL_INSTALL="" -export WINEDLLOVERRIDES="" export LAUNCH_PARAMETERS="-noprompt -anygpu" -export PW_WINE_USE="PROTON_GE" -export PW_VULKAN_USE="1" -export PW_USE_DXR10="0" -##export PW_DLSS_ON=1 -##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN -export PW_USE_NVAPI_AND_DLSS="0" -export PW_OLD_GL_STRING="0" -export PW_HIDE_NVIDIA_GPU="0" -export PW_FORCE_USE_VSYNC="0" -export PW_VIRTUAL_DESKTOP="0" -##export VKD3D_CONFIG=force_bindless_texel_buffer,multi_queue -export ENABLE_VKBASALT="1" -export PW_VKBASALT_EFFECTS="FakeHDR:cas" -export PW_VKBASALT_FFX_CAS="0.75" -export PW_NO_FSYNC="0" -export PW_NO_ESYNC="1" -export PW_USE_GSTREAMER="1" -##export PULSE_LATENCY_MSEC=60 # Fix crackling audio in games -##export PW_NO_WRITE_WATCH=1 # Disable support for memory write watches in ntdll. This is a very dangerous hack and should only be applied if you have verified that the game can operate without write watches. This improves performance for some very specific games (e.g. CoreRT-based games). -export PW_HEAP_DELAY_FREE="0" -export PW_WINE_ALLOW_XIM="0" -##export WINEARCH=win32 # defaut = win64 -##export WINEPREFIX= -export PW_WINEDBG_DISABLE="1" -export PW_USE_TERMINAL="0" -export PW_GUI_DISABLED_CS="0" -##export PATH_TO_GAME= -##add_in_start_portwine () { commands ; } -export PW_PREFIX_NAME="DOTNET" -export PW_MANGOHUD="1" -export PW_MANGOHUD_USER_CONF="1" -export PW_USE_DXR11="0" -export PW_WINE_FULLSCREEN_FSR="0" -export PW_USE_GAMEMODE="1" -export PW_DX12_DISABLE="0" -export PW_PRIME_RENDER_OFFLOAD="0" -export PW_USE_D3D_EXTRAS="1" -export PW_FIX_VIDEO_IN_GAME="0" -export PW_USE_AMDVLK_DRIVER="0" -export PW_FORCE_LARGE_ADDRESS_AWARE="1" -export PW_USE_SHADER_CACHE="1" + diff --git a/data_from_portwine/scripts/portwine_db/MassEffect b/data_from_portwine/scripts/portwine_db/MassEffect index 06c880f0..b3420811 100755 --- a/data_from_portwine/scripts/portwine_db/MassEffect +++ b/data_from_portwine/scripts/portwine_db/MassEffect @@ -13,7 +13,6 @@ export PW_DLL_INSTALL="physx d3dx9" # Install DDL in port prefi ##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN ##export PW_USE_TERMINAL=0 # Force run in terminal ##export PW_OLD_GL_STRING=0 -##export PW_USE_NVAPI_AND_DLSS=0 ##export PW_VKD3D_FEATURE_LEVEL=0 ##export PW_NO_WRITE_WATCH=0 # Disable support for memory write watches in ntdll. This is a very dangerous hack and should only be applied if you have verified that the game can operate without write watches. This improves performance for some very specific games (e.g. CoreRT-based games). ##export PW_HIDE_NVIDIA_GPU=0 diff --git a/data_from_portwine/scripts/portwine_db/MassEffect2 b/data_from_portwine/scripts/portwine_db/MassEffect2 index ee30cf77..78579964 100755 --- a/data_from_portwine/scripts/portwine_db/MassEffect2 +++ b/data_from_portwine/scripts/portwine_db/MassEffect2 @@ -3,30 +3,4 @@ #MassEffect2.exe #Rating=1-5 #####################examples########################### -##export PW_VULKAN_USE=dxvk # dxvk, vkd3d or 0 for OpenGL -##export WINEDLLOVERRIDES="blabla=n,b" export PW_DLL_INSTALL="physx d3dx9" # Install DDL in port prefix (used winetricks) -##export PW_LOG=0 # Enable debug mode fo terminal -##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_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN -##export PW_USE_TERMINAL=0 # Force run in terminal -##export PW_OLD_GL_STRING=0 -##export PW_USE_NVAPI_AND_DLSS=0 -##export PW_VKD3D_FEATURE_LEVEL=0 -##export PW_NO_WRITE_WATCH=0 # Disable support for memory write watches in ntdll. This is a very dangerous hack and should only be applied if you have verified that the game can operate without write watches. This improves performance for some very specific games (e.g. CoreRT-based games). -##export PW_HIDE_NVIDIA_GPU=0 -##export PW_FORCE_USE_VSYNC=2 # Vsync: 0-FORCE_OFF, 1-FORCE_ON, 2-BY_DEFAULT -##export PW_WINEDBG_DISABLE=1 # Disabled WINEDBG -##export PW_USE_GAMEMODE=0 # Force disabele gamemod -##export PW_FORCE_LARGE_ADDRESS_AWARE=1 # Force Wine to enable the LARGE_ADDRESS_AWARE flag for all executables. Enabled by default. -##export PULSE_LATENCY_MSEC=60 # Fix crackling audio in games -##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')" # Additional launch options -##export PW_GUI_DISABLED_CS=1 # 1 = disabled GUI -##export VKD3D_CONFIG=force_bindless_texel_buffer,multi_queue,dxr -##export PW_WINDOWS_VER=10 # Set windows version 10, 7 or XP -##export PW_VIRTUAL_DESKTOP=1 -##export DXVK_HUD=fps,devinfo -##export PW_HEAP_DELAY_FREE=0 -##export PW_DXGI_FROM_DXVK=0 -##add_in_start_portwine () { commands ; } diff --git a/data_from_portwine/scripts/portwine_db/MassEffectConfig b/data_from_portwine/scripts/portwine_db/MassEffectConfig index 42d14d5b..2b586b9d 100755 --- a/data_from_portwine/scripts/portwine_db/MassEffectConfig +++ b/data_from_portwine/scripts/portwine_db/MassEffectConfig @@ -8,12 +8,10 @@ ##export PW_DLL_INSTALL="vcrun2017" # Install DDL in port prefix (used winetricks) ##export WINEDLLOVERRIDES="blabla=n,b" ##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')" # Additional launch options -export PW_WINE_USE=PROTON_GE export PW_VULKAN_USE=1 ##export PW_DXR_ON=1 ##export PW_DLSS_ON=1 ##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN -##export PW_USE_NVAPI_AND_DLSS=0 ##export PW_OLD_GL_STRING=1 ##export PW_HIDE_NVIDIA_GPU=1 ##export PW_FORCE_USE_VSYNC=0 # Vsync: 0-FORCE_OFF, 1-FORCE_ON, 2-BY_DEFAULT diff --git a/data_from_portwine/scripts/portwine_db/MassEffectLauncher b/data_from_portwine/scripts/portwine_db/MassEffectLauncher index a63c316a..21c52dca 100755 --- a/data_from_portwine/scripts/portwine_db/MassEffectLauncher +++ b/data_from_portwine/scripts/portwine_db/MassEffectLauncher @@ -3,40 +3,6 @@ #MassEffectLauncher.exe #Rating=1-5 #####################examples########################### -##export PW_COMMENT_DB="blablabla" -##export PW_WINDOWS_VER=10 # Set windows version 10, 7 or XP -##export PW_DLL_INSTALL="vcrun2017" # Install DDL in port prefix (used winetricks) -##export WINEDLLOVERRIDES="blabla=n,b" -##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')" # Additional launch options -export PW_WINE_USE=PROTON_GE -export PW_VULKAN_USE=1 -export PW_DXR_ON=0 -##export PW_DLSS_ON=1 -export PW_VULKAN_NO_ASYNC=0 -export PW_USE_NVAPI_AND_DLSS=0 -export PW_OLD_GL_STRING=0 -export PW_HIDE_NVIDIA_GPU=0 -export PW_FORCE_USE_VSYNC=0 -export PW_VIRTUAL_DESKTOP=0 -##export VKD3D_CONFIG=force_bindless_texel_buffer,multi_queue export ENABLE_VKBASALT=1 export PW_VKBASALT_EFFECTS=cas:FilmGrain2:Clarity export PW_VKBASALT_FFX_CAS=0.75 -export PW_NO_FSYNC=0 -export PW_NO_ESYNC=1 -export PW_USE_GSTREAMER=1 -##export PULSE_LATENCY_MSEC=60 # Fix crackling audio in games -export PW_NO_WRITE_WATCH=0 -export PW_HEAP_DELAY_FREE=0 -export PW_WINE_ALLOW_XIM=0 -##export WINEARCH=win32 # defaut = win64 -##export WINEPREFIX= -export PW_WINEDBG_DISABLE=1 -export PW_USE_TERMINAL=0 -export PW_GUI_DISABLED_CS=0 -##export PATH_TO_GAME= -##add_in_start_portwine () { commands ; } -export PW_MANGOHUD=1 -export PW_USE_RUNTIME=1 -export PW_USE_GAMEMODE=1 -export MANGOHUD_CONFIG=font_size=24,position=top-left,toggle_hud=Shift_R+F12,no_display,resolution,wine,gpu_name,vulkan_driver,gpu_stats,vkbasalt,fps_limit=0 diff --git a/data_from_portwine/scripts/portwine_db/MikuMikuDance b/data_from_portwine/scripts/portwine_db/MikuMikuDance index cbb2bdec..76e77059 100755 --- a/data_from_portwine/scripts/portwine_db/MikuMikuDance +++ b/data_from_portwine/scripts/portwine_db/MikuMikuDance @@ -7,36 +7,3 @@ export PW_COMMENT_DB="MikuMikuDance" ##export PW_WINDOWS_VER=10 # Set windows version 10, 7 or XP export PW_DLL_INSTALL="vcrun2017" # Install DDL in port prefix (used winetricks) export WINEDLLOVERRIDES="MMEffect,MMHack,d3d9,dsound=n,b" -##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')" # Additional launch options -export PW_VULKAN_USE=0 -export PW_USE_DXR10=0 -export PW_VULKAN_NO_ASYNC=0 -export PW_USE_NVAPI_AND_DLSS=0 -export PW_OLD_GL_STRING=0 -export PW_HIDE_NVIDIA_GPU=0 -export PW_FORCE_USE_VSYNC=0 -export PW_VIRTUAL_DESKTOP=0 -##export VKD3D_CONFIG=force_bindless_texel_buffer,multi_queue -export ENABLE_VKBASALT=0 -export PW_NO_FSYNC=0 -export PW_NO_ESYNC=1 -##export PULSE_LATENCY_MSEC=60 # Fix crackling audio in games -export PW_NO_WRITE_WATCH=0 -export PW_HEAP_DELAY_FREE=0 -export PW_WINE_ALLOW_XIM=0 -##export WINEARCH=win32 # defaut = win64 -##export WINEPREFIX= -export PW_WINEDBG_DISABLE=1 -export PW_USE_TERMINAL=0 -export PW_GUI_DISABLED_CS=0 -##add_in_start_portwine () { commands ; } -##export PW_WINE_USE=WINE_7.0_STAGING_AMD64!!!! -export PW_MANGOHUD=0 -export PW_MANGOHUD_USER_CONF=0 -export PW_USE_DXR11=0 -export PW_USE_GSTREAMER=1 -export PW_USE_RUNTIME=1 -export PW_USE_GAMEMODE=1 -export PW_DX12_DISABLE=0 -export PW_USE_WINE_DXGI=1 -export MANGOHUD_CONFIG=font_size=24,position=top-left,toggle_hud=Shift_R+F12,no_display,resolution,wine,gpu_name,vulkan_driver,gpu_stats,vkbasalt,fps_limit=0 diff --git a/data_from_portwine/scripts/portwine_db/NovaRO b/data_from_portwine/scripts/portwine_db/NovaRO index 29a522e1..8fe5712d 100755 --- a/data_from_portwine/scripts/portwine_db/NovaRO +++ b/data_from_portwine/scripts/portwine_db/NovaRO @@ -17,7 +17,6 @@ export PW_DLL_INSTALL="d3dcompiler_42 d3dcompiler_43 d3dx9" ##export PW_VKD3D_VER=2.2 ##export PW_USE_DXR10=1 ##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN -##export PW_USE_NVAPI_AND_DLSS=0 ##export PW_OLD_GL_STRING=1 ##export PW_HIDE_NVIDIA_GPU=1 ##export PW_FORCE_USE_VSYNC=0 # Vsync: 0-FORCE_OFF, 1-FORCE_ON, 2-BY_DEFAULT diff --git a/data_from_portwine/scripts/portwine_db/Oddworld_Soulstorm b/data_from_portwine/scripts/portwine_db/Oddworld_Soulstorm index 1984e30a..4c714c60 100755 --- a/data_from_portwine/scripts/portwine_db/Oddworld_Soulstorm +++ b/data_from_portwine/scripts/portwine_db/Oddworld_Soulstorm @@ -4,7 +4,6 @@ #Rating=5 ################################################# export PW_VULKAN_USE="1" -export PW_WINE_USE="PROTON_GE" export PW_PREFIX_NAME="DEFAULT" export PW_VKBASALT_EFFECTS="Curves:cas" export PW_VKBASALT_FFX_CAS="0.75" @@ -16,7 +15,6 @@ export PW_NO_FSYNC="0" export PW_USE_DXR10="0" export PW_USE_DXR11="0" export PW_VULKAN_NO_ASYNC="0" -export PW_USE_NVAPI_AND_DLSS="0" export PW_OLD_GL_STRING="0" export PW_HIDE_NVIDIA_GPU="0" export PW_FORCE_USE_VSYNC="0" diff --git a/data_from_portwine/scripts/portwine_db/Panzar b/data_from_portwine/scripts/portwine_db/Panzar index 9c8ec568..c0ef423d 100644 --- a/data_from_portwine/scripts/portwine_db/Panzar +++ b/data_from_portwine/scripts/portwine_db/Panzar @@ -5,37 +5,7 @@ #####################examples########################### ##export PW_COMMENT_DB="blablabla" export PW_WINDOWS_VER="7" -export PW_DLL_INSTALL="" -export WINEDLLOVERRIDES="" -export LAUNCH_PARAMETERS="" -export PW_VULKAN_USE="1" -export PW_USE_DXR10="0" -##export PW_DLSS_ON=1 -##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN -export PW_USE_NVAPI_AND_DLSS="0" -export PW_OLD_GL_STRING="0" -export PW_HIDE_NVIDIA_GPU="0" -##export PW_FORCE_USE_VSYNC=0 # Vsync: 0-FORCE_OFF, 1-FORCE_ON, 2-BY_DEFAULT -export PW_VIRTUAL_DESKTOP="0" -##export VKD3D_CONFIG=force_bindless_texel_buffer,multi_queue export ENABLE_VKBASALT="1" export PW_VKBASALT_EFFECTS="Curves:cas" export PW_VKBASALT_FFX_CAS="0.75" -export PW_NO_FSYNC="0" -export PW_NO_ESYNC="1" -export PW_USE_TERMINAL="0" -export PW_GUI_DISABLED_CS="0" -##export PATH_TO_GAME= -##add_in_start_portwine () { commands ; } -export PW_PREFIX_NAME="PANZAR" -export PW_USE_DXR11="0" -export PW_USE_FAKE_DLSS="0" -export PW_WINE_FULLSCREEN_FSR="1" -export PW_USE_GAMEMODE="1" -export PW_DX12_DISABLE="0" -export PW_PRIME_RENDER_OFFLOAD="0" -export PW_USE_D3D_EXTRAS="1" -export PW_FIX_VIDEO_IN_GAME="0" -export PW_FORCE_LARGE_ADDRESS_AWARE="1" -export PW_USE_SHADER_CACHE="0" -export PW_USE_WINE_DXGI="0" + diff --git a/data_from_portwine/scripts/portwine_db/PlariumPlay b/data_from_portwine/scripts/portwine_db/PlariumPlay index dbbdaeed..4713d2bf 100644 --- a/data_from_portwine/scripts/portwine_db/PlariumPlay +++ b/data_from_portwine/scripts/portwine_db/PlariumPlay @@ -15,9 +15,6 @@ export PW_MANGOHUD_USER_CONF="0" export ENABLE_VKBASALT="0" export PW_NO_ESYNC="1" export PW_NO_FSYNC="1" -export PW_USE_RAY_TRACING="0" -export PW_USE_NVAPI_AND_DLSS="0" -export PW_USE_FAKE_DLSS="0" export PW_WINE_FULLSCREEN_FSR="0" export PW_HIDE_NVIDIA_GPU="0" export PW_VIRTUAL_DESKTOP="0" @@ -25,7 +22,6 @@ export PW_USE_TERMINAL="0" export PW_GUI_DISABLED_CS="0" export PW_USE_GAMEMODE="0" export PW_DX12_DISABLE="1" -export PW_PRIME_RENDER_OFFLOAD="0" export PW_USE_D3D_EXTRAS="0" export PW_FIX_VIDEO_IN_GAME="0" export PW_USE_GSTREAMER="0" diff --git a/data_from_portwine/scripts/portwine_db/Quake4 b/data_from_portwine/scripts/portwine_db/Quake4 index 88c8e34b..f594bd47 100755 --- a/data_from_portwine/scripts/portwine_db/Quake4 +++ b/data_from_portwine/scripts/portwine_db/Quake4 @@ -8,12 +8,10 @@ ##export PW_DLL_INSTALL="vcrun2017" # Install DDL in port prefix (used winetricks) ##export WINEDLLOVERRIDES="blabla=n,b" ##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')" # Additional launch options -export PW_WINE_USE=PROTON_GE export PW_VULKAN_USE=dxvk export PW_DXR_ON=0 ##export PW_DLSS_ON=1 export PW_VULKAN_NO_ASYNC=0 -export PW_USE_NVAPI_AND_DLSS=0 export PW_OLD_GL_STRING=0 export PW_HIDE_NVIDIA_GPU=0 export PW_FORCE_USE_VSYNC=0 diff --git a/data_from_portwine/scripts/portwine_db/QuickSFV b/data_from_portwine/scripts/portwine_db/QuickSFV index f46b43cc..5985f893 100755 --- a/data_from_portwine/scripts/portwine_db/QuickSFV +++ b/data_from_portwine/scripts/portwine_db/QuickSFV @@ -8,12 +8,10 @@ ##export PW_DLL_INSTALL="vcrun2017" # Install DDL in port prefix (used winetricks) ##export WINEDLLOVERRIDES="blabla=n,b" ##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')" # Additional launch options -export PW_WINE_USE=PROTON_GE export PW_VULKAN_USE=1 ##export PW_DXR_ON=1 ##export PW_DLSS_ON=1 ##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN -##export PW_USE_NVAPI_AND_DLSS=0 ##export PW_OLD_GL_STRING=1 ##export PW_HIDE_NVIDIA_GPU=1 ##export PW_FORCE_USE_VSYNC=0 # Vsync: 0-FORCE_OFF, 1-FORCE_ON, 2-BY_DEFAULT diff --git a/data_from_portwine/scripts/portwine_db/RDR2 b/data_from_portwine/scripts/portwine_db/RDR2 index 0afd85c1..fec2a207 100755 --- a/data_from_portwine/scripts/portwine_db/RDR2 +++ b/data_from_portwine/scripts/portwine_db/RDR2 @@ -4,34 +4,5 @@ #PlayRDR2.exe #Rating=? ################################################ -export PW_VULKAN_USE="1" -export PW_WINE_USE="PROTON_LG" -export PW_PREFIX_NAME="DEFAULT" -export PW_MANGOHUD="0" -export PW_MANGOHUD_x32="0" -export PW_MANGOHUD_USER_CONF="0" -export ENABLE_VKBASALT="0" -export PW_NO_ESYNC="1" -export PW_NO_FSYNC="0" -export PW_USE_DXR10="0" -export PW_USE_DXR11="0" -export PW_USE_NVAPI_AND_DLSS="0" -export PW_USE_FAKE_DLSS="0" -export PW_WINE_FULLSCREEN_FSR="1" -export PW_HIDE_NVIDIA_GPU="0" -export PW_VIRTUAL_DESKTOP="0" -export PW_USE_TERMINAL="0" -export PW_GUI_DISABLED_CS="0" -export PW_USE_GAMEMODE="1" -export PW_DX12_DISABLE="0" -export PW_PRIME_RENDER_OFFLOAD="0" -export PW_USE_D3D_EXTRAS="1" -export PW_FIX_VIDEO_IN_GAME="0" -export PW_USE_GSTREAMER="1" -export PW_FORCE_LARGE_ADDRESS_AWARE="1" -export PW_USE_SHADER_CACHE="1" -export PW_USE_WINE_DXGI="0" export LAUNCH_PARAMETERS="-vulkan -fullscreen -adapter=1 -USEALLAVAILABLECORES -cpuLoadRebalancing -ignorepipelinecach" export PW_WINDOWS_VER="10" -export PW_DLL_INSTALL="" -export WINEDLLOVERRIDES="vulkan-1=n,b" diff --git a/data_from_portwine/scripts/portwine_db/SR2_pc b/data_from_portwine/scripts/portwine_db/SR2_pc index b06e83db..f79c7b20 100755 --- a/data_from_portwine/scripts/portwine_db/SR2_pc +++ b/data_from_portwine/scripts/portwine_db/SR2_pc @@ -10,7 +10,6 @@ export PW_DLL_INSTALL="faudio" # Install DDL in port prefix (used ##export PW_VULKAN_USE=dxvk # dxvk, vkd3d or 0 for OpenGL ##export PW_USE_DXR10=1 ##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN -##export PW_USE_NVAPI_AND_DLSS=0 ##export PW_OLD_GL_STRING=1 ##export PW_HIDE_NVIDIA_GPU=1 ##export PW_FORCE_USE_VSYNC=0 # Vsync: 0-FORCE_OFF, 1-FORCE_ON, 2-BY_DEFAULT diff --git a/data_from_portwine/scripts/portwine_db/Sam3 b/data_from_portwine/scripts/portwine_db/Sam3 index ef9f5001..9578fcd9 100755 --- a/data_from_portwine/scripts/portwine_db/Sam3 +++ b/data_from_portwine/scripts/portwine_db/Sam3 @@ -16,7 +16,6 @@ export PULSE_LATENCY_MSEC=150 ##export PW_VKD3D_VER=2.2 ##export PW_USE_DXR10=1 ##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN -##export PW_USE_NVAPI_AND_DLSS=0 ##export PW_OLD_GL_STRING=1 ##export PW_HIDE_NVIDIA_GPU=1 ##export PW_FORCE_USE_VSYNC=0 # Vsync: 0-FORCE_OFF, 1-FORCE_ON, 2-BY_DEFAULT diff --git a/data_from_portwine/scripts/portwine_db/SamSM b/data_from_portwine/scripts/portwine_db/SamSM index 4c4f26f7..017384e0 100755 --- a/data_from_portwine/scripts/portwine_db/SamSM +++ b/data_from_portwine/scripts/portwine_db/SamSM @@ -9,12 +9,10 @@ export PW_WINDOWS_VER=10 export PW_DLL_INSTALL="" export WINEDLLOVERRIDES="" export LAUNCH_PARAMETERS="+gfx_strApi Vulkan" -export PW_WINE_USE=PROTON_GE_7.1-2 export PW_VULKAN_USE=1 export PW_USE_DXR10=0 ##export PW_DLSS_ON=1 export PW_VULKAN_NO_ASYNC=0 -export PW_USE_NVAPI_AND_DLSS=0 export PW_OLD_GL_STRING=0 export PW_HIDE_NVIDIA_GPU=0 export PW_FORCE_USE_VSYNC=0 @@ -42,6 +40,5 @@ export PW_MANGOHUD_USER_CONF=0 export PW_USE_DXR11=0 export PW_USE_GAMEMODE=0 export PW_DX12_DISABLE=0 -export PW_PRIME_RENDER_OFFLOAD=0 export PW_D3D_EXTRAS_DISABLE=0 export MANGOHUD_CONFIG=font_size=24,position=top-left,toggle_hud=Shift_R+F12,no_display,resolution,wine,gpu_name,vulkan_driver,gpu_stats,vkbasalt diff --git a/data_from_portwine/scripts/portwine_db/Sheltered2 b/data_from_portwine/scripts/portwine_db/Sheltered2 index 48e338b3..72dcfe01 100755 --- a/data_from_portwine/scripts/portwine_db/Sheltered2 +++ b/data_from_portwine/scripts/portwine_db/Sheltered2 @@ -8,12 +8,10 @@ export PW_WINDOWS_VER="10" export PW_DLL_INSTALL="" export WINEDLLOVERRIDES="" export LAUNCH_PARAMETERS="" -export PW_WINE_USE="PROTON_GE_7-9" export PW_VULKAN_USE="1" export PW_USE_DXR10="0" ##export PW_DLSS_ON=1 export PW_VULKAN_NO_ASYNC="0" -export PW_USE_NVAPI_AND_DLSS="0" export PW_OLD_GL_STRING="0" export PW_HIDE_NVIDIA_GPU="0" export PW_FORCE_USE_VSYNC="0" @@ -41,7 +39,6 @@ export PW_MANGOHUD_USER_CONF="0" export PW_USE_DXR11="0" export PW_USE_GAMEMODE="1" export PW_DX12_DISABLE="0" -export PW_PRIME_RENDER_OFFLOAD="0" export PW_D3D_EXTRAS_DISABLE="0" export PW_FIX_VIDEO_IN_GAME="1" export MANGOHUD_CONFIG="font_size=24,position=top-left,toggle_hud=Shift_R+F12,no_display,resolution,wine,gpu_name,vulkan_driver,gpu_stats,vkbasalt" diff --git a/data_from_portwine/scripts/portwine_db/ShelteredWindows64_EOS b/data_from_portwine/scripts/portwine_db/ShelteredWindows64_EOS index bceb0ced..9010b375 100755 --- a/data_from_portwine/scripts/portwine_db/ShelteredWindows64_EOS +++ b/data_from_portwine/scripts/portwine_db/ShelteredWindows64_EOS @@ -8,12 +8,10 @@ ##export PW_DLL_INSTALL="vcrun2017" # Install DDL in port prefix (used winetricks) ##export WINEDLLOVERRIDES="blabla=n,b" ##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')" # Additional launch options -export PW_WINE_USE=PROTON_GE export PW_VULKAN_USE=1 ##export PW_DXR_ON=1 ##export PW_DLSS_ON=1 ##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN -##export PW_USE_NVAPI_AND_DLSS=0 ##export PW_OLD_GL_STRING=1 ##export PW_HIDE_NVIDIA_GPU=1 ##export PW_FORCE_USE_VSYNC=0 # Vsync: 0-FORCE_OFF, 1-FORCE_ON, 2-BY_DEFAULT diff --git a/data_from_portwine/scripts/portwine_db/Sirus Launcher b/data_from_portwine/scripts/portwine_db/Sirus Launcher index 76c532fd..a12f858b 100755 --- a/data_from_portwine/scripts/portwine_db/Sirus Launcher +++ b/data_from_portwine/scripts/portwine_db/Sirus Launcher @@ -15,7 +15,6 @@ export PW_WINDOWS_VER=7 # Set windows version 10, 7 or XP ##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN ##export PW_USE_TERMINAL=0 # Force run in terminal ##export PW_OLD_GL_STRING=0 -##export PW_USE_NVAPI_AND_DLSS=0 ##export PW_VKD3D_FEATURE_LEVEL=0 ##export PW_NO_WRITE_WATCH=0 # Disable support for memory write watches in ntdll. This is a very dangerous hack and should only be applied if you have verified that the game can operate without write watches. This improves performance for some very specific games (e.g. CoreRT-based games). ##export PW_HIDE_NVIDIA_GPU=0 diff --git a/data_from_portwine/scripts/portwine_db/StarCraft b/data_from_portwine/scripts/portwine_db/StarCraft index 8e2e4e91..834aab34 100755 --- a/data_from_portwine/scripts/portwine_db/StarCraft +++ b/data_from_portwine/scripts/portwine_db/StarCraft @@ -15,7 +15,6 @@ ##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN ##export PW_USE_TERMINAL=0 # Force run in terminal ##export PW_OLD_GL_STRING=0 -##export PW_USE_NVAPI_AND_DLSS=0 ##export PW_VKD3D_FEATURE_LEVEL=0 ##export PW_NO_WRITE_WATCH=0 # Disable support for memory write watches in ntdll. This is a very dangerous hack and should only be applied if you have verified that the game can operate without write watches. This improves performance for some very specific games (e.g. CoreRT-based games). ##export PW_HIDE_NVIDIA_GPU=0 diff --git a/data_from_portwine/scripts/portwine_db/StarCraft Launcher b/data_from_portwine/scripts/portwine_db/StarCraft Launcher index b56c723b..7345deb5 100755 --- a/data_from_portwine/scripts/portwine_db/StarCraft Launcher +++ b/data_from_portwine/scripts/portwine_db/StarCraft Launcher @@ -13,7 +13,6 @@ export PW_VULKAN_USE=1 ##export PW_USE_DXR10=1 ##export PW_DLSS_ON=1 ##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN -##export PW_USE_NVAPI_AND_DLSS=0 ##export PW_OLD_GL_STRING=1 ##export PW_HIDE_NVIDIA_GPU=1 ##export PW_FORCE_USE_VSYNC=0 # Vsync: 0-FORCE_OFF, 1-FORCE_ON, 2-BY_DEFAULT diff --git a/data_from_portwine/scripts/portwine_db/Suite b/data_from_portwine/scripts/portwine_db/Suite index 8dcbf89e..f558b55e 100755 --- a/data_from_portwine/scripts/portwine_db/Suite +++ b/data_from_portwine/scripts/portwine_db/Suite @@ -12,7 +12,6 @@ export PW_DLL_INSTALL="corefonts" # Install DDL in port prefix (used wine ##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN ##export PW_USE_TERMINAL=0 # Force run in terminal ##export PW_OLD_GL_STRING=0 -##export PW_USE_NVAPI_AND_DLSS=0 ##export PW_VKD3D_FEATURE_LEVEL=0 ##export PW_NO_WRITE_WATCH=0 # Disable support for memory write watches in ntdll. This is a very dangerous hack and should only be applied if you have verified that the game can operate without write watches. This improves performance for some very specific games (e.g. CoreRT-based games). ##export PW_HIDE_NVIDIA_GPU=0 diff --git a/data_from_portwine/scripts/portwine_db/SystemShockRemake b/data_from_portwine/scripts/portwine_db/SystemShockRemake index 70aa57a1..f977db94 100644 --- a/data_from_portwine/scripts/portwine_db/SystemShockRemake +++ b/data_from_portwine/scripts/portwine_db/SystemShockRemake @@ -10,7 +10,6 @@ export PW_DLL_INSTALL="" export WINEDLLOVERRIDES="" export LAUNCH_PARAMETERS="" export PW_VULKAN_USE="2" -export PW_USE_NVAPI_AND_DLSS="0" export PW_HIDE_NVIDIA_GPU="0" export PW_VIRTUAL_DESKTOP="0" export ENABLE_VKBASALT="1" @@ -23,12 +22,9 @@ export PW_PREFIX_NAME="DEFAULT" export PW_MANGOHUD="1" export PW_MANGOHUD_x32="0" export PW_MANGOHUD_USER_CONF="0" -export PW_USE_RAY_TRACING="0" -export PW_USE_FAKE_DLSS="0" export PW_WINE_FULLSCREEN_FSR="1" export PW_USE_GAMEMODE="1" export PW_DX12_DISABLE="0" -export PW_PRIME_RENDER_OFFLOAD="0" export PW_USE_D3D_EXTRAS="1" export PW_FIX_VIDEO_IN_GAME="0" export PW_FORCE_LARGE_ADDRESS_AWARE="1" diff --git a/data_from_portwine/scripts/portwine_db/Torchlight b/data_from_portwine/scripts/portwine_db/Torchlight index 03fb0052..29bb3373 100755 --- a/data_from_portwine/scripts/portwine_db/Torchlight +++ b/data_from_portwine/scripts/portwine_db/Torchlight @@ -3,7 +3,6 @@ #Torchlight.exe #Rating=1-5 ######################################################## -export PW_WINE_USE=PROTON_GE export PW_VULKAN_USE=1 export ENABLE_VKBASALT=1 export PW_VKBASALT_EFFECTS="FakeHDR:cas:FilmGrain2" @@ -14,11 +13,9 @@ export PW_VKBASALT_FFX_CAS="1" ##export PW_DLL_INSTALL="" # Install DDL in port prefix (used winetricks) ##export WINEDLLOVERRIDES="blabla=n,b" ##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')" # Additional launch options -##export PW_WINE_USE=PROTON_GE # PROTON_LG or PROTON_GE ##export PW_VULKAN_USE=vkd3d # dxvk, vkd3d or 0 for OpenGL ##export PW_USE_DXR10=1 ##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN -##export PW_USE_NVAPI_AND_DLSS=0 ##export PW_OLD_GL_STRING=1 ##export PW_HIDE_NVIDIA_GPU=1 ##export PW_FORCE_USE_VSYNC=0 # Vsync: 0-FORCE_OFF, 1-FORCE_ON, 2-BY_DEFAULT diff --git a/data_from_portwine/scripts/portwine_db/TwoWorlds2 b/data_from_portwine/scripts/portwine_db/TwoWorlds2 index 479eb678..e4736b00 100755 --- a/data_from_portwine/scripts/portwine_db/TwoWorlds2 +++ b/data_from_portwine/scripts/portwine_db/TwoWorlds2 @@ -8,12 +8,10 @@ ##export PW_DLL_INSTALL="vcrun2017" # Install DDL in port prefix (used winetricks) ##export WINEDLLOVERRIDES="blabla=n,b" ##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')" # Additional launch options -export PW_WINE_USE=PROTON_GE_6.19-5 export PW_VULKAN_USE=1 export PW_DXR_ON=0 ##export PW_DLSS_ON=1 export PW_VULKAN_NO_ASYNC=0 -export PW_USE_NVAPI_AND_DLSS=0 export PW_OLD_GL_STRING=0 export PW_HIDE_NVIDIA_GPU=0 export PW_FORCE_USE_VSYNC=0 diff --git a/data_from_portwine/scripts/portwine_db/TwoWorlds2_DX10 b/data_from_portwine/scripts/portwine_db/TwoWorlds2_DX10 index bf395e4d..20ae295a 100755 --- a/data_from_portwine/scripts/portwine_db/TwoWorlds2_DX10 +++ b/data_from_portwine/scripts/portwine_db/TwoWorlds2_DX10 @@ -3,40 +3,4 @@ #TwoWorlds2_DX10.exe #Rating=1-5 #####################examples########################### -##export PW_COMMENT_DB="blablabla" -##export PW_WINDOWS_VER=10 # Set windows version 10, 7 or XP -##export PW_DLL_INSTALL="vcrun2017" # Install DDL in port prefix (used winetricks) -##export WINEDLLOVERRIDES="blabla=n,b" -##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')" # Additional launch options -export PW_WINE_USE=PROTON_GE_6.19-5 -export PW_VULKAN_USE=1 -export PW_DXR_ON=0 -##export PW_DLSS_ON=1 -export PW_VULKAN_NO_ASYNC=0 -export PW_USE_NVAPI_AND_DLSS=0 -export PW_OLD_GL_STRING=0 -export PW_HIDE_NVIDIA_GPU=0 -export PW_FORCE_USE_VSYNC=0 -export PW_VIRTUAL_DESKTOP=0 -##export VKD3D_CONFIG=force_bindless_texel_buffer,multi_queue -export ENABLE_VKBASALT=1 -export PW_VKBASALT_EFFECTS=cas:FilmGrain2:Curves -export PW_VKBASALT_FFX_CAS=0.85 -export PW_NO_FSYNC=0 -export PW_NO_ESYNC=1 -export PW_USE_GSTREAMER=1 -##export PULSE_LATENCY_MSEC=60 # Fix crackling audio in games -export PW_NO_WRITE_WATCH=0 -export PW_HEAP_DELAY_FREE=0 -export PW_WINE_ALLOW_XIM=0 -##export WINEARCH=win32 # defaut = win64 -##export WINEPREFIX= -export PW_WINEDBG_DISABLE=1 -export PW_USE_TERMINAL=0 -export PW_GUI_DISABLED_CS=0 -##export PATH_TO_GAME= -##add_in_start_portwine () { commands ; } -export PW_MANGOHUD=1 -export PW_USE_RUNTIME=1 -export PW_USE_GAMEMODE=1 -export MANGOHUD_CONFIG=font_size=24,position=top-left,toggle_hud=Shift_R+F12,no_display,resolution,wine,gpu_name,vulkan_driver,gpu_stats,vkbasalt,fps_limit=0 + diff --git a/data_from_portwine/scripts/portwine_db/UNDERTALE b/data_from_portwine/scripts/portwine_db/UNDERTALE index d97efae0..cbb552ef 100755 --- a/data_from_portwine/scripts/portwine_db/UNDERTALE +++ b/data_from_portwine/scripts/portwine_db/UNDERTALE @@ -3,35 +3,4 @@ #UNDERTALE.exe #Rating=1-5 ######################################################## -export PW_WINE_USE=proton_steam -export PW_VULKAN_USE=dxvk -#####################examples########################### -##export PW_COMMENT_DB="blablabla" -##export PW_WINDOWS_VER=10 # Set windows version 10, 7 or XP -##export PW_DLL_INSTALL="vcrun2017" # Install DDL in port prefix (used winetricks) -##export WINEDLLOVERRIDES="blabla=n,b" -##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')" # Additional launch options -##export PW_WINE_USE=proton_ge # proton_steam or proton_ge -##export PW_VULKAN_USE=vkd3d # dxvk, vkd3d or 0 for OpenGL -##export PW_USE_DXR10=1 -##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN -##export PW_USE_NVAPI_AND_DLSS=0 -##export PW_OLD_GL_STRING=1 -##export PW_HIDE_NVIDIA_GPU=1 -##export PW_FORCE_USE_VSYNC=0 # Vsync: 0-FORCE_OFF, 1-FORCE_ON, 2-BY_DEFAULT -##export PW_VIRTUAL_DESKTOP=1 -##export VKD3D_CONFIG=force_bindless_texel_buffer,multi_queue -export ENABLE_VKBASALT=0 -##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=0 # Do not use eventfd-based in-process synchronization primitives -##export PULSE_LATENCY_MSEC=60 # Fix crackling audio in games -##export PW_NO_WRITE_WATCH=1 # Disable support for memory write watches in ntdll. This is a very dangerous hack and should only be applied if you have verified that the game can operate without write watches. This improves performance for some very specific games (e.g. CoreRT-based games). -##export PW_HEAP_DELAY_FREE=1 -##export PW_WINE_ALLOW_XIM=1 # Disable XIM support until libx11 >= 1.7 is widespread -##export WINEARCH=win32 # defaut = win64 -##export WINEPREFIX= -##export PW_WINEDBG_DISABLE=1 # Disabled WINEDBG -##export PW_USE_TERMINAL=1 # Force run in terminal -##export PW_GUI_DISABLED_CS=1 # 1 = disabled GUI -##ADD_IN_START_PORTWINE () { commands ; } MANGOHUD_CONFIG=fps_limit=30 diff --git a/data_from_portwine/scripts/portwine_db/UbisoftConnect b/data_from_portwine/scripts/portwine_db/UbisoftConnect index dbff98ce..712a375f 100755 --- a/data_from_portwine/scripts/portwine_db/UbisoftConnect +++ b/data_from_portwine/scripts/portwine_db/UbisoftConnect @@ -16,7 +16,6 @@ export PW_DLL_INSTALL="" ##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN ##export PW_USE_TERMINAL=0 # Force run in terminal ##export PW_OLD_GL_STRING=0 -##export PW_USE_NVAPI_AND_DLSS=0 ##export PW_VKD3D_FEATURE_LEVEL=0 ##export PW_NO_WRITE_WATCH=0 # Disable support for memory write watches in ntdll. This is a very dangerous hack and should only be applied if you have verified that the game can operate without write watches. This improves performance for some very specific games (e.g. CoreRT-based games). ##export PW_HIDE_NVIDIA_GPU=0 diff --git a/data_from_portwine/scripts/portwine_db/VampireLife_2 b/data_from_portwine/scripts/portwine_db/VampireLife_2 index 217dd1ba..69972a17 100755 --- a/data_from_portwine/scripts/portwine_db/VampireLife_2 +++ b/data_from_portwine/scripts/portwine_db/VampireLife_2 @@ -7,6 +7,5 @@ export PW_COMMENT_DB="VampireLife 2" #export PW_DLL_INSTALL="vcrun2019 physx" #####################examples########################### export PW_VULKAN_USE="1" -export PW_WINE_USE="PROTON_GE_7-9" export PW_PREFIX_NAME="DEFAULT" export PW_DISABLED_CREATE_DB=1 diff --git a/data_from_portwine/scripts/portwine_db/WarGame3 b/data_from_portwine/scripts/portwine_db/WarGame3 index a4da96fc..4babe01d 100755 --- a/data_from_portwine/scripts/portwine_db/WarGame3 +++ b/data_from_portwine/scripts/portwine_db/WarGame3 @@ -15,7 +15,6 @@ ##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN ##export PW_USE_TERMINAL=0 # Force run in terminal ##export PW_OLD_GL_STRING=0 -##export PW_USE_NVAPI_AND_DLSS=0 ##export PW_VKD3D_FEATURE_LEVEL=0 ##export PW_NO_WRITE_WATCH=0 # Disable support for memory write watches in ntdll. This is a very dangerous hack and should only be applied if you have verified that the game can operate without write watches. This improves performance for some very specific games (e.g. CoreRT-based games). ##export PW_HIDE_NVIDIA_GPU=0 diff --git a/data_from_portwine/scripts/portwine_db/WolfNewOrder b/data_from_portwine/scripts/portwine_db/WolfNewOrder index e99e52d6..0eec1d79 100755 --- a/data_from_portwine/scripts/portwine_db/WolfNewOrder +++ b/data_from_portwine/scripts/portwine_db/WolfNewOrder @@ -8,12 +8,10 @@ export PW_WINDOWS_VER="10" export PW_DLL_INSTALL="" export WINEDLLOVERRIDES="" export LAUNCH_PARAMETERS="" -export PW_WINE_USE="PROTON_GE" export PW_VULKAN_USE="1" export PW_USE_DXR10="0" ##export PW_DLSS_ON=1 ##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN -export PW_USE_NVAPI_AND_DLSS="0" export PW_OLD_GL_STRING="0" export PW_HIDE_NVIDIA_GPU="0" export PW_FORCE_USE_VSYNC="0" @@ -43,7 +41,6 @@ export PW_USE_DXR11="0" export PW_WINE_FULLSCREEN_FSR="0" export PW_USE_GAMEMODE="1" export PW_DX12_DISABLE="0" -export PW_PRIME_RENDER_OFFLOAD="0" export PW_USE_D3D_EXTRAS="0" export PW_FIX_VIDEO_IN_GAME="0" export PW_USE_AMDVLK_DRIVER="0" diff --git a/data_from_portwine/scripts/portwine_db/WorldOfSeaBattleClient b/data_from_portwine/scripts/portwine_db/WorldOfSeaBattleClient index 175272ae..3fa3092b 100755 --- a/data_from_portwine/scripts/portwine_db/WorldOfSeaBattleClient +++ b/data_from_portwine/scripts/portwine_db/WorldOfSeaBattleClient @@ -12,7 +12,6 @@ export WINEDLLOVERRIDES="quartz=b" export LAUNCH_PARAMETERS="" export PW_VULKAN_USE="1" export PW_VULKAN_NO_ASYNC="0" -export PW_USE_NVAPI_AND_DLSS="0" export PW_OLD_GL_STRING="0" export PW_HIDE_NVIDIA_GPU="0" export PW_FORCE_USE_VSYNC="0" @@ -33,7 +32,6 @@ export PW_MANGOHUD_USER_CONF="0" export PW_USE_DXR11="0" export PW_USE_GAMEMODE="1" export PW_DX12_DISABLE="0" -export PW_PRIME_RENDER_OFFLOAD="0" export PW_USE_D3D_EXTRAS=1 export PW_FIX_VIDEO_IN_GAME="0" export PW_USE_AMDVLK_DRIVER="1" diff --git a/data_from_portwine/scripts/portwine_db/alanwake b/data_from_portwine/scripts/portwine_db/alanwake index 15fce26e..36384282 100755 --- a/data_from_portwine/scripts/portwine_db/alanwake +++ b/data_from_portwine/scripts/portwine_db/alanwake @@ -13,7 +13,6 @@ export PW_DLL_INSTALL="d3dx9 d3dcompiler_43" # Install DDL in port prefix ##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN ##export PW_USE_TERMINAL=0 # Force run in terminal ##export PW_OLD_GL_STRING=0 -##export PW_USE_NVAPI_AND_DLSS=0 ##export PW_VKD3D_FEATURE_LEVEL=0 ##export PW_NO_WRITE_WATCH=0 # Disable support for memory write watches in ntdll. This is a very dangerous hack and should only be applied if you have verified that the game can operate without write watches. This improves performance for some very specific games (e.g. CoreRT-based games). ##export PW_HIDE_NVIDIA_GPU=0 diff --git a/data_from_portwine/scripts/portwine_db/arizona-starter b/data_from_portwine/scripts/portwine_db/arizona-starter index 6d3586fc..3a2791fe 100755 --- a/data_from_portwine/scripts/portwine_db/arizona-starter +++ b/data_from_portwine/scripts/portwine_db/arizona-starter @@ -14,7 +14,6 @@ ##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN ##export PW_USE_TERMINAL=0 # Force run in terminal ##export PW_OLD_GL_STRING=0 -##export PW_USE_NVAPI_AND_DLSS=0 ##export PW_VKD3D_FEATURE_LEVEL=0 ##export PW_NO_WRITE_WATCH=0 # Disable support for memory write watches in ntdll. This is a very dangerous hack and should only be applied if you have verified that the game can operate without write watches. This improves performance for some very specific games (e.g. CoreRT-based games). ##export PW_HIDE_NVIDIA_GPU=0 diff --git a/data_from_portwine/scripts/portwine_db/default b/data_from_portwine/scripts/portwine_db/default index 18d1e905..e9bb52c3 100755 --- a/data_from_portwine/scripts/portwine_db/default +++ b/data_from_portwine/scripts/portwine_db/default @@ -10,12 +10,10 @@ ##export WINEDLLOVERRIDES="blabla=n,b" ##export LAUNCH_PARAMETERS="+com_skipIntroVideo 1 +com_skipSignInManager 1" # Additional launch options -##export PW_WINE_USE=PROTON_GE # PROTON_LG or PROTON_GE ##export PW_VULKAN_USE=1 # 1 ,dxvk or 0 for OpenGL ##export PW_USE_DXR10=1 ##export PW_DLSS_ON=1 ##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN -##export PW_USE_NVAPI_AND_DLSS=0 ##export PW_OLD_GL_STRING=1 ##export PW_HIDE_NVIDIA_GPU=1 ##export PW_FORCE_USE_VSYNC=0 # Vsync: 0-FORCE_OFF, 1-FORCE_ON, 2-BY_DEFAULT diff --git a/data_from_portwine/scripts/portwine_db/dontstarve b/data_from_portwine/scripts/portwine_db/dontstarve index 5d619562..7ff13423 100755 --- a/data_from_portwine/scripts/portwine_db/dontstarve +++ b/data_from_portwine/scripts/portwine_db/dontstarve @@ -15,7 +15,6 @@ export PW_DLL_INSTALL="d3dx9 d3dcompiler_43" # Install DDL in port prefix ##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN ##export PW_USE_TERMINAL=0 # Force run in terminal ##export PW_OLD_GL_STRING=0 -##export PW_USE_NVAPI_AND_DLSS=0 ##export PW_VKD3D_FEATURE_LEVEL=0 ##export PW_NO_WRITE_WATCH=0 # Disable support for memory write watches in ntdll. This is a very dangerous hack and should only be applied if you have verified that the game can operate without write watches. This improves performance for some very specific games (e.g. CoreRT-based games). ##export PW_HIDE_NVIDIA_GPU=0 diff --git a/data_from_portwine/scripts/portwine_db/ePSXe b/data_from_portwine/scripts/portwine_db/ePSXe index ff3056c4..d720c5ab 100755 --- a/data_from_portwine/scripts/portwine_db/ePSXe +++ b/data_from_portwine/scripts/portwine_db/ePSXe @@ -8,12 +8,10 @@ ##export PW_DLL_INSTALL="vcrun2017" # Install DDL in port prefix (used winetricks) ##export WINEDLLOVERRIDES="blabla=n,b" ##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')" # Additional launch options -export PW_WINE_USE=PROTON_GE export PW_VULKAN_USE=1 ##export PW_USE_DXR10=1 ##export PW_DLSS_ON=1 ##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN -##export PW_USE_NVAPI_AND_DLSS=0 ##export PW_OLD_GL_STRING=1 ##export PW_HIDE_NVIDIA_GPU=1 ##export PW_FORCE_USE_VSYNC=0 # Vsync: 0-FORCE_OFF, 1-FORCE_ON, 2-BY_DEFAULT diff --git a/data_from_portwine/scripts/portwine_db/eve b/data_from_portwine/scripts/portwine_db/eve index f6626f3f..f7596592 100755 --- a/data_from_portwine/scripts/portwine_db/eve +++ b/data_from_portwine/scripts/portwine_db/eve @@ -5,7 +5,6 @@ #Rating=5 #####################examples########################### ##export PW_COMMENT_DB="blablabla" -# export PW_WINE_USE=PROTON_GE export PW_VULKAN_USE=1 #export PW_WINDOWS_VER=7 # Set windows version 10, 7 or XP export PW_DLL_INSTALL="vcrun2019 d3dcompiler_47" # Install DDL in port prefix (used winetricks) diff --git a/data_from_portwine/scripts/portwine_db/factorio b/data_from_portwine/scripts/portwine_db/factorio index fe5c8a08..3d066681 100755 --- a/data_from_portwine/scripts/portwine_db/factorio +++ b/data_from_portwine/scripts/portwine_db/factorio @@ -8,7 +8,6 @@ ##export PW_DLL_INSTALL="vcrun2017" # Install DDL in port prefix (used winetricks) ##export WINEDLLOVERRIDES="blabla=n,b" ##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')" # Additional launch options -export PW_WINE_USE=PROTON_GE export PW_VULKAN_USE=dxvk export PW_DXR_ON=0 export PW_VULKAN_NO_ASYNC=0 diff --git a/data_from_portwine/scripts/portwine_db/fc3_blooddragon_d3d11 b/data_from_portwine/scripts/portwine_db/fc3_blooddragon_d3d11 index b9264423..fca06e94 100755 --- a/data_from_portwine/scripts/portwine_db/fc3_blooddragon_d3d11 +++ b/data_from_portwine/scripts/portwine_db/fc3_blooddragon_d3d11 @@ -3,33 +3,5 @@ #fc3_blooddragon_d3d11.exe #Rating=1-5 #####################examples########################### -##export PW_COMMENT_DB="blablabla" -##export PW_WINDOWS_VER=10 # Set windows version 10, 7 or XP export PW_DLL_INSTALL="corefonts" # Install DDL in port prefix (used winetricks) export WINEDLLOVERRIDES=xaudio2_7=n,b -##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')" # Additional launch options -export PW_WINE_USE=PROTON_LG -export PW_VULKAN_USE=1 -export PW_USE_DXR10=0 -export PW_VULKAN_NO_ASYNC=0 -export PW_USE_NVAPI_AND_DLSS=0 -export PW_OLD_GL_STRING=0 -export PW_HIDE_NVIDIA_GPU=0 -export PW_FORCE_USE_VSYNC=0 -export PW_VIRTUAL_DESKTOP=0 -##export VKD3D_CONFIG=force_bindless_texel_buffer,multi_queue -export ENABLE_VKBASALT=0 -##export PW_VKBASALT_EFFECTS="FakeHDR:cas" # Use Reshade in others games (dx9-12 to vulkan only) -##export PW_VKBASALT_FFX_CAS="0.75" # FidelityFX Contrast Adaptive Sharpening (min 0 - max 1) -export PW_NO_FSYNC=0 -export PW_NO_ESYNC=1 -##export PULSE_LATENCY_MSEC=60 # Fix crackling audio in games -export PW_NO_WRITE_WATCH=0 -export PW_HEAP_DELAY_FREE=0 -export PW_WINE_ALLOW_XIM=0 -##export WINEARCH=win32 # defaut = win64 -##export WINEPREFIX= -export PW_WINEDBG_DISABLE=1 -export PW_USE_TERMINAL=0 -export PW_GUI_DISABLED_CS=0 -##add_in_start_portwine () { commands ; } diff --git a/data_from_portwine/scripts/portwine_db/gfclient b/data_from_portwine/scripts/portwine_db/gfclient index 4216e8ae..c54a23d9 100755 --- a/data_from_portwine/scripts/portwine_db/gfclient +++ b/data_from_portwine/scripts/portwine_db/gfclient @@ -5,7 +5,6 @@ #####################examples########################### export PW_COMMENT_DB="GameForge\nClient" export PW_VULKAN_USE=1 -export PW_WINE_USE=PROTON_GE export PW_WINDOWS_VER=10 # Set windows version 10, 7 or XP export PW_DLL_INSTALL="vcrun2019 d3dcompiler_43 d3dcompiler_47" # Install DDL in port prefix (used winetricks) export WINEDLLOVERRIDES="gfclient0_msvc140=n;ucrtbase=b" diff --git a/data_from_portwine/scripts/portwine_db/gta3 b/data_from_portwine/scripts/portwine_db/gta3 index 4a6110ba..1da354bb 100755 --- a/data_from_portwine/scripts/portwine_db/gta3 +++ b/data_from_portwine/scripts/portwine_db/gta3 @@ -3,41 +3,4 @@ #gta3.exe #Rating=1-5 #####################examples########################### -##export PW_COMMENT_DB="blablabla" -export PW_WINDOWS_VER=XP # Set windows version 10, 7 or XP -##export PW_DLL_INSTALL="vcrun2017" # Install DDL in port prefix (used winetricks) export WINEDLLOVERRIDES="d3d8,drvmgt,mss32=n,b" -##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')" # Additional launch options -export PW_VULKAN_USE=0 -export PW_USE_DXR10=0 -##export PW_DLSS_ON=1 -export PW_VULKAN_NO_ASYNC=0 -export PW_USE_NVAPI_AND_DLSS=0 -export PW_OLD_GL_STRING=0 -export PW_HIDE_NVIDIA_GPU=0 -export PW_FORCE_USE_VSYNC=0 -export PW_VIRTUAL_DESKTOP=1 -##export VKD3D_CONFIG=force_bindless_texel_buffer,multi_queue -export ENABLE_VKBASALT=0 -##export PW_VKBASALT_EFFECTS="FakeHDR:cas" # Use Reshade in others games (dx9-12 to vulkan only) -##export PW_VKBASALT_FFX_CAS="0.75" # FidelityFX Contrast Adaptive Sharpening (min 0 - max 1) -export PW_NO_FSYNC=0 -export PW_NO_ESYNC=1 -export PW_USE_GSTREAMER=1 -##export PULSE_LATENCY_MSEC=60 # Fix crackling audio in games -export PW_NO_WRITE_WATCH=0 -export PW_HEAP_DELAY_FREE=0 -export PW_WINE_ALLOW_XIM=0 -##export WINEARCH=win32 # defaut = win64 -##export WINEPREFIX= -export PW_WINEDBG_DISABLE=1 -export PW_USE_TERMINAL=0 -export PW_GUI_DISABLED_CS=0 -##export PATH_TO_GAME= -##add_in_start_portwine () { commands ; } -export PW_MANGOHUD_USER_CONF=0 -export PW_USE_DXR11=0 -export PW_USE_GAMEMODE=1 -export PW_DX12_DISABLE=0 -export PW_PRIME_RENDER_OFFLOAD=0 -export PW_D3D_EXTRAS_DISABLE=0 diff --git a/data_from_portwine/scripts/portwine_db/gu b/data_from_portwine/scripts/portwine_db/gu index 1818e011..7c431831 100755 --- a/data_from_portwine/scripts/portwine_db/gu +++ b/data_from_portwine/scripts/portwine_db/gu @@ -36,5 +36,4 @@ export PW_GUI_DISABLED_CS=0 ##export PATH_TO_GAME= ##add_in_start_portwine () { commands ; } export PW_MANGOHUD=1 -export PW_USE_NVAPI_AND_DLSS=0 export PW_USE_RUNTIME=1 diff --git a/data_from_portwine/scripts/portwine_db/gu_addon b/data_from_portwine/scripts/portwine_db/gu_addon index 2312a055..0c49a4e1 100755 --- a/data_from_portwine/scripts/portwine_db/gu_addon +++ b/data_from_portwine/scripts/portwine_db/gu_addon @@ -13,7 +13,6 @@ export PW_VULKAN_USE=1 ##export PW_DXR_ON=1 ##export PW_DLSS_ON=1 ##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN -##export PW_USE_NVAPI_AND_DLSS=0 ##export PW_OLD_GL_STRING=1 ##export PW_HIDE_NVIDIA_GPU=1 ##export PW_FORCE_USE_VSYNC=0 # Vsync: 0-FORCE_OFF, 1-FORCE_ON, 2-BY_DEFAULT diff --git a/data_from_portwine/scripts/portwine_db/hl2 b/data_from_portwine/scripts/portwine_db/hl2 index 95f60ccd..5f052a71 100755 --- a/data_from_portwine/scripts/portwine_db/hl2 +++ b/data_from_portwine/scripts/portwine_db/hl2 @@ -13,7 +13,6 @@ export PW_VULKAN_USE=1 export PW_DXR_ON=0 ##export PW_DLSS_ON=1 export PW_VULKAN_NO_ASYNC=0 -export PW_USE_NVAPI_AND_DLSS=0 export PW_OLD_GL_STRING=0 export PW_HIDE_NVIDIA_GPU=0 export PW_FORCE_USE_VSYNC=0 diff --git a/data_from_portwine/scripts/portwine_db/iw3sp b/data_from_portwine/scripts/portwine_db/iw3sp index 31d16d7b..27dfce1d 100755 --- a/data_from_portwine/scripts/portwine_db/iw3sp +++ b/data_from_portwine/scripts/portwine_db/iw3sp @@ -20,7 +20,6 @@ ##export PW_DXVK_NO_ASYNC=1 # Disabled ASYNC for VULKAN ##export PW_USE_TERMINAL=0 # Force run in terminal ##export PW_OLD_GL_STRING=0 -##export PW_USE_NVAPI_AND_DLSS=0 ##export PW_VKD3D_FEATURE_LEVEL=0 ##export PW_NO_WRITE_WATCH=0 # Disable support for memory write watches in ntdll. This is a very dangerous hack and should only be applied if you have verified that the game can operate without write watches. This improves performance for some very specific games (e.g. CoreRT-based games). ##export PW_HIDE_NVIDIA_GPU=0 diff --git a/data_from_portwine/scripts/portwine_db/iw4sp b/data_from_portwine/scripts/portwine_db/iw4sp index 1b41e9f2..3ba32126 100755 --- a/data_from_portwine/scripts/portwine_db/iw4sp +++ b/data_from_portwine/scripts/portwine_db/iw4sp @@ -20,7 +20,6 @@ ##export PW_VKD3D_VER=2.2 ##export PW_USE_DXR10=1 ##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN -##export PW_USE_NVAPI_AND_DLSS=0 ##export PW_OLD_GL_STRING=0 ##export PW_HIDE_NVIDIA_GPU=0 ##export PW_FORCE_USE_VSYNC=2 # Vsync: 0-FORCE_OFF, 1-FORCE_ON, 2-BY_DEFAULT diff --git a/data_from_portwine/scripts/portwine_db/metro b/data_from_portwine/scripts/portwine_db/metro index c5bd07c9..14f404d1 100755 --- a/data_from_portwine/scripts/portwine_db/metro +++ b/data_from_portwine/scripts/portwine_db/metro @@ -8,12 +8,10 @@ ##export PW_DLL_INSTALL="vcrun2017" # Install DDL in port prefix (used winetricks) ##export WINEDLLOVERRIDES="blabla=n,b" ##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')" # Additional launch options -export PW_WINE_USE=PROTON_GE export PW_VULKAN_USE=dxvk export PW_DXR_ON=0 ##export PW_DLSS_ON=1 export PW_VULKAN_NO_ASYNC=0 -export PW_USE_NVAPI_AND_DLSS=0 export PW_OLD_GL_STRING=0 export PW_HIDE_NVIDIA_GPU=0 export PW_FORCE_USE_VSYNC=0 diff --git a/data_from_portwine/scripts/portwine_db/risen-1 b/data_from_portwine/scripts/portwine_db/risen-1 index d5be0953..1fe67232 100755 --- a/data_from_portwine/scripts/portwine_db/risen-1 +++ b/data_from_portwine/scripts/portwine_db/risen-1 @@ -12,7 +12,6 @@ export PW_DLL_INSTALL="physx d3dx9" # Install DDL in port prefix (used wi ##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN ##export PW_USE_TERMINAL=0 # Force run in terminal ##export PW_OLD_GL_STRING=0 -##export PW_USE_NVAPI_AND_DLSS=0 ##export PW_VKD3D_FEATURE_LEVEL=0 ##export PW_NO_WRITE_WATCH=0 # Disable support for memory write watches in ntdll. This is a very dangerous hack and should only be applied if you have verified that the game can operate without write watches. This improves performance for some very specific games (e.g. CoreRT-based games). ##export PW_HIDE_NVIDIA_GPU=0 diff --git a/data_from_portwine/scripts/portwine_db/s1_sp64_ship b/data_from_portwine/scripts/portwine_db/s1_sp64_ship index 5e3a73bc..de2e97db 100755 --- a/data_from_portwine/scripts/portwine_db/s1_sp64_ship +++ b/data_from_portwine/scripts/portwine_db/s1_sp64_ship @@ -20,7 +20,6 @@ ##export PW_DXVK_NO_ASYNC=1 # Disabled ASYNC for VULKAN ##export PW_USE_TERMINAL=0 # Force run in terminal ##export PW_OLD_GL_STRING=0 -##export PW_USE_NVAPI_AND_DLSS=0 ##export PW_VKD3D_FEATURE_LEVEL=0 ##export PW_NO_WRITE_WATCH=0 # Disable support for memory write watches in ntdll. This is a very dangerous hack and should only be applied if you have verified that the game can operate without write watches. This improves performance for some very specific games (e.g. CoreRT-based games). ##export PW_HIDE_NVIDIA_GPU=0 diff --git a/data_from_portwine/scripts/portwine_db/saferun b/data_from_portwine/scripts/portwine_db/saferun index e4ceed51..91853685 100755 --- a/data_from_portwine/scripts/portwine_db/saferun +++ b/data_from_portwine/scripts/portwine_db/saferun @@ -8,12 +8,10 @@ ##export PW_DLL_INSTALL="vcrun2017" # Install DDL in port prefix (used winetricks) ##export WINEDLLOVERRIDES="blabla=n,b" ##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')" # Additional launch options -export PW_WINE_USE=PROTON_GE export PW_VULKAN_USE=dxvk export PW_DXR_ON=0 ##export PW_DLSS_ON=1 export PW_VULKAN_NO_ASYNC=0 -export PW_USE_NVAPI_AND_DLSS=0 export PW_OLD_GL_STRING=0 export PW_HIDE_NVIDIA_GPU=0 export PW_FORCE_USE_VSYNC=0 diff --git a/data_from_portwine/scripts/portwine_db/sanitarium_XP b/data_from_portwine/scripts/portwine_db/sanitarium_XP index e57dd819..d73573a9 100755 --- a/data_from_portwine/scripts/portwine_db/sanitarium_XP +++ b/data_from_portwine/scripts/portwine_db/sanitarium_XP @@ -8,12 +8,10 @@ ##export PW_DLL_INSTALL="vcrun2017" # Install DDL in port prefix (used winetricks) ##export WINEDLLOVERRIDES="blabla=n,b" ##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')" # Additional launch options -export PW_WINE_USE=PROTON_GEC_PW2 export PW_VULKAN_USE=0 ##export PW_USE_DXR10=1 ##export PW_DLSS_ON=1 ##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN -##export PW_USE_NVAPI_AND_DLSS=0 ##export PW_OLD_GL_STRING=1 ##export PW_HIDE_NVIDIA_GPU=1 ##export PW_FORCE_USE_VSYNC=0 # Vsync: 0-FORCE_OFF, 1-FORCE_ON, 2-BY_DEFAULT diff --git a/data_from_portwine/scripts/portwine_db/sprally2 b/data_from_portwine/scripts/portwine_db/sprally2 index 204fdc00..3cf736a9 100755 --- a/data_from_portwine/scripts/portwine_db/sprally2 +++ b/data_from_portwine/scripts/portwine_db/sprally2 @@ -16,7 +16,6 @@ export PW_OLD_GL_STRING=1 ##export PW_VULKAN_USE=vkd3d # dxvk, vkd3d or 0 for OpenGL ##export PW_USE_DXR10=1 ##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN -##export PW_USE_NVAPI_AND_DLSS=0 ##export PW_OLD_GL_STRING=1 ##export PW_HIDE_NVIDIA_GPU=1 ##export PW_FORCE_USE_VSYNC=0 # Vsync: 0-FORCE_OFF, 1-FORCE_ON, 2-BY_DEFAULT diff --git a/data_from_portwine/scripts/portwine_db/trine b/data_from_portwine/scripts/portwine_db/trine index 7831d290..9a172d47 100755 --- a/data_from_portwine/scripts/portwine_db/trine +++ b/data_from_portwine/scripts/portwine_db/trine @@ -11,7 +11,6 @@ export PW_DLL_INSTALL="physx" # Install DDL in port prefix (used w ##export PW_VULKAN_USE=dxvk # dxvk, vkd3d or 0 for OpenGL ##export PW_USE_DXR10=1 ##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN -##export PW_USE_NVAPI_AND_DLSS=0 ##export PW_OLD_GL_STRING=1 ##export PW_HIDE_NVIDIA_GPU=1 ##export PW_FORCE_USE_VSYNC=0 # Vsync: 0-FORCE_OFF, 1-FORCE_ON, 2-BY_DEFAULT diff --git a/data_from_portwine/scripts/portwine_db/vocaloid4_4.3.0_setup b/data_from_portwine/scripts/portwine_db/vocaloid4_4.3.0_setup index 135e15f3..850cb86b 100755 --- a/data_from_portwine/scripts/portwine_db/vocaloid4_4.3.0_setup +++ b/data_from_portwine/scripts/portwine_db/vocaloid4_4.3.0_setup @@ -12,7 +12,6 @@ export PW_VULKAN_USE=0 export PW_USE_DXR10=0 ##export PW_DLSS_ON=1 export PW_VULKAN_NO_ASYNC=0 -export PW_USE_NVAPI_AND_DLSS=0 export PW_OLD_GL_STRING=0 export PW_HIDE_NVIDIA_GPU=0 export PW_FORCE_USE_VSYNC=0 diff --git a/data_from_portwine/scripts/portwine_db/wgc b/data_from_portwine/scripts/portwine_db/wgc index d47008a9..66dd609f 100755 --- a/data_from_portwine/scripts/portwine_db/wgc +++ b/data_from_portwine/scripts/portwine_db/wgc @@ -10,13 +10,9 @@ export PW_COMMENT_DB="Wargaming and Lesta Game Centers" export PW_WINE_USE="PROTON_LG" export PW_VULKAN_USE=1 #dxvk, vkd3d or 0 for OpenGL export LAUNCH_PARAMETERS="" # Additional launch options -#export PW_USE_TERMINAL=1 export PW_WINDOWS_VER=10 # Set windows version 10, 7 or XP -#export PW_USE_NVAPI_AND_DLSS=0 export WINEDLLOVERRIDES="" export PW_DLL_INSTALL="lucida vcrun2019" # Install DDL in port prefix (used winetricks) -##export PW_GUI_DISABLED_CS=1 -##export PW_WINEDBG_DISABLE=1 # Disabled WINEDBG export PW_USE_D3D_EXTRAS="1" export PW_USE_EAC_AND_BE="0" diff --git a/data_from_portwine/scripts/portwine_db/witcher3 b/data_from_portwine/scripts/portwine_db/witcher3 index 9b69cd55..a5b02b54 100755 --- a/data_from_portwine/scripts/portwine_db/witcher3 +++ b/data_from_portwine/scripts/portwine_db/witcher3 @@ -22,18 +22,15 @@ export PW_HEAP_DELAY_FREE="0" export PW_WINE_ALLOW_XIM=0 export PW_WINEDBG_DISABLE=0 export PW_USE_TERMINAL="0" -export PW_USE_NVAPI_AND_DLSS="0" export PW_GUI_DISABLED_CS="0" export PW_PREFIX_NAME="DEFAULT" export PW_MANGOHUD="0" export PW_MANGOHUD_USER_CONF="0" export PW_USE_DXR10="0" export PW_USE_DXR11="0" -export PW_USE_FAKE_DLSS="0" export PW_WINE_FULLSCREEN_FSR="0" export PW_USE_GAMEMODE="1" export PW_DX12_DISABLE="0" -export PW_PRIME_RENDER_OFFLOAD="0" export PW_USE_D3D_EXTRAS="1" export PW_FIX_VIDEO_IN_GAME="0" export PW_FORCE_LARGE_ADDRESS_AWARE="1" diff --git a/data_from_portwine/scripts/portwine_db/wotblitz b/data_from_portwine/scripts/portwine_db/wotblitz index 5d600429..a8817b54 100755 --- a/data_from_portwine/scripts/portwine_db/wotblitz +++ b/data_from_portwine/scripts/portwine_db/wotblitz @@ -15,7 +15,6 @@ export PW_DLL_INSTALL="vcrun2013 vcrun2017 dotnet472" ##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN ##export PW_USE_TERMINAL=0 # Force run in terminal ##export PW_OLD_GL_STRING=0 -##export PW_USE_NVAPI_AND_DLSS=0 ##export PW_VKD3D_FEATURE_LEVEL=0 ##export PW_NO_WRITE_WATCH=0 # Disable support for memory write watches in ntdll. This is a very dangerous hack and should only be applied if you have verified that the game can operate without write watches. This improves performance for some very specific games (e.g. CoreRT-based games). ##export PW_HIDE_NVIDIA_GPU=0 diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_PLARIUM_PLAY b/data_from_portwine/scripts/pw_autoinstall/PW_PLARIUM_PLAY index 65361ed8..dea9177f 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_PLARIUM_PLAY +++ b/data_from_portwine/scripts/pw_autoinstall/PW_PLARIUM_PLAY @@ -13,9 +13,6 @@ export PW_MANGOHUD_USER_CONF="0" export ENABLE_VKBASALT="0" export PW_NO_ESYNC="1" export PW_NO_FSYNC="1" -export PW_USE_RAY_TRACING="0" -export PW_USE_NVAPI_AND_DLSS="0" -export PW_USE_FAKE_DLSS="0" export PW_WINE_FULLSCREEN_FSR="0" export PW_HIDE_NVIDIA_GPU="0" export PW_VIRTUAL_DESKTOP="0" @@ -23,7 +20,6 @@ export PW_USE_TERMINAL="0" export PW_GUI_DISABLED_CS="0" export PW_USE_GAMEMODE="0" export PW_DX12_DISABLE="1" -export PW_PRIME_RENDER_OFFLOAD="0" export PW_USE_D3D_EXTRAS="0" export PW_FIX_VIDEO_IN_GAME="0" export PW_USE_GSTREAMER="0" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_STALCRAFT b/data_from_portwine/scripts/pw_autoinstall/PW_STALCRAFT index 446f4b4a..8f7f9617 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_STALCRAFT +++ b/data_from_portwine/scripts/pw_autoinstall/PW_STALCRAFT @@ -1,7 +1,7 @@ #!/usr/bin/env bash # Author: Castro-Fidel (linux-gaming.ru) ######################################################################## -export LAUNCH_PARAMETERS=("/S" ) +# export LAUNCH_PARAMETERS=("/S" ) export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/EXBO_Setup_ru.exe" export PW_PREFIX_NAME=DOTNET diff --git a/data_from_portwine/scripts/runlib b/data_from_portwine/scripts/runlib index 437867f1..07012267 100755 --- a/data_from_portwine/scripts/runlib +++ b/data_from_portwine/scripts/runlib @@ -68,7 +68,7 @@ start_portwine () { export VKD3D_DEBUG="warn" export WINE_MONO_TRACE="E:System.NotImplementedException" export VK_LOADER_DEBUG="none" - export VKBASALT_LOG_LEVEL="warn" + export VKBASALT_LOG_LEVEL="none" export DXVK_NVAPI_LOG_LEVEL=warn else export WINEDEBUG="-all" @@ -143,7 +143,6 @@ start_portwine () { var_winedlloverride_update "nvapi,nvapi64,nvngx=n;_nvngx=" export DXVK_ENABLE_NVAPI=1 export WINE_HIDE_NVIDIA_GPU=0 - export VKD3D_FEATURE_LEVEL="12_2" # export DXVK_NVAPI_DRIVER_VERSION= elif [[ "${PW_USE_NVAPI_AND_DLSS}" == 1 ]] ; then if ! try_copy_file `find /usr/* -type f -name "nvngx.dll" 2>/dev/null | awk '{print $1}' | grep '/lib/'` "${WINEPREFIX}/drive_c/windows/system32/" @@ -155,7 +154,6 @@ start_portwine () { enabled_fake_nvidia_videocard 0 export DXVK_ENABLE_NVAPI=1 export WINE_HIDE_NVIDIA_GPU=0 - export VKD3D_FEATURE_LEVEL="12_2" # export DXVK_NVAPI_DRIVER_VERSION= var_winedlloverride_update "nvngx,_nvngx,nvapi,nvapi64=n" else @@ -164,14 +162,10 @@ start_portwine () { var_winedlloverride_update "nvngx,_nvngx=" fi - if [[ ! -z "${optirun_on}" && "${optirun_on}" != "" ]] ; then - export PW_PRIME_RENDER_OFFLOAD=1 - print_info "force PW_PRIME_RENDER_OFFLOAD=1" - fi - if [[ "${PW_PRIME_RENDER_OFFLOAD}" == 1 ]] ; then export __NV_PRIME_RENDER_OFFLOAD=1 export __GLX_VENDOR_LIBRARY_NAME=nvidia + export __VK_LAYER_NV_optimus=NVIDIA_only fi if [[ "${PW_HEAP_DELAY_FREE}" == 1 ]] @@ -194,7 +188,6 @@ start_portwine () { if [[ "${PW_USE_DXR11}" == 1 ]] || [[ "${PW_USE_DXR10}" == 1 ]] || [[ "${PW_USE_RAY_TRACING}" == 1 ]]; then var_vkd3d_config_update dxr,dxr11 var_radv_perftest_config_update rt - export VKD3D_FEATURE_LEVEL="12_2" export WINE_HIDE_NVIDIA_GPU=0 export DXVK_ENABLE_NVAPI=1 fi @@ -431,11 +424,13 @@ start_portwine () { if [[ "${PW_VULKAN_USE}" == "1" ]] ; then PATH_TO_DXVK_FILES="${PW_VULKAN_DIR}/dxvk-${DXVK_STABLE_VER}" PATH_TO_VKD3D_FILES="${PW_VULKAN_DIR}/vkd3d-proton-${VKD3D_STABLE_VER}" + export VKD3D_FEATURE_LEVEL="12_0" print_info "DXVK v.${DXVK_STABLE_VER} in use" print_info "VKD3D-PROTON v.${VKD3D_STABLE_VER} in use" elif [[ "${PW_VULKAN_USE}" == "2" ]] ; then PATH_TO_DXVK_FILES="${PW_VULKAN_DIR}/dxvk-${DXVK_GIT_VER}" PATH_TO_VKD3D_FILES="${PW_VULKAN_DIR}/vkd3d-proton-${VKD3D_GIT_VER}" + export VKD3D_FEATURE_LEVEL="12_2" print_info "DXVK v.${DXVK_GIT_VER} in use" print_info "VKD3D-PROTON v.${VKD3D_GIT_VER} in use" fi @@ -703,12 +698,13 @@ create_new_dir "${PORT_WINE_TMP_PATH}"/mono export PW_VULKAN_DIR="${PORT_WINE_TMP_PATH}/VULKAN" create_new_dir "${PW_VULKAN_DIR}" -# export VULKAN_API_VERSION="$(vulkaninfo 2>/dev/null | grep "api" | head -n 1 | awk '{print $3}')" +export VULKAN_API_DRIVER_VERSION="$(vulkaninfo 2>/dev/null | grep "api" | head -n 1 | awk '{print $3}')" +export LSPCI_VGA="$(lspci -k | grep VGA | tr -d '\n')" cd "${PORT_SCRIPTS_PATH}" . "${PORT_SCRIPTS_PATH}/var" -export PW_PLUGINS_PATH="${PORT_WINE_TMP_PATH}/plugins${PW_PLUGINS_VER}" +export PW_PLUGINS_PATH="${PORT_WINE_TMP_PATH}/plugins${PW_PLUGINS_VER}" . "${PORT_SCRIPTS_PATH}"/lang . "${PORT_SCRIPTS_PATH}"/zen_yad_gui diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh index 09a5bdb1..80b74cff 100755 --- a/data_from_portwine/scripts/start.sh +++ b/data_from_portwine/scripts/start.sh @@ -140,8 +140,8 @@ portwine_start_debug () { free -m >> "${PORT_WINE_PATH}/${portname}.log" echo "-----------------------------------------------" >> "${PORT_WINE_PATH}/${portname}.log" echo "Graphic cards and drivers:" >> "${PORT_WINE_PATH}/${portname}.log" - echo 'lspci -k | grep -EA3 VGA|3D|Display:' >> "${PORT_WINE_PATH}/${portname}.log" - echo $(lspci -k | grep -EA3 'VGA|3D|Display') >> "${PORT_WINE_PATH}/${portname}.log" + echo 'lspci | grep VGA:' >> "${PORT_WINE_PATH}/${portname}.log" + echo $LSPCI_VGA >> "${PORT_WINE_PATH}/${portname}.log" [[ `command -v glxinfo` ]] && glxinfo -B >> "${PORT_WINE_PATH}/${portname}.log" echo " " >> "${PORT_WINE_PATH}/${portname}.log" echo "inxi -G:" >> "${PORT_WINE_PATH}/${portname}.log" @@ -438,7 +438,7 @@ pw_autoinstall_from_db () { export PW_GUI_DISABLED_CS=1 export PW_WINEDBG_DISABLE=1 export PW_NO_WRITE_WATCH=0 - export PW_VULKAN_USE=0 + export PW_VULKAN_USE=1 export PW_USE_EAC_AND_BE=0 export PW_NO_FSYNC=1 export PW_NO_ESYNC=1 @@ -504,52 +504,55 @@ done IFS=$IFS_OLD export PW_ADD_PREFIXES_TO_GUI="${PW_PREFIX_NAME^^}${PW_ADD_PREFIXES_TO_GUI}" -PW_ALL_DIST=$(ls "${PORT_WINE_PATH}/data/dist/" | sed -e s/"${PW_PROTON_GE_VER}$//g" | sed -e s/"${PW_PROTON_LG_VER}$//g") +PW_ALL_DIST=$(ls "${PORT_WINE_PATH}/data/dist/" | sed -e s/"${PW_WINE_LG_VER}$//g" | sed -e s/"${PW_PROTON_LG_VER}$//g") unset DIST_ADD_TO_GUI for DAIG in ${PW_ALL_DIST} do export DIST_ADD_TO_GUI="${DIST_ADD_TO_GUI}!${DAIG}" done + +if [[ $VULKAN_API_DRIVER_VERSION == 1.[1-2].* ]] +then check_variables PW_VULKAN_USE "1" +else check_variables PW_VULKAN_USE "2" +fi +check_nvidia_rtx && check_variables PW_VULKAN_USE "2" + +case "${PW_VULKAN_USE}" in + 0) export PW_DEFAULT_VULKAN_USE="${loc_gui_open_gl}!${loc_gui_vulkan_stable}!${loc_gui_vulkan_git}!${loc_gui_gallium_nine}" ;; + 1) export PW_DEFAULT_VULKAN_USE="${loc_gui_vulkan_stable}!${loc_gui_vulkan_git}!${loc_gui_open_gl}!${loc_gui_gallium_nine}" ;; + 3) export PW_DEFAULT_VULKAN_USE="${loc_gui_gallium_nine}!${loc_gui_vulkan_stable}!${loc_gui_vulkan_git}!${loc_gui_open_gl}" ;; + *) export PW_DEFAULT_VULKAN_USE="${loc_gui_vulkan_git}!${loc_gui_vulkan_stable}!${loc_gui_open_gl}!${loc_gui_gallium_nine}" ;; +esac + if [[ -n "${PORTWINE_DB_FILE}" ]] ; then [[ -z "${PW_COMMENT_DB}" ]] && PW_COMMENT_DB="${loc_gui_db_comments} ${PORTWINE_DB}." - if [[ -z "${PW_VULKAN_USE}" || -z "${PW_WINE_USE}" ]] ; then - unset PW_GUI_DISABLED_CS - [[ -z "${PW_VULKAN_USE}" ]] && export PW_VULKAN_USE=2 - fi - case "${PW_VULKAN_USE}" in - 0) export PW_DEFAULT_VULKAN_USE="${loc_gui_open_gl}!${loc_gui_vulkan_stable}!${loc_gui_vulkan_git}!${loc_gui_gallium_nine}" ;; - 1) export PW_DEFAULT_VULKAN_USE="${loc_gui_vulkan_stable}!${loc_gui_vulkan_git}!${loc_gui_open_gl}!${loc_gui_gallium_nine}" ;; - 3) export PW_DEFAULT_VULKAN_USE="${loc_gui_gallium_nine}!${loc_gui_vulkan_stable}!${loc_gui_vulkan_git}!${loc_gui_open_gl}" ;; - *) export PW_DEFAULT_VULKAN_USE="${loc_gui_vulkan_git}!${loc_gui_vulkan_stable}!${loc_gui_open_gl}!${loc_gui_gallium_nine}" ;; - esac if [[ -n $(echo "${PW_WINE_USE}" | grep "^PROTON_LG$") ]] ; then - export PW_DEFAULT_WINE_USE="${PW_PROTON_LG_VER}!${PW_PROTON_GE_VER}${DIST_ADD_TO_GUI}!GET-OTHER-WINE" + export PW_DEFAULT_WINE_USE="${PW_PROTON_LG_VER}!${PW_WINE_LG_VER}${DIST_ADD_TO_GUI}!GET-OTHER-WINE" elif [[ -n $(echo "${PW_WINE_USE}" | grep "^PROTON_GE$") ]] ; then - export PW_DEFAULT_WINE_USE="${PW_PROTON_GE_VER}!${PW_PROTON_LG_VER}${DIST_ADD_TO_GUI}!GET-OTHER-WINE" + export PW_DEFAULT_WINE_USE="${PW_WINE_LG_VER}!${PW_PROTON_LG_VER}${DIST_ADD_TO_GUI}!GET-OTHER-WINE" else if [[ "${PW_WINE_USE}" == "${PW_PROTON_LG_VER}" ]] ; then - export PW_DEFAULT_WINE_USE="${PW_WINE_USE}!${PW_PROTON_GE_VER}${DIST_ADD_TO_GUI}!GET-OTHER-WINE" - elif [[ "${PW_WINE_USE}" == "${PW_PROTON_GE_VER}" ]] ; then + export PW_DEFAULT_WINE_USE="${PW_WINE_USE}!${PW_WINE_LG_VER}${DIST_ADD_TO_GUI}!GET-OTHER-WINE" + elif [[ "${PW_WINE_USE}" == "${PW_WINE_LG_VER}" ]] ; then export PW_DEFAULT_WINE_USE="${PW_WINE_USE}!${PW_PROTON_LG_VER}${DIST_ADD_TO_GUI}!GET-OTHER-WINE" else export DIST_ADD_TO_GUI=$(echo "${DIST_ADD_TO_GUI}" | sed -e s/"\!${PW_WINE_USE}$//g") - export PW_DEFAULT_WINE_USE="${PW_WINE_USE}!${PW_PROTON_GE_VER}!${PW_PROTON_LG_VER}${DIST_ADD_TO_GUI}!GET-OTHER-WINE" + export PW_DEFAULT_WINE_USE="${PW_WINE_USE}!${PW_WINE_LG_VER}!${PW_PROTON_LG_VER}${DIST_ADD_TO_GUI}!GET-OTHER-WINE" fi fi else - export PW_DEFAULT_VULKAN_USE="${loc_gui_vulkan_git}!${loc_gui_vulkan_stable}!${loc_gui_open_gl}!${loc_gui_gallium_nine}" - if [[ -n $(echo "${PW_WINE_USE}" | grep "^PROTON_LG$") ]] ; then - export PW_DEFAULT_WINE_USE="${PW_PROTON_LG_VER}!${PW_PROTON_GE_VER}${DIST_ADD_TO_GUI}!GET-OTHER-WINE" - elif [[ -n $(echo "${PW_WINE_USE}" | grep "^PROTON_GE$") ]] ; then - export PW_DEFAULT_WINE_USE="${PW_PROTON_GE_VER}!${PW_PROTON_LG_VER}${DIST_ADD_TO_GUI}!GET-OTHER-WINE" + if [[ $PW_WINE_USE == PROTON_LG ]] ; then + export PW_DEFAULT_WINE_USE="${PW_PROTON_LG_VER}!${PW_WINE_LG_VER}${DIST_ADD_TO_GUI}!GET-OTHER-WINE" + elif [[ $PW_WINE_USE == WINE_*_LG ]] ; then + export PW_DEFAULT_WINE_USE="${PW_WINE_LG_VER}!${PW_PROTON_LG_VER}${DIST_ADD_TO_GUI}!GET-OTHER-WINE" else if [[ "${PW_WINE_USE}" == "${PW_PROTON_LG_VER}" ]] ; then - export PW_DEFAULT_WINE_USE="${PW_WINE_USE}!${PW_PROTON_GE_VER}${DIST_ADD_TO_GUI}!GET-OTHER-WINE" - elif [[ "${PW_WINE_USE}" == "${PW_PROTON_GE_VER}" ]] ; then + export PW_DEFAULT_WINE_USE="${PW_WINE_USE}!${PW_WINE_LG_VER}${DIST_ADD_TO_GUI}!GET-OTHER-WINE" + elif [[ "${PW_WINE_USE}" == "${PW_WINE_LG_VER}" ]] ; then export PW_DEFAULT_WINE_USE="${PW_WINE_USE}!${PW_PROTON_LG_VER}${DIST_ADD_TO_GUI}!GET-OTHER-WINE" else export DIST_ADD_TO_GUI=$(echo "${DIST_ADD_TO_GUI}" | sed -e s/"\!${PW_WINE_USE}$//g") - export PW_DEFAULT_WINE_USE="${PW_WINE_USE}!${PW_PROTON_GE_VER}!${PW_PROTON_LG_VER}${DIST_ADD_TO_GUI}!GET-OTHER-WINE" + export PW_DEFAULT_WINE_USE="${PW_WINE_USE}!${PW_WINE_LG_VER}!${PW_PROTON_LG_VER}${DIST_ADD_TO_GUI}!GET-OTHER-WINE" fi fi unset PW_GUI_DISABLED_CS @@ -708,7 +711,7 @@ else --field=" $loc_gui_credits"!"$PW_GUI_ICON_PATH/separator.png"!"":"FBTN" '@bash -c "button_click gui_credits"' 2>/dev/null & "${pw_yad_v12_3}" --plug=${KEY} --tabnum=${PW_GUI_SORT_TABS[2]} --form --columns=3 --align-buttons --keep-icon-size --separator=";" \ - --field=" 3D API : :CB" "${loc_gui_vulkan_git}!${loc_gui_vulkan_stable}!${loc_gui_open_gl}!${loc_gui_gallium_nine}" \ + --field=" 3D API : :CB" "${PW_DEFAULT_VULKAN_USE}" \ --field=" PREFIX : :CBE" "${PW_ADD_PREFIXES_TO_GUI}" \ --field=" WINE : :CB" "${PW_DEFAULT_WINE_USE}" \ --field=" DOWNLOAD OTHER WINE"!"$PW_GUI_ICON_PATH/separator.png"!"${loc_download_other_wine}":"FBTN" '@bash -c "button_click gui_proton_downloader"' \ diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index dd6f0a9f..ed8644f2 100755 --- a/data_from_portwine/scripts/var +++ b/data_from_portwine/scripts/var @@ -1,6 +1,6 @@ #!/usr/bin/env bash #Author: Castro-Fidel (linux-gaming.ru) -#SCRIPTS_NEXT_VERSION=2217 +#SCRIPTS_NEXT_VERSION=2218 ######################################################################## export PW_MANGOHUD=0 export MANGOHUD_CONFIG=cpu_stats,cpu_temp,cpu_mhz,cpu_color=2e97cb,cpu_text=CPU,gpu_stats,gpu_temp,gpu_core_clock,gpu_mem_clock,vulkan_driver,gpu_name,gpu_color=2e9762,gpu_text=GPU,vram,vram_color=ad64c1,ram,ram_color=c26693,io_color=a491d3,frame_timing=1,frametime_color=00ff00,time,arch,wine,wine_color=eb5b5b,engine_color=eb5b5b,background_alpha=0.2,font_size=24,background_color=020202,text_color=ffffff,toggle_hud=Shift_R+F12,resolution,vkbasalt @@ -15,7 +15,6 @@ export PW_LOG="0" export PW_USE_TERMINAL="0" export PW_WINEDBG_DISABLE="1" export PW_WINDOWS_VER="10" -export PW_VULKAN_USE="2" export WINEARCH="win64" export PW_LIBS_VER="_v44" export GDK_BACKEND="x11" @@ -42,8 +41,8 @@ export PW_FAKE_DLSS_VER="230506" export PW_LG_VER="8-14" export PW_PROTON_LG_VER="PROTON_LG_${PW_LG_VER}" ###WINE_PROTON_GE### -export PW_GE_VER="8-3" -export PW_PROTON_GE_VER="PROTON_GE_${PW_GE_VER}" +export PW_WINE_LG_VER="8.5" +export PW_WINE_LG_VER="WINE_${PW_WINE_LG_VER}_LG" export PW_WINE_FULLSCREEN_FSR="1" ###DXVK_AND_VKD3D### export VKD3D_LIMIT_TESS_FACTORS="32" diff --git a/data_from_portwine/scripts/zen_yad_gui b/data_from_portwine/scripts/zen_yad_gui index 2859fd25..277aefaa 100755 --- a/data_from_portwine/scripts/zen_yad_gui +++ b/data_from_portwine/scripts/zen_yad_gui @@ -14,10 +14,9 @@ zenity_error () { export -f zenity_error zenity_error_download () { - `zenity --question --title "$loc_gui_error" --text "$loc_gui_error_download\n" --no-wrap --ok-label="Repeat" --cancel-label="Exit" ` + `zenity --question --title "$loc_gui_error" --text "$loc_gui_error_download\n" --no-wrap --ok-label="Repeat" --cancel-label="Skip" ` if [[ "$?" != 0 ]] ; then - stop_portwine - exit 1 + return 1 else return 0 fi @@ -300,7 +299,7 @@ gui_proton_downloader () { for PPWGIT in ${PROTON_PW_GIT[@]} ; do echo ${PPWGIT} | awk -F/ '{print $NF}' | sed 's/.tar.xz//' >> "${PORT_WINE_TMP_PATH}/tmp_proton_pw_git" done - sed -i /${PW_PROTON_GE_VER}/d "${PORT_WINE_TMP_PATH}/tmp_proton_pw_git" + sed -i /${PW_WINE_LG_VER}/d "${PORT_WINE_TMP_PATH}/tmp_proton_pw_git" sed -i '/plugins/d' "${PORT_WINE_TMP_PATH}/tmp_proton_pw_git" fi pw_stop_progress_bar @@ -399,12 +398,12 @@ gui_proton_downloader () { else try_remove_file "${PORT_WINE_PATH}/data/tmp/${PW_WINE_ARCHIVE}.tar.${archive_type}" try_remove_dir "${PORT_WINE_PATH}/data/dist/${PW_WINE_ARCHIVE}" - zenity_error_download && gui_proton_downloader + zenity_error_download && gui_proton_downloader || exit 1 fi fi done else - zenity_error_download && gui_proton_downloader + zenity_error_download && gui_proton_downloader || exit 1 fi if [[ "$1" != "silent" ]] ; then