Merge branch 'Htylol-added_dxvk_sarek' into devel

df88eac6 · Mikhail Tergoev · 40765789 · c28c0812 · df88eac6 · df88eac6
Commit df88eac6 authored Jul 24, 2025 by Mikhail Tergoev
7 changed files
--- a/data_from_portwine/locales/PortProton.pot
+++ b/data_from_portwine/locales/PortProton.pot
@@ -7,7 +7,7 @@
 msgid   ""
 msgstr  "Project-Id-Version: PACKAGE VERSION\n"
        "Report-Msgid-Bugs-To: \n"
-        "POT-Creation-Date: 2025-07-21 16:53+0300\n"
+        "POT-Creation-Date: 2025-07-23 21:55+0500\n"
        "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
        "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
        "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -67,13 +67,10 @@ msgstr  ""
 msgid   "WineD3D OpenGL (For video cards without Vulkan)"
 msgstr  ""

-msgid   "Legacy DXVK (Vulkan v1.1)"
+msgid   "DXVK-Sarek, VKD3D (Vulkan v1.1+)"
 msgstr  ""

-msgid   "Stable DXVK, VKD3D (Vulkan v1.2)"
-msgstr  ""
-
-msgid   "Newest DXVK, VKD3D, D8VK (Vulkan v1.3+)"
+msgid   "Newest DXVK, VKD3D (Vulkan v1.3+)"
 msgstr  ""

 msgid   "GET-OTHER-WINE"
@@ -543,6 +540,9 @@ msgid   "Use dxvk and vkd3d which are bundled with wine or proton. (Does not "
        "work with PROTON_LG and WINE_LG)"
 msgstr  ""

+msgid   "Use async version of dxvk-sarek. (May work better or vice versa)"
+msgstr  ""
+
 msgid   "Disable asynchronous calls for VULKAN and DXVK modes"
 msgstr  ""

@@ -1073,7 +1073,7 @@ msgid   "Disable MangoHud and go to the previous menu"
 msgstr  ""

 msgid   "Use DirectX12 for dgVoodoo2. Doesnt always work better. (Working "
-        "only on newest and stable dxvk/vkd3d) (Direct3D and Glide settings)"
+        "only on newest and sarek dxvk/vkd3d) (Direct3D and Glide settings)"
 msgstr  ""

 msgid   "Force the vertical sync to avoid tearing or prevent the GPU from "

--- a/data_from_portwine/locales/es/LC_MESSAGES/PortProton.po
+++ b/data_from_portwine/locales/es/LC_MESSAGES/PortProton.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-07-21 16:53+0300\n"
-"PO-Revision-Date: 2025-07-01 20:00+0300\n"
+"POT-Creation-Date: 2025-07-23 21:55+0500\n"
+"PO-Revision-Date: 2025-07-21 23:18+0500\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: es_ES\n"
@@ -87,14 +87,11 @@ msgstr "Usar Wine del sistema"
 msgid "WineD3D OpenGL (For video cards without Vulkan)"
 msgstr "WineD3D OpenGL (Para tarjetas de video sin Vulkan)"

-msgid "Legacy DXVK (Vulkan v1.1)"
-msgstr "DXVK heredado (Vulkan v1.1)"
+msgid "DXVK-Sarek, VKD3D (Vulkan v1.1+)"
+msgstr "DXVK-Sarek, VKD3D (Vulkan v1.1+)"

-msgid "Stable DXVK, VKD3D (Vulkan v1.2)"
-msgstr "DXVK estable, VKD3D (Vulkan v1.2)"
-
-msgid "Newest DXVK, VKD3D, D8VK (Vulkan v1.3+)"
-msgstr "Más nuevo DXVK, VKD3D, D8VK (Vulkan v1.3+)"
+msgid "Newest DXVK, VKD3D (Vulkan v1.3+)"
+msgstr "Más nuevo DXVK, VKD3D (Vulkan v1.3+)"

 msgid "GET-OTHER-WINE"
 msgstr "OBTENER OTRO WINE"
