From 7dc1358a8564f52bf79823a8d30ab112b4859d8e Mon Sep 17 00:00:00 2001 From: Arta48 Date: Mon, 22 Jan 2024 15:09:20 +0300 Subject: [PATCH 1/4] Add PW_VKBASALT_USER_CONF and Fix quotes in vkBasalt.conf --- data_from_portwine/scripts/functions_helper | 14 +++++--------- data_from_portwine/scripts/lang | 2 ++ data_from_portwine/scripts/runlib | 1 + data_from_portwine/scripts/start.sh | 4 ++-- data_from_portwine/scripts/var | 6 ++++-- 5 files changed, 14 insertions(+), 13 deletions(-) diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index 76ec408a..36a5cc46 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -532,16 +532,12 @@ pw_mangohud_check () { pw_vkbasalt_check () { if [[ "${ENABLE_VKBASALT}" == 1 ]] && [[ "${PW_VULKAN_USE}" != "0" ]] && [[ "${PW_VULKAN_USE}" != "3" ]] ; then - export VKBASALT_CONFIG_FILE="${PORT_WINE_PATH}/data/vkBasalt.conf" - if [[ -z "${PW_VKBASALT_EFFECTS}" ]] ; then - export PW_VKBASALT_EFFECTS="Curves:cas" + if [ ! -z "${PW_VKBASALT_EFFECTS}" ] && [ ! -z "${PW_VKBASALT_FFX_CAS}" ]; then + export VKBASALT_CONFIG_FILE="${PORT_WINE_PATH}/data/vkBasalt.conf" + sed -ri "s/effects = .*/effects = ${PW_VKBASALT_EFFECTS}/g" "${VKBASALT_CONFIG_FILE}" + sed -ri "s/casSharpness .*/casSharpness = ${PW_VKBASALT_FFX_CAS}/g" "${VKBASALT_CONFIG_FILE}" + sed -ri "s|= .*/reshade|= \"${PW_WINELIB}\"/pressure-vessel/reshade|g" "${VKBASALT_CONFIG_FILE}" fi - sed -ri "s/effects = .*/effects = ${PW_VKBASALT_EFFECTS}/g" "${VKBASALT_CONFIG_FILE}" - if [[ -z "${PW_VKBASALT_FFX_CAS}" ]] ; then - export PW_VKBASALT_FFX_CAS="0.7" - fi - sed -ri "s/casSharpness .*/casSharpness = ${PW_VKBASALT_FFX_CAS}/g" "${VKBASALT_CONFIG_FILE}" - sed -ri "s|= .*/reshade|= \"${PW_WINELIB}/pressure-vessel/reshade\"|g" "${VKBASALT_CONFIG_FILE}" var_vk_istance_layers_config_update "VK_LAYER_VKBASALT_post_processing64:VK_LAYER_VKBASALT_post_processing32" print_info "vkBasalt is enabled" else diff --git a/data_from_portwine/scripts/lang b/data_from_portwine/scripts/lang index 14877238..3a4b125a 100755 --- a/data_from_portwine/scripts/lang +++ b/data_from_portwine/scripts/lang @@ -140,6 +140,7 @@ if [[ "${update_loc}" == "RUS" ]] ; then export PW_USE_GAMEMODE_INFO='Использование автоматической оптимизации системы для увеличения производительности в играх (при условии установленного пакета gamemode в системе)' export PW_USE_WINE_DXGI_INFO='Принудительное использование встроенной библиотеки DXGI (в редких случаях решает проблемы с запуском игр под DX12)' export PW_MANGOHUD_USER_CONF_INFO='Принудительное использование системных настроек MANGOHUD (GOverlay и т.п.)' + export PW_VKBASALT_USER_CONF_INFO='Принудительное использование системных настроек VKBASALT (GOverlay и т.п.)' export PW_USE_D3D_EXTRAS_INFO='Включить принудительное использование сторонних библиотек DirectX' export PW_USE_WINDOWS_7_INFO='Изменить версию WINDOWS 10 на WINDOWS 7 в префиксе' export PW_USE_SHADER_CACHE_INFO='Использовать кеширование шейдеров средствами WINE (отключать только при наличии микрофризов в игре)' @@ -541,6 +542,7 @@ elif [[ "${update_loc}" == "ENG" ]] ; then export PW_USE_GAMEMODE_INFO='Using automatic system optimization to improve performance in games (provided the gamemode package is installed on the system)' export PW_USE_WINE_DXGI_INFO='Forced use of built-in DXGI library (in rare cases it solves problems with DX12 games)' export PW_MANGOHUD_USER_CONF_INFO='Forced use of MANGOHUD system settings (GOverlay, etc.)' + export PW_VKBASALT_USER_CONF_INFO='Forced use of VKBASALT system settings (GOverlay, etc.)' export PW_USE_D3D_EXTRAS_INFO='Enable forced use of third-party DirectX libraries' export PW_USE_WINDOWS_7_INFO='Change the version of WINDOWS 10 to WINDOWS 7 in the prefix' export PW_USE_SHADER_CACHE_INFO='Use WINE shader caching (disable only if there are microfreezes in the game)' diff --git a/data_from_portwine/scripts/runlib b/data_from_portwine/scripts/runlib index eb493fad..c8c2b673 100755 --- a/data_from_portwine/scripts/runlib +++ b/data_from_portwine/scripts/runlib @@ -203,6 +203,7 @@ start_portwine () { fi [[ "${PW_MANGOHUD_USER_CONF}" == 1 ]] && unset MANGOHUD_CONFIG + [[ "${PW_VKBASALT_USER_CONF}" == 1 ]] && unset PW_VKBASALT_EFFECTS && unset PW_VKBASALT_FFX_CAS if [[ "${PW_USE_DXR11}" == 1 ]] || [[ "${PW_USE_DXR10}" == 1 ]] || [[ "${PW_USE_RAY_TRACING}" == 1 ]]; then var_vkd3d_config_update dxr,dxr11 diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh index 93249984..9cbd1fa4 100755 --- a/data_from_portwine/scripts/start.sh +++ b/data_from_portwine/scripts/start.sh @@ -462,14 +462,14 @@ pw_create_prefix_backup () { pw_edit_db () { if [[ "${XDG_SESSION_TYPE}" == "wayland" ]] ; then pw_gui_for_edit_db \ - PW_MANGOHUD PW_MANGOHUD_USER_CONF ENABLE_VKBASALT PW_NO_ESYNC PW_NO_FSYNC PW_USE_RAY_TRACING \ + PW_MANGOHUD PW_MANGOHUD_USER_CONF ENABLE_VKBASALT PW_VKBASALT_USER_CONF PW_NO_ESYNC PW_NO_FSYNC PW_USE_RAY_TRACING \ PW_USE_NVAPI_AND_DLSS PW_USE_FAKE_DLSS PW_WINE_FULLSCREEN_FSR PW_HIDE_NVIDIA_GPU PW_VIRTUAL_DESKTOP PW_USE_TERMINAL \ PW_GUI_DISABLED_CS PW_USE_GAMEMODE PW_USE_D3D_EXTRAS PW_FIX_VIDEO_IN_GAME PW_REDUCE_PULSE_LATENCY \ PW_USE_GSTREAMER PW_FORCE_LARGE_ADDRESS_AWARE PW_USE_SHADER_CACHE \ PW_USE_WINE_DXGI PW_USE_EAC_AND_BE PW_USE_SYSTEM_VK_LAYERS PW_USE_OBS_VKCAPTURE PW_USE_GALLIUM_ZINK PW_USE_GAMESCOPE else pw_gui_for_edit_db \ - PW_MANGOHUD PW_MANGOHUD_USER_CONF ENABLE_VKBASALT PW_NO_ESYNC PW_NO_FSYNC PW_USE_RAY_TRACING \ + PW_MANGOHUD PW_MANGOHUD_USER_CONF ENABLE_VKBASALT PW_VKBASALT_USER_CONF PW_NO_ESYNC PW_NO_FSYNC PW_USE_RAY_TRACING \ PW_USE_NVAPI_AND_DLSS PW_USE_FAKE_DLSS PW_WINE_FULLSCREEN_FSR PW_HIDE_NVIDIA_GPU PW_VIRTUAL_DESKTOP PW_USE_TERMINAL \ PW_GUI_DISABLED_CS PW_USE_GAMEMODE PW_USE_D3D_EXTRAS PW_FIX_VIDEO_IN_GAME \ PW_REDUCE_PULSE_LATENCY PW_USE_US_LAYOUT PW_USE_GSTREAMER PW_FORCE_LARGE_ADDRESS_AWARE PW_USE_SHADER_CACHE \ diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index ba5ffcc2..ed84936f 100755 --- a/data_from_portwine/scripts/var +++ b/data_from_portwine/scripts/var @@ -2,8 +2,10 @@ #Author: Castro-Fidel (linux-gaming.ru) #SCRIPTS_NEXT_VERSION=2246 ######################################################################## -export PW_MANGOHUD=0 -export DEFAULT_MANGOHUD_CONFIG=cpu_stats,cpu_temp,cpu_mhz,gpu_stats,gpu_temp,gpu_core_clock,gpu_mem_clock,vulkan_driver,gpu_name,vram,ram,frame_timing=1,time,arch,wine,toggle_hud=Shift_R+F12,resolution,vkbasalt,gamemode +export PW_MANGOHUD="0" +export DEFAULT_MANGOHUD_CONFIG="cpu_stats,cpu_temp,cpu_mhz,gpu_stats,gpu_temp,gpu_core_clock,gpu_mem_clock,vulkan_driver,gpu_name,vram,ram,frame_timing=1,time,arch,wine,toggle_hud=Shift_R+F12,resolution,vkbasalt,gamemode" +export PW_VKBASALT_EFFECTS="Curves:cas" +export PW_VKBASALT_FFX_CAS="0.75" export PW_RT_MOUNT_RO=("") export PW_RT_MOUNT_RW=("/media" "/mnt" "/run/media/${USER}" "${PORT_WINE_PATH}") #export PW_SANDBOX_HOME_PATH="${PORT_WINE_PATH}" From 6569e52e89d7fdf517c7d8244ddff8b642f3c0d6 Mon Sep 17 00:00:00 2001 From: Arta <63291774+Arta48@users.noreply.github.com> Date: Mon, 22 Jan 2024 16:40:43 +0300 Subject: [PATCH 2/4] Fix --- data_from_portwine/scripts/functions_helper | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index 36a5cc46..d0721cea 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -532,7 +532,7 @@ pw_mangohud_check () { pw_vkbasalt_check () { if [[ "${ENABLE_VKBASALT}" == 1 ]] && [[ "${PW_VULKAN_USE}" != "0" ]] && [[ "${PW_VULKAN_USE}" != "3" ]] ; then - if [ ! -z "${PW_VKBASALT_EFFECTS}" ] && [ ! -z "${PW_VKBASALT_FFX_CAS}" ]; then + if [[ ! -z "${PW_VKBASALT_EFFECTS}" ]] && [[ ! -z "${PW_VKBASALT_FFX_CAS}" ]] ; then export VKBASALT_CONFIG_FILE="${PORT_WINE_PATH}/data/vkBasalt.conf" sed -ri "s/effects = .*/effects = ${PW_VKBASALT_EFFECTS}/g" "${VKBASALT_CONFIG_FILE}" sed -ri "s/casSharpness .*/casSharpness = ${PW_VKBASALT_FFX_CAS}/g" "${VKBASALT_CONFIG_FILE}" From d20fdfd0879530786ff522848b7996d4b1cfb8e9 Mon Sep 17 00:00:00 2001 From: Arta <63291774+Arta48@users.noreply.github.com> Date: Mon, 22 Jan 2024 17:04:30 +0300 Subject: [PATCH 3/4] Fix --- data_from_portwine/scripts/runlib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data_from_portwine/scripts/runlib b/data_from_portwine/scripts/runlib index c8c2b673..1b2473e2 100755 --- a/data_from_portwine/scripts/runlib +++ b/data_from_portwine/scripts/runlib @@ -203,7 +203,7 @@ start_portwine () { fi [[ "${PW_MANGOHUD_USER_CONF}" == 1 ]] && unset MANGOHUD_CONFIG - [[ "${PW_VKBASALT_USER_CONF}" == 1 ]] && unset PW_VKBASALT_EFFECTS && unset PW_VKBASALT_FFX_CAS + [[ "${PW_VKBASALT_USER_CONF}" == 1 ]] && unset PW_VKBASALT_EFFECTS PW_VKBASALT_FFX_CAS if [[ "${PW_USE_DXR11}" == 1 ]] || [[ "${PW_USE_DXR10}" == 1 ]] || [[ "${PW_USE_RAY_TRACING}" == 1 ]]; then var_vkd3d_config_update dxr,dxr11 From acc28326490c85b4cba551dbe9d0f6f7055b1016 Mon Sep 17 00:00:00 2001 From: Arta48 Date: Mon, 22 Jan 2024 21:44:47 +0300 Subject: [PATCH 4/4] Move Default Gamescope Args --- data_from_portwine/scripts/functions_helper | 2 -- data_from_portwine/scripts/var | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index d0721cea..b3d5cdb8 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -916,8 +916,6 @@ pw_init_db () { fi [[ "${START_FROM_STEAM}" == 1 ]] && export PW_GUI_DISABLED_CS=1 [[ "${START_FROM_PP_GUI}" == 1 ]] && export PW_GUI_DISABLED_CS=0 && unset START_FROM_PP_GUI - - [[ -z "$GAMESCOPE_ARGS" ]] && export GAMESCOPE_ARGS="-F fsr" return 0 } diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index ed84936f..80c9b923 100755 --- a/data_from_portwine/scripts/var +++ b/data_from_portwine/scripts/var @@ -6,6 +6,7 @@ export PW_MANGOHUD="0" export DEFAULT_MANGOHUD_CONFIG="cpu_stats,cpu_temp,cpu_mhz,gpu_stats,gpu_temp,gpu_core_clock,gpu_mem_clock,vulkan_driver,gpu_name,vram,ram,frame_timing=1,time,arch,wine,toggle_hud=Shift_R+F12,resolution,vkbasalt,gamemode" export PW_VKBASALT_EFFECTS="Curves:cas" export PW_VKBASALT_FFX_CAS="0.75" +export GAMESCOPE_ARGS="-F fsr" export PW_RT_MOUNT_RO=("") export PW_RT_MOUNT_RW=("/media" "/mnt" "/run/media/${USER}" "${PORT_WINE_PATH}") #export PW_SANDBOX_HOME_PATH="${PORT_WINE_PATH}"