diff --git a/data_from_portwine/changelog_eng b/data_from_portwine/changelog_eng index 0e35d00c..3e849633 100755 --- a/data_from_portwine/changelog_eng +++ b/data_from_portwine/changelog_eng @@ -2,6 +2,9 @@ You can help us in the development of the project on the website: boosty.to/linu ----------------------------------------- Changelog: +###Scripts version 2156### +* the variable "PW_MANGOHUD_x32" has been added to EDIT_BD, which enables MANGOHUD for 32-bit games (temporary need to bypass the error of MANGOHUD in 64-bit games in some systems) + ###Scripts version 2155### * updated versions: PROTON_LG="7-47" diff --git a/data_from_portwine/changelog_rus b/data_from_portwine/changelog_rus index 0a82eac0..b8e64247 100755 --- a/data_from_portwine/changelog_rus +++ b/data_from_portwine/changelog_rus @@ -2,6 +2,9 @@ ----------------------------------------- История изменений: +###Scripts version 2156### +* в EDIT_BD (НАСТРОЙКИ) добавлена переменная "PW_MANGOHUD_x32" которая включает MANGOHUD для 32-битных игр (временная необходимость для обхода ошибки работы MANGOHUD в 64-битных играх на некоторых системах) + ###Scripts version 2155### * обновлены версии: PROTON_LG="7-47" diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index b982db61..791aad9c 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -454,7 +454,7 @@ pw_init_runtime () { } pw_mangohud_check () { - if [[ "${PW_MANGOHUD}" == "1" ]] ; then + if [[ "${PW_MANGOHUD}" == "1" ]] || [[ "${PW_MANGOHUD_x32}" = "1" ]]; then export PW_MANGOHUD_SLR='MANGOHUD=1' MANGOHUD_LIB_NAME="libMangoHud.so" if [[ "${PW_VULKAN_USE}" = "0" ]] ; then @@ -464,7 +464,10 @@ pw_mangohud_check () { then export PW_LD_PRELOAD="${PW_LD_PRELOAD}:${MANGOHUD_LIB_NAME}" else export PW_LD_PRELOAD="${MANGOHUD_LIB_NAME}" fi - var_vk_istance_layers_config_update "VK_LAYER_MANGOHUD_overlay64:VK_LAYER_MANGOHUD_overlay32" + var_vk_istance_layers_config_update "VK_LAYER_MANGOHUD_overlay64" + if [[ "${PW_MANGOHUD_x32}" = "1" ]] ; then + var_vk_istance_layers_config_update "VK_LAYER_MANGOHUD_overlay32" + fi print_info "MANGOHUD is enabled" else export PW_MANGOHUD_SLR='DISABLE_MANGOHUD=1' @@ -485,7 +488,7 @@ pw_vkbasalt_check () { sed -ri "s/casSharpness .*/casSharpness = ${PW_VKBASALT_FFX_CAS}/g" "${PORT_WINE_PATH}/data/vkBasalt.conf" export VKBASALT_CONFIG_FILE="${PORT_WINE_PATH}/data/vkBasalt.conf" # sed -i s/'> = 0.05;'/'> = 0.035;'/ "${PW_WINELIB}/pressure-vessel/reshade/shaders/FilmGrain2.fx" - var_vk_istance_layers_config_update "VK_LAYER_VKBASALT_post_processing32:VK_LAYER_VKBASALT_post_processing64" + var_vk_istance_layers_config_update "VK_LAYER_VKBASALT_post_processing64:VK_LAYER_VKBASALT_post_processing32" print_info "vkBasalt is enabled" else export DISABLE_VKBASALT=1 diff --git a/data_from_portwine/scripts/lang b/data_from_portwine/scripts/lang index a35b7d43..2c96bf66 100755 --- a/data_from_portwine/scripts/lang +++ b/data_from_portwine/scripts/lang @@ -115,6 +115,7 @@ then export PW_USE_SHADER_CACHE_INFO='Использовать кеширование шейдеров средствами WINE (отключать только при наличии микрофризов в игре)' export PW_WINE_FULLSCREEN_FSR_INFO='Работает во время использования любой версии ProtonGE в полноэкранном режиме при разрешении ниже стандартного для экрана' export PW_USE_FAKE_DLSS_INFO='Включить транслятор DLSS в FSR 2 в играх DirectX 12' + export PW_MANGOHUD_x32_INFO='Включить MANGOHUD для 32 битных приложений и игр' export PW_3DFX_INFO='Имитация старого графического ускорителя 3dfx (добавляет горизонтальные полосы)' export PW_AdaptiveSharpen_INFO='Увеличение резкости, можно использовать совместо с CAS' diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh index 259e0aae..3e051160 100755 --- a/data_from_portwine/scripts/start.sh +++ b/data_from_portwine/scripts/start.sh @@ -404,10 +404,10 @@ pw_create_prefix_backup () { pw_edit_db () { pw_gui_for_edit_db \ - PW_MANGOHUD PW_MANGOHUD_USER_CONF ENABLE_VKBASALT PW_NO_ESYNC PW_NO_FSYNC PW_USE_DXR10 PW_USE_DXR11 PW_USE_NVAPI_AND_DLSS \ - PW_USE_FAKE_DLSS PW_WINE_FULLSCREEN_FSR PW_OLD_GL_STRING PW_HIDE_NVIDIA_GPU PW_VIRTUAL_DESKTOP PW_USE_TERMINAL \ - PW_HEAP_DELAY_FREE PW_GUI_DISABLED_CS PW_USE_GAMEMODE PW_DX12_DISABLE PW_PRIME_RENDER_OFFLOAD PW_USE_D3D_EXTRAS \ - PW_FIX_VIDEO_IN_GAME PW_FORCE_LARGE_ADDRESS_AWARE PW_USE_SHADER_CACHE PW_USE_WINE_DXGI + PW_MANGOHUD PW_MANGOHUD_x32 PW_MANGOHUD_USER_CONF ENABLE_VKBASALT PW_NO_ESYNC PW_NO_FSYNC PW_USE_DXR10 PW_USE_DXR11 \ + PW_USE_NVAPI_AND_DLSS PW_USE_FAKE_DLSS PW_WINE_FULLSCREEN_FSR PW_OLD_GL_STRING PW_HIDE_NVIDIA_GPU PW_VIRTUAL_DESKTOP PW_USE_TERMINAL \ + PW_GUI_DISABLED_CS PW_USE_GAMEMODE PW_DX12_DISABLE PW_PRIME_RENDER_OFFLOAD PW_USE_D3D_EXTRAS PW_FIX_VIDEO_IN_GAME \ + PW_FORCE_LARGE_ADDRESS_AWARE PW_USE_SHADER_CACHE PW_USE_WINE_DXGI if [ "$?" == 0 ] ; then echo "Restarting PP after update ppdb file..." /usr/bin/env bash -c ${pw_full_command_line[*]} & diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index f4e15cb6..1b8e5a5d 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=2155 +#SCRIPTS_NEXT_VERSION=2156 ######################################################################## 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 @@ -29,6 +29,7 @@ export WINE_WIN_START="start /i /b /wait /high /unix" export PW_USE_SHADER_CACHE="1" export STAGING_SHARED_MEMORY="1" export PW_FORCE_LARGE_ADDRESS_AWARE="1" +export PW_MANGOHUD_x32="0" ###DEFAULT_WINE### export PW_WINE_USE="PROTON_LG" export PW_PLUGINS_VER="_v9"