@@ -661,6 +658,9 @@ msgstr ""
 "Utilice dxvk y vkd3d que vienen incluidos con wine o proton. (No funciona "
 "con PROTON_LG y WINE_LG)"

+msgid "Use async version of dxvk-sarek. (May work better or vice versa)"
+msgstr ""
+
 msgid "Disable asynchronous calls for VULKAN and DXVK modes"
 msgstr "Desactivar llamadas asíncronas para los modos VULKAN y DXVK"

@@ -1316,9 +1316,10 @@ msgstr "Iniciar vkcube para previsualizar los cambios"
 msgid "Disable MangoHud and go to the previous menu"
 msgstr "Desactivar MangoHud y volver al menú anterior"

+#, fuzzy
 msgid ""
 "Use DirectX12 for dgVoodoo2. Doesnt always work better. (Working only on "
-"newest and stable dxvk/vkd3d) (Direct3D and Glide settings)"
+"newest and sarek dxvk/vkd3d) (Direct3D and Glide settings)"
 msgstr ""
 "Usa DirectX 12 para dgVoodoo2. No siempre funciona mejor. (Funciona solo con "
 "dxvk/vkd3d más nuevos y estables) (Configuraciones de Direct3D y Glide)"
@@ -2193,6 +2194,9 @@ msgstr "UNIRSE"
 msgid "THIRD PARTY LIBRARIES"
 msgstr "BIBLIOTECAS DE TERCEROS"

+#~ msgid "Legacy DXVK (Vulkan v1.1)"
+#~ msgstr "DXVK heredado (Vulkan v1.1)"
+
 #~ msgid "Enable DLSS translator in FSR 2 in DirectX 12 games (CyberFSR2)"
 #~ msgstr ""
 #~ "Habilitar el traductor de DLSS en FSR 2 en juegos DirectX 12 (CyberFSR2)"
@@ -2241,8 +2245,8 @@ msgstr "BIBLIOTECAS DE TERCEROS"
 #~ msgid ""
 #~ "For adding shortcut to STEAM, needed restart.\\n\\nRestart STEAM now?"
 #~ msgstr ""
-#~ "Para agregar el acceso directo a STEAM, es necesario reiniciar.\\n"
-#~ "\\¿Quieres reiniciar STEAM ahora?"
+#~ "Para agregar el acceso directo a STEAM, es necesario reiniciar."
+#~ "\\n\\¿Quieres reiniciar STEAM ahora?"

 #~ msgid "Restarting STEAM... Please wait."
 #~ msgstr "Restarting STEAM... Please wait."

--- a/data_from_portwine/locales/ru/LC_MESSAGES/PortProton.mo
+++ b/data_from_portwine/locales/ru/LC_MESSAGES/PortProton.mo
--- a/data_from_portwine/locales/ru/LC_MESSAGES/PortProton.po
+++ b/data_from_portwine/locales/ru/LC_MESSAGES/PortProton.po
@@ -7,16 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-07-21 16:53+0300\n"
-"PO-Revision-Date: 2025-07-21 16:55+0300\n"
+"POT-Creation-Date: 2025-07-23 21:55+0500\n"
+"PO-Revision-Date: 2025-07-23 21:56+0500\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: ru_RU\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<12 || n%100>14) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<12 || n%100>14) ? 1 : 2);\n"
 "X-Generator: Poedit 3.6\n"

 msgid ""
@@ -86,14 +86,11 @@ msgstr "Использовать системную версию wine"
 msgid "WineD3D OpenGL (For video cards without Vulkan)"
 msgstr "WineD3D OpenGL (для видеокарт без поддержки Vulkan)"

-msgid "Legacy DXVK (Vulkan v1.1)"
-msgstr "Устаревший DXVK (Vulkan v1.1)"
+msgid "DXVK-Sarek, VKD3D (Vulkan v1.1+)"
+msgstr "DXVK-Sarek, VKD3D (Vulkan v1.1+)"

