From a2acf29a37aba08633c1ee5022a102396ec51ef2 Mon Sep 17 00:00:00 2001 From: Mikhail Tergoev Date: Thu, 24 Jul 2025 20:09:58 +0300 Subject: [PATCH] always auto set PW_VULKAN_USE if empty --- data_from_portwine/scripts/functions_helper | 6 ++-- data_from_portwine/scripts/start.sh | 35 +++++++++++---------- 2 files changed, 21 insertions(+), 20 deletions(-) diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index 69efeb3e..f1997c7d 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -2473,7 +2473,7 @@ pw_init_db () { # shellcheck source=/dev/null source "${PORTWINE_DB_FILE}" fi - edit_db_from_gui PW_VULKAN_USE PW_WINE_USE PW_PREFIX_NAME + edit_db_from_gui PW_WINE_USE PW_PREFIX_NAME fi fi @@ -5388,13 +5388,13 @@ export -f gui_proton_downloader # GUI EDIT_DB gui_edit_db () { KEY_EDIT_DB_GUI=$RANDOM - PW_EDIT_DB_LIST=(PW_MANGOHUD PW_MANGOHUD_USER_CONF PW_VKBASALT PW_VKBASALT_USER_CONF PW_DGVOODOO2 PW_GAMESCOPE + PW_EDIT_DB_LIST=(PW_MANGOHUD PW_MANGOHUD_USER_CONF PW_VKBASALT PW_VKBASALT_USER_CONF PW_DGVOODOO2 PW_USE_ESYNC PW_USE_FSYNC PW_USE_NTSYNC PW_USE_RAY_TRACING PW_USE_NVAPI_AND_DLSS PW_USE_OPTISCALER PW_USE_LS_FRAME_GEN 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_USE_SHADER_CACHE PW_USE_WINE_DXGI PW_USE_EAC_AND_BE PW_USE_SYSTEM_VK_LAYERS PW_USE_OBS_VKCAPTURE PW_DISABLE_COMPOSITING PW_USE_RUNTIME PW_DINPUT_PROTOCOL PW_USE_GALLIUM_ZINK PW_USE_GALLIUM_NINE - PW_USE_WINED3D_VULKAN PW_USE_SUPPLIED_DXVK_VKD3D PW_USE_NATIVE_WAYLAND PW_USE_DXVK_HDR + PW_USE_WINED3D_VULKAN PW_USE_SUPPLIED_DXVK_VKD3D PW_USE_NATIVE_WAYLAND PW_USE_DXVK_HDR PW_GAMESCOPE ) if check_wayland_session diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh index 631682b2..33c44ebb 100755 --- a/data_from_portwine/scripts/start.sh +++ b/data_from_portwine/scripts/start.sh @@ -558,6 +558,24 @@ if [[ -f "$portwine_exe" ]] ; then unset RESTART_PP_USED gui_userconf fi + + if [[ -z $PW_VULKAN_USE ]] \ + || [[ $PW_VULKAN_USE == [3-5] ]] + then + if [[ -e "/sys/module/nvidia/version" ]] ;then + if [[ $( 550.54.13 ]] + then export PW_VULKAN_USE="6" + else export PW_VULKAN_USE="2" + fi + else + background_pid --stop "pw_check_glxinfo" "2" + if [[ $(grep "Version:" "$PW_TMPFS_PATH/glxinfo.tmp" | awk '{print $2}') > 24.9.9 ]] + then export PW_VULKAN_USE="6" + else export PW_VULKAN_USE="2" + fi + fi + fi + if [[ $PW_GUI_DISABLED_CS != 1 ]] ; then pw_create_gui_png if ! grep -il "$portwine_exe" "$PORT_WINE_PATH"/*.desktop &>/dev/null ; then @@ -577,23 +595,6 @@ if [[ -f "$portwine_exe" ]] ; then fi fi - if [[ -z $PW_VULKAN_USE ]] \ - || [[ $PW_VULKAN_USE == [3-5] ]] - then - if [[ -e "/sys/module/nvidia/version" ]] ;then - if [[ $( 550.54.13 ]] - then export PW_VULKAN_USE="6" - else export PW_VULKAN_USE="2" - fi - else - background_pid --stop "pw_check_glxinfo" "2" - if [[ $(grep "Version:" "$PW_TMPFS_PATH/glxinfo.tmp" | awk '{print $2}') > 24.9.9 ]] - then export PW_VULKAN_USE="6" - else export PW_VULKAN_USE="2" - fi - fi - fi - case "$PW_VULKAN_USE" in 0) PW_DEFAULT_VULKAN_USE="$SORT_OPENGL!$SORT_NEWEST!$SORT_STABLE!$SORT_SAREK" ;; 1) PW_DEFAULT_VULKAN_USE="$SORT_SAREK!$SORT_NEWEST!$SORT_STABLE!$SORT_OPENGL" ;;