diff --git a/data_from_portwine/changelog_eng b/data_from_portwine/changelog_eng index 1c74c1b..f249f46 100755 --- a/data_from_portwine/changelog_eng +++ b/data_from_portwine/changelog_eng @@ -2,6 +2,22 @@ You can help us in the development of the project on the website: https://linux- ----------------------------------------- Changelog: +###Scripts version 2216### Date: 30.08.2023 / Download update size: 650 megabytes +* updated PROTON_LG to version 8-14 + there is no extra symbol on the screen when starting STEAM_PP + fixed installation of Battle NET (again) +* updated versions: + DXVK_STABLE_VER="2.2-34" + DXVK_GIT_VER="2.2-164" + VKD3D_STABLE_VER="1.1-3445" + VKD3D_GIT_VER="1.1-3556" +* Updated libs_v44 library package: + pressure-vessel 0.20230718.0 + sniper 0.20230718.55074 +* added automatic detection of NVIDIA RTX graphics cards (thanks to Boria138) +* added automatic activation of DLSS and RAY TRACING support for NVIDIA RTX graphics cards +* added check Vulkan API version + ###Scripts version 2215### Date: 18.08.2023 / Update download size: 8 megabytes. * added script mirror: https://gitlab.eterfund.ru/Castro-Fidel/ * creation of third-party (non-working) shortcuts by means of wine is disabled (when using wine versions other than proton) diff --git a/data_from_portwine/changelog_rus b/data_from_portwine/changelog_rus index 611ef53..5205a09 100755 --- a/data_from_portwine/changelog_rus +++ b/data_from_portwine/changelog_rus @@ -2,6 +2,22 @@ ----------------------------------------- История изменений: +###Scripts version 2216### Дата: 30.08.2023 / Размер скачиваемого обновления: 650 мегабайт +* обновлен PROTON_LG до версии 8-14: + нет лишнего символа, на экране, при запуске STEAM_PP + исправлена установка BattleNET (еще раз) +* обновлены версии: + DXVK_STABLE_VER="2.2-34" + DXVK_GIT_VER="2.2-164" + VKD3D_STABLE_VER="1.1-3445" + VKD3D_GIT_VER="1.1-3556" +* Обновлен пакет библиотек libs_v44: + pressure-vessel 0.20230718.0 + sniper 0.20230718.55074 +* добавлено автоматическое определение видеокарт NVIDIA RTX (спасибо Boria138) +* добавлено автоматическое включение поддержки DLSS и RAY TRACING для видеокарт NVIDIA RTX +* добавлена проверка на версию Vulkan API для совместимости с видеокарами без Vulkan API 1.3 + ###Scripts version 2215### Дата: 18.08.2023 / Размер скачиваемого обновления: 8 мегабайт * добавлено зеркало скриптов: https://gitlab.eterfund.ru/Castro-Fidel/ * отключено создание сторонних (не работающих) ярлыков средствами wine (при использовании версий wine отличных от proton) diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index 27df0ef..e4cb5d8 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -299,12 +299,10 @@ check_user_conf () { echo "# export DXVK_HUD=full" >> "${USER_CONF}" echo "# export GALLIUM_HUD=fps" >> "${USER_CONF}" echo "export optirun_on= #nvidia-prime-run or prime-run" >> "${USER_CONF}" - chmod u+x "${USER_CONF}" else grep "optirun_on" "${USER_CONF}" >/dev/null [[ "$?" != 0 ]] && echo "export optirun_on=" >> "${USER_CONF}" fi - return 0 } init_wine_ver () { @@ -793,6 +791,22 @@ pw_check_and_download_plugins () { return 0 } +nvidia_check_rtx () { + lspci_output=$(lspci | grep VGA) + if echo "$lspci_output" | 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 + # Ampere + nv_arch=$(echo "$lspci_output" | sed -rn 's/.*(GA[0-9]*).*/\1/p') + [[ $nv_arch == 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 + fi + return 1 +} + pw_init_db () { if [[ ! -z "${portwine_exe}" ]] ; then try_remove_file "${PORT_SCRIPTS_PATH}/portwine_db/setup" @@ -848,13 +862,19 @@ pw_init_db () { if [[ "${PW_WINE_CPU_TOPOLOGY}" == "disabled" ]] && [[ -n "${WINE_CPU_TOPOLOGY}" ]] ; then export PW_WINE_CPU_TOPOLOGY="${WINE_CPU_TOPOLOGY}" fi - if ls "${PATH_TO_GAME}"/*_Data/Resources/ 2>/dev/null | grep "unity" &>/dev/null && \ - [[ "${PW_WINE_CPU_TOPOLOGY}" == "disabled" ]] && \ - [[ $(grep -c "^processor" /proc/cpuinfo) -gt "8" ]] + if ls "${PATH_TO_GAME}"/*_Data/Resources/ 2>/dev/null | grep "unity" &>/dev/null \ + && [[ "${PW_WINE_CPU_TOPOLOGY}" == "disabled" ]] \ + && [[ $(grep -c "^processor" /proc/cpuinfo) -gt "8" ]] then export PW_WINE_CPU_TOPOLOGY="8:0,1,2,3,4,5,6,7" 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 + fi fi return 0 } @@ -1061,84 +1081,3 @@ pw_find_exe () { exit 0 fi } - -nvidia_check_arch() { - lspci_output=$(lspci | grep VGA) - if echo "$lspci_output" | grep -i "nvidia"; then - arch=$(echo "$lspci_output" | sed -rn 's/.*(G[0-9]*).*/\1/p') - if [[ $arch == G[0-9]* ]]; then - nv_arch=Tesla - fi - - arch=$(echo "$lspci_output" | sed -rn 's/.*(GT[0-9]*).*/\1/p') - if [[ $arch == GT[0-9]* ]]; then - nv_arch=Tesla - fi - - arch=$(echo "$lspci_output" | sed -rn 's/.*(MCP[0-9]*).*/\1/p') - if [[ $arch == MCP[0-9]* ]]; then - nv_arch=Tesla - fi - - arch=$(echo "$lspci_output" | sed -rn 's/.*(GF[0-9]*).*/\1/p') - if [[ $arch == GF[0-9]* ]]; then - nv_arch=Fermi - fi - - arch=$(echo "$lspci_output" | sed -rn 's/.*(GK[0-9]*).*/\1/p') - if [[ $arch == GK[0-9]* ]]; then - nv_arch=Kepler - fi - - arch=$(echo "$lspci_output" | sed -rn 's/.*(GM[0-9]*).*/\1/p') - if [[ $arch == GM[0-9]* ]]; then - nv_arch=Maxwell - fi - - arch=$(echo "$lspci_output" | sed -rn 's/.*(GP[0-9]*).*/\1/p') - if [[ $arch == GP[0-9]* ]]; then - nv_arch=Pascal - fi - - arch=$(echo "$lspci_output" | sed -rn 's/.*(GV[0-9]*).*/\1/p') - if [[ $arch == GV[0-9]* ]]; then - nv_arch=Volta - fi - - arch=$(echo "$lspci_output" | sed -rn 's/.*(TU[0-9]*).*/\1/p') - if [[ $arch == TU[0-9]* ]]; then - nv_arch=Turing - fi - - arch=$(echo "$lspci_output" | sed -rn 's/.*(TU116).*/\1/p') - if [[ $arch == TU116 ]]; then - nv_arch=Turing_16 - fi - - arch=$(echo "$lspci_output" | sed -rn 's/.*(TU117).*/\1/p') - if [[ $arch == TU117 ]]; then - nv_arch=Turing_16 - fi - - arch=$(echo "$lspci_output" | sed -rn 's/.*(GA[0-9]*).*/\1/p') - if [[ $arch == GA[0-9]* ]]; then - nv_arch=Ampere - fi - - arch=$(echo "$lspci_output" | sed -rn 's/.*(AD[0-9]*).*/\1/p') - if [[ $arch == AD[0-9]* ]]; then - nv_arch=Ada_Lovelace - fi - fi -} - -nvidia_check_arch - -# Check for Nvidia GPU available -if [[ -n "$nv_arch" ]]; then - if [[ $nv_arch == Turing || $nv_arch == Ampere || $nv_arch == Ada_Lovelace ]]; then - export PW_USE_NVAPI_AND_DLSS=1 - else - exit 0 - fi -fi diff --git a/data_from_portwine/scripts/portwine_db/ALOTInstaller b/data_from_portwine/scripts/portwine_db/ALOTInstaller index 30d4494..c4af41d 100755 --- a/data_from_portwine/scripts/portwine_db/ALOTInstaller +++ b/data_from_portwine/scripts/portwine_db/ALOTInstaller @@ -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_PW_6.19 export PW_VULKAN_USE=0 ##export PW_DXR_ON=1 ##export PW_DLSS_ON=1 diff --git a/data_from_portwine/scripts/portwine_db/AliceMadnessReturns b/data_from_portwine/scripts/portwine_db/AliceMadnessReturns index 08b19f8..c59f5f1 100755 --- a/data_from_portwine/scripts/portwine_db/AliceMadnessReturns +++ b/data_from_portwine/scripts/portwine_db/AliceMadnessReturns @@ -3,6 +3,4 @@ #AliceMadnessReturns.exe #Rating=5 ################################################ -export PW_VULKAN_USE=dxvk -export LAUNCH_PARAMETERS="" export PW_DLL_INSTALL="physx" diff --git a/data_from_portwine/scripts/portwine_db/Alien_Isolation b/data_from_portwine/scripts/portwine_db/Alien_Isolation deleted file mode 100755 index e199f42..0000000 --- a/data_from_portwine/scripts/portwine_db/Alien_Isolation +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash -#Author: garrett -#AI.exe -#Rating=5 -######################################################## -export PW_VULKAN_USE=dxvk diff --git a/data_from_portwine/scripts/portwine_db/Aliens Colonial Marines b/data_from_portwine/scripts/portwine_db/Aliens Colonial Marines deleted file mode 100755 index 50a579f..0000000 --- a/data_from_portwine/scripts/portwine_db/Aliens Colonial Marines +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash -#Author: -#ACM.exe -#Rating=? -################################################ -export LAUNCH_PARAMETERS="" diff --git a/data_from_portwine/scripts/portwine_db/AssassinsCreedII b/data_from_portwine/scripts/portwine_db/AssassinsCreedII deleted file mode 100755 index 0eb32f7..0000000 --- a/data_from_portwine/scripts/portwine_db/AssassinsCreedII +++ /dev/null @@ -1,35 +0,0 @@ -#!/usr/bin/env bash -#Author: xuser -#AssassinsCreedII.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=dxvk -##export PW_DXR_ON=1 -##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN -##export PW_USE_NVAPI=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 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 ; } diff --git a/data_from_portwine/scripts/portwine_db/AssassinsCreedIIGame b/data_from_portwine/scripts/portwine_db/AssassinsCreedIIGame deleted file mode 100755 index 88e0c0f..0000000 --- a/data_from_portwine/scripts/portwine_db/AssassinsCreedIIGame +++ /dev/null @@ -1,35 +0,0 @@ -#!/usr/bin/env bash -#Author: xuser -#AssassinsCreedIIGame.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=dxvk -##export PW_DXR_ON=1 -##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN -##export PW_USE_NVAPI=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 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 ; } diff --git a/data_from_portwine/scripts/portwine_db/BF2 b/data_from_portwine/scripts/portwine_db/BF2 index 906de08..0d55f88 100755 --- a/data_from_portwine/scripts/portwine_db/BF2 +++ b/data_from_portwine/scripts/portwine_db/BF2 @@ -3,5 +3,4 @@ #BF2.exe #Rating=4 ################################################ -export PW_VULKAN_USE=vkd3d export PW_WINDOWS_VER="7" diff --git a/data_from_portwine/scripts/portwine_db/Battle.net_Launcher b/data_from_portwine/scripts/portwine_db/Battle.net_Launcher index c6a025d..f8af8f3 100755 --- a/data_from_portwine/scripts/portwine_db/Battle.net_Launcher +++ b/data_from_portwine/scripts/portwine_db/Battle.net_Launcher @@ -20,5 +20,5 @@ add_in_start_portwine () { rm -fr "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/users/${USER}/Blizzard Entertainment/Battle.net/Cache" rm -fr "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/users/Public/Blizzard Entertainment/Battle.net/Cache" try_remove_file "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/Fonts/sourcehansans.ttc" - sed -i 's/"GrabFullscreen"="Y"/"GrabFullscreen"="N"/' "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/user.reg" + # sed -i 's/"GrabFullscreen"="Y"/"GrabFullscreen"="N"/' "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/user.reg" } diff --git a/data_from_portwine/scripts/portwine_db/GalaxyClient b/data_from_portwine/scripts/portwine_db/GalaxyClient index 89ee288..76e5d1e 100755 --- a/data_from_portwine/scripts/portwine_db/GalaxyClient +++ b/data_from_portwine/scripts/portwine_db/GalaxyClient @@ -5,7 +5,6 @@ #Rating=1-5 ################################################ export PW_VULKAN_USE=1 -export PW_WINE_USE=PROTON_GE export WINEDLLOVERRIDES="galaxycommunication.exe=n;libglesv2=" export LAUNCH_PARAMETERS="/runWithoutUpdating /deelevated" export PW_DLL_INSTALL="vcrun2019" diff --git a/data_from_portwine/scripts/portwine_db/GameCenter b/data_from_portwine/scripts/portwine_db/GameCenter deleted file mode 100755 index 9ad6967..0000000 --- a/data_from_portwine/scripts/portwine_db/GameCenter +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash -#Author: fff555 -#GameCenter.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_LG_6.3-8C_PW2 -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 -##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/GameLauncher b/data_from_portwine/scripts/portwine_db/GameLauncher deleted file mode 100755 index fae72d4..0000000 --- a/data_from_portwine/scripts/portwine_db/GameLauncher +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/env bash -#Author: xuser -#GameLauncher.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_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 -##export PW_VIRTUAL_DESKTOP=1 -##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=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/ghost b/data_from_portwine/scripts/portwine_db/ghost deleted file mode 100755 index a06f11d..0000000 --- a/data_from_portwine/scripts/portwine_db/ghost +++ /dev/null @@ -1,35 +0,0 @@ -#!/usr/bin/env bash -#Author: spider -#ghost.exe -#Rating=1-5 -######################################################## -export PW_VULKAN_USE=dxvk -export PW_WINE_USE=proton_ge -#####################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_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=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 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 ; } diff --git a/data_from_portwine/scripts/portwine_db/gta3 b/data_from_portwine/scripts/portwine_db/gta3 index c6a437f..4a6110b 100755 --- a/data_from_portwine/scripts/portwine_db/gta3 +++ b/data_from_portwine/scripts/portwine_db/gta3 @@ -8,7 +8,6 @@ export PW_WINDOWS_VER=XP # Set windows version 10, 7 or X ##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_WINE_USE=PROTON_GE_7.1-2 export PW_VULKAN_USE=0 export PW_USE_DXR10=0 ##export PW_DLSS_ON=1 diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_EAAPP b/data_from_portwine/scripts/pw_autoinstall/PW_EAAPP index 3ab9273..f3b1e9f 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_EAAPP +++ b/data_from_portwine/scripts/pw_autoinstall/PW_EAAPP @@ -14,7 +14,7 @@ start_portwine if try_download "origin-a.akamaihd.net/EA-Desktop-Client-Download/installer-releases/EAappInstaller.exe" "${PW_AUTOINSTALL_EXE}" then pw_start_progress_bar_block "${loc_gui_installing_the} EA Launcher. ${loc_gui_please_wait} " - # pw_kill_autostart EABackgroundService.exe & + pw_kill_autostart EABackgroundService.exe & # pw_kill_autostart EALocalHostSvc.exe & mkdir -p "$WINEPREFIX/drive_c/Program Files/Electronic Arts/EA Desktop/EA Desktop" pw_run "${PW_AUTOINSTALL_EXE}" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_ROBLOX b/data_from_portwine/scripts/pw_autoinstall/PW_ROBLOX index ec81694..9f1c434 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_ROBLOX +++ b/data_from_portwine/scripts/pw_autoinstall/PW_ROBLOX @@ -7,8 +7,8 @@ export PW_AUTOINSTALL_EXE="${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/dri export WINEDLLOVERRIDES="mscoree,mshtml=" # export DISABLE_CP_DEFPFX=1 export PW_MUST_HAVE_DLL="" -export PW_WINE_USE="WINE-8.8-STAGING-TKG-AMD64" -gui_proton_downloader silent "WINE-8.8-STAGING-TKG-AMD64" +# export PW_WINE_USE="WINE-8.8-STAGING-TKG-AMD64" +# gui_proton_downloader silent "WINE-8.8-STAGING-TKG-AMD64" start_portwine if try_download "setup.rbxcdn.com/RobloxPlayerLauncher.exe" "${PW_AUTOINSTALL_EXE}" diff --git a/data_from_portwine/scripts/runlib b/data_from_portwine/scripts/runlib index 6284a6e..70a512c 100755 --- a/data_from_portwine/scripts/runlib +++ b/data_from_portwine/scripts/runlib @@ -67,7 +67,7 @@ start_portwine () { export DXVK_LOG_LEVEL="warn" export VKD3D_DEBUG="warn" export WINE_MONO_TRACE="E:System.NotImplementedException" - export VK_LOADER_DEBUG="warn" + export VK_LOADER_DEBUG="none" export VKBASALT_LOG_LEVEL="warn" export DXVK_NVAPI_LOG_LEVEL=warn else @@ -164,12 +164,6 @@ start_portwine () { var_winedlloverride_update "nvngx,_nvngx=" fi - grep '"renderer"=' "${WINEPREFIX}/user.reg" &>/dev/null - if [[ "$?" == 0 ]] ; then - sed -i /'"renderer"='/d "${WINEPREFIX}/user.reg" &>/dev/null - sed -i /'renderer='/d "${WINEPREFIX}/winetricks.log" &>/dev/null - fi - if [[ ! -z "${optirun_on}" && "${optirun_on}" != "" ]] ; then export PW_PRIME_RENDER_OFFLOAD=1 print_info "force PW_PRIME_RENDER_OFFLOAD=1" @@ -207,11 +201,11 @@ start_portwine () { case "$PW_FORCE_USE_VSYNC" in # 0-FORCE_OFF, 1-FORCE_ON, 2-BY_DEFAULT "0") - unset vblank_mode - unset __GL_SYNC_TO_VBLANK ;; + unset vblank_mode + unset __GL_SYNC_TO_VBLANK ;; "1") - export vblank_mode=1 - export __GL_SYNC_TO_VBLANK=1 ;; + export vblank_mode=1 + export __GL_SYNC_TO_VBLANK=1 ;; esac export int_xneur=0 if [[ ! -z "`pgrep xneur`" ]]; then @@ -427,12 +421,12 @@ start_portwine () { else print_info "Use VKD3D-PROTON, DXVK and D8VK (DirectX to vulkan)" if [[ "${PW_USE_WINE_DXGI}" == 1 ]] ; then - export CP_DXVK_FILES="d3d11 d3d10core d3d9 dxvk_config openvr_api_dxvk" + export CP_DXVK_FILES="d3d11 d3d10core d3d9 dxvk_config" # openvr_api_dxvk var_winedlloverride_update dxgi=b elif [[ "${USE_ALL_DXVK_DLLS}" == 1 ]] ; then - export CP_DXVK_FILES="d3d11 d3d10core d3d10_1 d3d10 d3d9 dxgi dxvk_config openvr_api_dxvk" + export CP_DXVK_FILES="d3d11 d3d10core d3d10_1 d3d10 d3d9 dxgi dxvk_config" # openvr_api_dxvk else - export CP_DXVK_FILES="d3d11 d3d10core d3d9 dxgi dxvk_config openvr_api_dxvk" + export CP_DXVK_FILES="d3d11 d3d10core d3d9 dxgi dxvk_config" # openvr_api_dxvk fi if [[ "${PW_VULKAN_USE}" == "1" ]] ; then PATH_TO_DXVK_FILES="${PW_VULKAN_DIR}/dxvk-${DXVK_STABLE_VER}" @@ -456,13 +450,11 @@ start_portwine () { done print_info "Try link native VKD3D files..." - for wine_vkd3d_dll in d3d12 d3d12core libvkd3d-shader-1 libvkd3d-proton-utils-3 libvkd3d-1 ; do + # libvkd3d-proton-utils- + for wine_vkd3d_dll in d3d12 d3d12core libvkd3d-1 libvkd3d-shader-1; do if [[ -f "${PATH_TO_VKD3D_FILES}/x64/${wine_vkd3d_dll}.dll" ]] ; then try_force_link_file "${PATH_TO_VKD3D_FILES}/x86/${wine_vkd3d_dll}.dll" "${WINEPREFIX}/drive_c/windows/syswow64/${wine_vkd3d_dll}.dll" try_force_link_file "${PATH_TO_VKD3D_FILES}/x64/${wine_vkd3d_dll}.dll" "${WINEPREFIX}/drive_c/windows/system32/${wine_vkd3d_dll}.dll" - else - try_force_link_file "${WINEDIR}/lib/vkd3d/${wine_vkd3d_dll}.dll" "${WINEPREFIX}/drive_c/windows/syswow64/${wine_vkd3d_dll}.dll" - try_force_link_file "${WINEDIR}/lib64/vkd3d/${wine_vkd3d_dll}.dll" "${WINEPREFIX}/drive_c/windows/system32/${wine_vkd3d_dll}.dll" fi done @@ -711,6 +703,9 @@ 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}')" +print_var VULKAN_API_VERSION + cd "${PORT_SCRIPTS_PATH}" . "${PORT_SCRIPTS_PATH}/var" diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index 2526545..5825128 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=2215 +#SCRIPTS_NEXT_VERSION=2216 ######################################################################## 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 @@ -16,7 +16,7 @@ export PW_USE_TERMINAL="0" export PW_WINEDBG_DISABLE="1" export PW_WINDOWS_VER="10" export WINEARCH="win64" -export PW_LIBS_VER="_v43" +export PW_LIBS_VER="_v44" export GDK_BACKEND="x11" export PW_USE_GSTREAMER="1" export PW_USE_D3D_EXTRAS="1" @@ -38,20 +38,24 @@ export PW_WINE_USE="PROTON_LG" export PW_PLUGINS_VER="_v12" export PW_FAKE_DLSS_VER="230506" ###WINE_PROTON_LG### -export PW_LG_VER="8-11" +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_FULLSCREEN_FSR="1" ###DXVK_AND_VKD3D### -export VKD3D_FEATURE_LEVEL="12_0" -# export VKD3D_LIMIT_TESS_FACTORS="16" +export VKD3D_LIMIT_TESS_FACTORS="32" export D8VK_VER="1.0" -export DXVK_STABLE_VER="1.10.3-28" -export DXVK_GIT_VER="2.2-137" -export VKD3D_STABLE_VER="1.1-2602" -export VKD3D_GIT_VER="1.1-3516" +if [[ $VULKAN_API_VERSION == 1.2.* ]] ; then + export DXVK_STABLE_VER="1.10.3-28" + export VKD3D_STABLE_VER="1.1-2602" +else + export DXVK_STABLE_VER="2.2-34" + export VKD3D_STABLE_VER="1.1-3445" +fi +export DXVK_GIT_VER="2.2-164" +export VKD3D_GIT_VER="1.1-3556" ###PREFIX_VERSION### export DOTPFX_VER="48v1" export DEFPFX_VER="v1" @@ -64,7 +68,7 @@ export DXVK_CONFIG_FILE="${PORT_WINE_PATH}/data/dxvk.conf" pw_install_dll_in_prefix () { case $PW_PREFIX_NAME in - DEFAULT) export PW_MUST_HAVE_DLL="d3dx9 d3dcompiler_43 physx mfc42 vcrun2022" ;; + DEFAULT) export PW_MUST_HAVE_DLL="d3dx9 d3dcompiler_43 physx mfc42 vcrun2022 sandbox" ;; DOTNET) export PW_MUST_HAVE_DLL="physx mfc42 vcrun2019 faudio dotnet48" ;; *) export PW_MUST_HAVE_DLL="" ;; esac