-msgid "Stable DXVK, VKD3D (Vulkan v1.2)"
-msgstr "Стабильные DXVK, VKD3D (Vulkan v1.2)"
-
-msgid "Newest DXVK, VKD3D, D8VK (Vulkan v1.3+)"
-msgstr "Новейшие DXVK, VKD3D, D8VK (Vulkan v1.3+)"
+msgid "Newest DXVK, VKD3D (Vulkan v1.3+)"
+msgstr "Новейшие DXVK, VKD3D (Vulkan v1.3+)"

 msgid "GET-OTHER-WINE"
 msgstr "Скачать другие версии wine"
@@ -342,8 +339,8 @@ msgid ""
 "More than one DB file found for the application being launched.\\nSelect the "
 "required one, or delete the extra DB file before the next run.\\n"
 msgstr ""
-"Для запускаемого приложения найдено более одного конфигурационного файла ."
-"ppdb.\\nВыберите нужный или удалите лишний файл .ppdb перед следующим "
+"Для запускаемого приложения найдено более одного конфигурационного "
+"файла .ppdb.\\nВыберите нужный или удалите лишний файл .ppdb перед следующим "
 "запуском\\n"

 msgid "Update scripts:"
@@ -477,8 +474,8 @@ msgid ""
 "<b>Super + Y :</b> Toggle NIS upscaling\n"
 "<b>Super + I :</b> Increase FSR sharpness by 1\n"
 "<b>Super + O :</b> Decrease FSR sharpness by 1\n"
-"<b>Super + S :</b> Take screenshot (currently goes to /tmp/gamescope_DATE."
-"png)\n"
+"<b>Super + S :</b> Take screenshot (currently goes to /tmp/"
+"gamescope_DATE.png)\n"
 "<b>Super + G :</b> Toggle keyboard grab\n"
 "<b>Super + C :</b> Update clipboard"
 msgstr ""
@@ -676,6 +673,11 @@ msgstr ""
 "Использовать dxvk и vkd3d, которые поставляются в комплекте с wine или "
 "proton. (Не работает с PROTON_LG и WINE_LG)"

+msgid "Use async version of dxvk-sarek. (May work better or vice versa)"
+msgstr ""
+"Использовать асинхронную версию dxvk-sarek. (Может работать лучше, либо "
+"наоборот)"
+
 msgid "Disable asynchronous calls for VULKAN and DXVK modes"
 msgstr "Отключить асинхронные вызовы для режимов VULKAN и DXVK"

@@ -1315,9 +1317,9 @@ msgid ""
 "MangoHud settings (Keys <b>R_SHIFT + F12</b> disable MangoHud)\\n<b>note:</"
 "b> To display help for each item, just hover the mouse cursor over the text."
 msgstr ""
-"Настройки MangoHud (клавиши <b>R_SHIFT + F12</b> отключают "
-"MangoHud)\\n<b>Примечание:</b> Чтобы отобразить справку для каждого "
-"элемента, наведите курсор мыши на текст."
+"Настройки MangoHud (клавиши <b>R_SHIFT + F12</b> отключают MangoHud)"
+"\\n<b>Примечание:</b> Чтобы отобразить справку для каждого элемента, "
+"наведите курсор мыши на текст."

 msgid ""
 "Enabling fps limitation with MANGOHUD tools built into PortProton (Keys "
@@ -1337,11 +1339,11 @@ msgstr "Отключить MangoHud и перейти в предыдущее м

 msgid ""
 "Use DirectX12 for dgVoodoo2. Doesnt always work better. (Working only on "
-"newest and stable dxvk/vkd3d) (Direct3D and Glide settings)"
+"newest and sarek dxvk/vkd3d) (Direct3D and Glide settings)"
 msgstr ""
 "Принудительно транслировать dgVoodoo2 в DirectXD 12 (работает только с "
