From de6f96e617045ff98fb6645a4f341df2e5e46f7a Mon Sep 17 00:00:00 2001 From: Mikhail Tergoev Date: Wed, 26 Feb 2025 22:28:33 +0300 Subject: [PATCH] disabled openvr_api_dxvk --- data_from_portwine/changelog_ru | 2 ++ data_from_portwine/scripts/functions_helper | 4 ++-- data_from_portwine/scripts/start.sh | 10 +++++----- data_from_portwine/scripts/var | 2 +- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/data_from_portwine/changelog_ru b/data_from_portwine/changelog_ru index bdc781e..a4e5713 100755 --- a/data_from_portwine/changelog_ru +++ b/data_from_portwine/changelog_ru @@ -2,6 +2,8 @@ ----------------------------------------- История изменений: +* возвращена и исправлена функция lsbash оптимизирующая запуск PortProton (спасибо Htylol) + ###Scripts version 2390### / Дата: 23.02.2025 / Размер скачиваемого обновления: 4 мегабайта * добавлена информация о том что нельзя использовать FAKE_DLSS_3 в мультиплеерных играх * добавлен индивидуальный dxvk.conf файл при использовании FAKE_DLSS_3 для подмены определения видеокарты в играх на NVIDIA RTX 4090 diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index b3d2cce..a3c2958 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -3634,7 +3634,7 @@ start_portwine () { print_info "VKD3D-PROTON v.${VKD3D_STABLE_VER} in use" PATH_TO_DXVK_FILES="${PW_VULKAN_DIR}/dxvk-${DXVK_STABLE_VER}" PATH_TO_VKD3D_FILES="${PW_VULKAN_DIR}/vkd3d-proton-${VKD3D_STABLE_VER}" - CP_DXVK_FILES="d3d11 d3d10core d3d10_1 d3d10 d3d9 dxgi openvr_api_dxvk" + CP_DXVK_FILES="d3d11 d3d10core d3d10_1 d3d10 d3d9 dxgi" openvr_api_dxvk CP_VKD3D_FILES="d3d12 libvkd3d-shader-1" CP_WINE_FILES="d3d12core d3d8" ;; @@ -3644,7 +3644,7 @@ start_portwine () { print_info "VKD3D-PROTON v.${VKD3D_GIT_VER} in use" PATH_TO_DXVK_FILES="${PW_VULKAN_DIR}/dxvk-${DXVK_GIT_VER}" PATH_TO_VKD3D_FILES="${PW_VULKAN_DIR}/vkd3d-proton-${VKD3D_GIT_VER}" - CP_DXVK_FILES="d3d11 d3d10core d3d9 d3d8 dxgi openvr_api_dxvk" + CP_DXVK_FILES="d3d11 d3d10core d3d9 d3d8 dxgi" openvr_api_dxvk CP_VKD3D_FILES="d3d12 d3d12core libvkd3d-1 libvkd3d-shader-1" CP_WINE_FILES="d3d10_1 d3d10" ;; diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh index feb1dcd..e0107d1 100755 --- a/data_from_portwine/scripts/start.sh +++ b/data_from_portwine/scripts/start.sh @@ -6,7 +6,10 @@ export url_site="https://linux-gaming.ru/portproton/" export url_cloud="https://cloud.linux-gaming.ru/portproton" export url_git="https://git.linux-gaming.ru/CastroFidel/PortWINE" ######################################################################## -if [[ "${START_FROM_FLATPAK:-0}" == 1 ]] && [[ -z "${STEAM_COMPAT_DATA_PATH:-}" ]] && command -v "flatpak" &>/dev/null; then +if [[ "${START_FROM_FLATPAK:-0}" == 1 ]] \ +&& [[ -z "${STEAM_COMPAT_DATA_PATH:-}" ]] \ +&& command -v "flatpak" &>/dev/null +then unset START_FROM_FLATPAK flatpak run ru.linux_gaming.PortProton "$@" exit @@ -250,9 +253,7 @@ if [[ -z "$DOWNLOAD_STEAM_GRID" ]] ; then export DOWNLOAD_STEAM_GRID="1" fi -if [[ "${INSTALLING_PORT}" == 1 ]] ; then - return 0 -fi +[[ "${INSTALLING_PORT}" == 1 ]] && return 0 # choose gui start if [[ ! $PW_GUI_START =~ (PANED|NOTEBOOK) ]] ; then @@ -692,7 +693,6 @@ else fi done # Переопределение элементов в массивах в зависимости от PW_GAME_TIME, от большего значения к меньшему. - # 10 миллисекунд на 40 .desktop файлов, работает быстро if [[ $SORT_WITH_TIME == enabled ]] && [[ -n ${PW_GAME_TIME[1]} ]] ; then for i in "${PW_AMOUNT_OLD_DESKTOP[@]}" ; do for j in "${PW_AMOUNT_OLD_DESKTOP[@]}" ; do diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index a5080d2..4c983a4 100755 --- a/data_from_portwine/scripts/var +++ b/data_from_portwine/scripts/var @@ -4,7 +4,7 @@ #SCRIPTS_STABLE_VERSION=2388 ######################################################################## export AI_TOP_GAMES="PW_LGC PW_VKPLAY PW_EPIC PW_BATTLE_NET PW_WORLD_OF_SEA_BATTLE PW_RUSSIAN_FISHING PW_HO_YO_PLAY PW_FARLIGHT84 PW_WARFRAME PW_WGC PW_UBISOFT" -# export PROTON_USE_XALIA="1" +export PROTON_USE_XALIA="0" export LANGUAGES_LIST="ru es" export PW_VKBASALT="0" export PW_MANGOHUD="0"