-"новейшими и стабильными версиями dxvk и vkd3d. Может вызвать проблемы с "
-"запуском игр) (Direct3D + Glide)"
+"новейшими и sarek версиями dxvk и vkd3d. Может вызвать проблемы с запуском "
+"игр) (Direct3D + Glide)"

 msgid ""
 "Force the vertical sync to avoid tearing or prevent the GPU from rendering "
@@ -2168,6 +2170,9 @@ msgstr "ПРИСОЕДЕНИТЬСЯ"
 msgid "THIRD PARTY LIBRARIES"
 msgstr "БИБЛИОТЕКИ"

+#~ msgid "Legacy DXVK (Vulkan v1.1)"
+#~ msgstr "Устаревший DXVK (Vulkan v1.1)"
+
 #~ msgid "Enable DLSS translator in FSR 2 in DirectX 12 games (CyberFSR2)"
 #~ msgstr ""
 #~ "Включить трансляцию DLSS в FSR 2 в играх на DirectX 12 (CyberFSR2). "
@@ -2230,14 +2235,14 @@ msgstr "БИБЛИОТЕКИ"

 #~ msgid ""
 #~ "<b>Gamescope is not detected on the system, to install it, run the "
-#~ "command in the terminal:\\nflatpak install -y runtime/org.freedesktop."
-#~ "Platform.VulkanLayer.gamescope/x86_64/$%{GAMESCOPE_VERSION}%\\n(Can be "
-#~ "selected and copied)</b>"
+#~ "command in the terminal:\\nflatpak install -y runtime/"
+#~ "org.freedesktop.Platform.VulkanLayer.gamescope/x86_64/$%"
+#~ "{GAMESCOPE_VERSION}%\\n(Can be selected and copied)</b>"
 #~ msgstr ""
 #~ "<b>Gamescope не найден в системе, для его установки выполните команду в "
-#~ "терминале:\\nflatpak install -y runtime/org.freedesktop.Platform."
-#~ "VulkanLayer.gamescope/x86_64/$%{GAMESCOPE_VERSION}%\\n(Данный текст можно "
-#~ "выделить и скопировать)</b>"
+#~ "терминале:\\nflatpak install -y runtime/"
+#~ "org.freedesktop.Platform.VulkanLayer.gamescope/x86_64/$%"
+#~ "{GAMESCOPE_VERSION}%\\n(Данный текст можно выделить и скопировать)</b>"

 #, sh-format
 #~ msgid ""
@@ -2524,8 +2529,8 @@ msgstr "БИБЛИОТЕКИ"
 #~ "<b>-F fsr:</b> use AMD FidelityFX™ Super Resolution 1.0 for upscaling.\n"
 #~ "<b>-F nis:</b> use NVIDIA Image Scaling v1.0.3 for upscaling.\n"
 #~ "<b>-S integer:</b> use integer scaling.\n"
-#~ "<b>-S stretch:</b> use stretch scaling, the game will fill the window. (e."
-#~ "g. 4:3 to 16:9).\n"
+#~ "<b>-S stretch:</b> use stretch scaling, the game will fill the window. "
+#~ "(e.g. 4:3 to 16:9).\n"
 #~ "<b>-b:</b> create a border-less window.\n"
 #~ "<b>-f:</b> create a full-screen window."
 #~ msgstr ""
@@ -2534,8 +2539,8 @@ msgstr "БИБЛИОТЕКИ"
 #~ "размера окна Gamescope обновит эти настройки. Если указано -H, а -W нет, "
 #~ "предполагается соотношение сторон 16:9. По умолчанию установлено значение "
 #~ "1280×720.\n"
-#~ "<b>-w, -h:</b>  установить разрешение, используемое в игре. Если указано -"
-#~ "h, а -w нет, предполагается соотношение сторон 16:9. По умолчанию "
+#~ "<b>-w, -h:</b>  установить разрешение, используемое в игре. Если указано "
+#~ "-h, а -w нет, предполагается соотношение сторон 16:9. По умолчанию "
 #~ "используются значения, указанные в -W и -H.\n"
 #~ "<b>-r:</b>  установить ограничение частоты кадров для игры. По умолчанию "
 #~ "значение неограниченно.\n"

--- a/data_from_portwine/scripts/functions_helper
+++ b/data_from_portwine/scripts/functions_helper
--- a/data_from_portwine/scripts/start.sh
+++ b/data_from_portwine/scripts/start.sh
@@ -520,16 +520,8 @@ then DIST_ADD_TO_GUI+="!${translations[USE_SYSTEM_WINE]}"
 fi

 SORT_OPENGL="${translations[WineD3D OpenGL (For video cards without Vulkan)]}"
-SORT_LEGACY="${translations[Legacy DXVK (Vulkan v1.1)]}"
-SORT_STABLE="${translations[Stable DXVK, VKD3D (Vulkan v1.2)]}"
-SORT_NEWEST="${translations[Newest DXVK, VKD3D, D8VK (Vulkan v1.3+)]}"
-
-case "$PW_VULKAN_USE" in
-    0) PW_DEFAULT_VULKAN_USE="$SORT_OPENGL!$SORT_NEWEST!$SORT_STABLE!$SORT_LEGACY" ;;
-    1) PW_DEFAULT_VULKAN_USE="$SORT_STABLE!$SORT_NEWEST!$SORT_LEGACY!$SORT_OPENGL" ;;
-  3|5) PW_DEFAULT_VULKAN_USE="$SORT_LEGACY!$SORT_NEWEST!$SORT_STABLE!$SORT_OPENGL" ;;
-    *) PW_DEFAULT_VULKAN_USE="$SORT_NEWEST!$SORT_STABLE!$SORT_LEGACY!$SORT_OPENGL" ;;
-esac
+SORT_SAREK="${translations[DXVK-Sarek, VKD3D (Vulkan v1.1+)]}"
+SORT_NEWEST="${translations[Newest DXVK, VKD3D (Vulkan v1.3+)]}"

 if [[ $PW_WINE_USE == PROTON_LG ]] ; then
    PW_WINE_USE="${PW_PROTON_LG_VER}"
@@ -575,6 +567,55 @@ if [[ -f "$portwine_exe" ]] ; then
            fi
        fi

+        [[ $PW_VULKAN_USE =~ [3-5] ]] && unset PW_VULKAN_USE
+        if [[ -z $PW_VULKAN_USE ]] ; then
+            pw_check_vulkan
+            if [[ -f "${PW_TMPFS_PATH}/vulkaninfo.tmp" ]] ; then
+                unset VULKAN_VERSION_CHECK VULKAN_DRIVER_VERSION VULKAN_DEVICE_NAME
+                count="0"
+                while read -r line ; do
+                    [[ $line =~ apiVersion ]] && VULKAN_VERSION_CHECK["$count"]="$line"
+                    [[ $line =~ driverVersion ]] && VULKAN_DRIVER_VERSION["$count"]="$line"
+                    if [[ $line =~ deviceName ]] ; then
+                        if [[ $line == *"$PW_GPU_USE"* ]] ; then
+                            VULKAN_DEVICE_NAME["$count"]="$PW_GPU_USE"
+                            break
+                        else
+                            if [[ $line =~ llvmpipe ]] ; then
+                                unset 'VULKAN_VERSION_CHECK["$count"]' 'VULKAN_DRIVER_VERSION["$count"]'
+                            else
+                                VULKAN_DEVICE_NAME["$count"]="$line"
+                                (( count++ ))
+                            fi
+                        fi
+                    fi
+                done < "${PW_TMPFS_PATH}/vulkaninfo.tmp"
+                if [[ ${VULKAN_VERSION_CHECK[*]} =~ 1.[3-9]+. ]] ; then
+                    for number in $(seq 0 $(( ${#VULKAN_VERSION_CHECK[@]} - 1 ))) ; do
+                        VULKAN_DRIVER_VERSION[$number]="${VULKAN_DRIVER_VERSION[$number]//*= /}"
+                        VULKAN_DRIVER_VERSION[$number]="${VULKAN_DRIVER_VERSION[$number]// (*/}"
+                        if [[ ${VULKAN_DEVICE_NAME[$number],,} =~ (amd|intel) && ${VULKAN_DRIVER_VERSION[$number]} > 25 ]] \
+                        || [[ ${VULKAN_DEVICE_NAME[$number],,} =~ nvidia && ${VULKAN_DRIVER_VERSION[$number]} > 550.54.13 ]] ; then
+                            export PW_VULKAN_USE="2"
+                            break
+                        else
+                            export PW_VULKAN_USE="6"
+                        fi
+                    done
+                elif [[ ${VULKAN_VERSION_CHECK[*]} =~ 1.[1-2]. ]] ; then
+                    export PW_VULKAN_USE="1"
+                fi
+            else
+                export PW_VULKAN_USE="0"
+            fi
+        fi
+
+        case "$PW_VULKAN_USE" in
+            0) PW_DEFAULT_VULKAN_USE="$SORT_OPENGL!$SORT_NEWEST!$SORT_SAREK" ;;
+            1) PW_DEFAULT_VULKAN_USE="$SORT_SAREK!$SORT_NEWEST!$SORT_OPENGL" ;;
+            *) PW_DEFAULT_VULKAN_USE="$SORT_NEWEST!$SORT_SAREK!$SORT_OPENGL" ;;
+        esac
+
        export KEY_START="$RANDOM"
        if [[ $PW_GUI_START == "NOTEBOOK" ]] ; then
            "${pw_yad}" --plug=$KEY_START --tabnum=1 --form --separator=";" $START_GUI_TYPE \
@@ -822,6 +863,8 @@ else
    else export PW_GUI_SORT_TABS=(2 3 4 5 1)
    fi

+    PW_DEFAULT_VULKAN_USE="$SORT_NEWEST!$SORT_SAREK!$SORT_OPENGL"
+
    KEY_MENU="$RANDOM"

    IFS="%"
@@ -967,9 +1010,8 @@ fi

 case "${VULKAN_MOD}" in
    "$SORT_OPENGL" )     export PW_VULKAN_USE="0" ;;
-    "$SORT_STABLE" )     export PW_VULKAN_USE="1" ;;
+    "$SORT_SAREK"  )     export PW_VULKAN_USE="1" ;;
    "$SORT_NEWEST" )     export PW_VULKAN_USE="2" ;;
-    "$SORT_LEGACY" )     export PW_VULKAN_USE="3" ;;
 esac

 init_wine_ver

--- a/data_from_portwine/scripts/var
+++ b/data_from_portwine/scripts/var
@@ -43,6 +43,7 @@ export PW_USE_GALLIUM_NINE="0"
 export PW_USE_GALLIUM_ZINK="0"
 export PW_USE_WINED3D_VULKAN="0"
 export PW_USE_SUPPLIED_DXVK_VKD3D="1"
+export PW_USE_SAREK_ASYNC="0"
 export WINEUSERNAME="steamuser"
 ###DEFAULT_WINE###
 export PW_WINE_USE="PROTON_LG"
@@ -56,12 +57,10 @@ export PW_WINE_LG_VER="WINE_LG_10-12"
 export PW_WINE_FULLSCREEN_FSR="1"
 export WINE_FULLSCREEN_FSR_MODE="ultra"
 ###DXVK_AND_VKD3D###
-export PW_VULKAN_USE="2"
 export VKD3D_LIMIT_TESS_FACTORS="64"
-export DXVK_LEGACY_VER="1.6.1"
-export DXVK_STABLE_VER="1.10.3-28"
+export DXVK_SAREK_VER="sarek-1.11.0"
 export DXVK_GIT_VER="2.6.1-368"
-export VKD3D_STABLE_VER="1.1-2602"
+export VKD3D_SAREK_VER="sarek-2.6.0"
 export VKD3D_GIT_VER="1.1-4655"
 ###VKBASALT###
 export PW_VKBASALT_EFFECTS="Curves:cas"