Merge branch 'Htylol-added_dxvk_sarek' into devel

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)"
+msgid   "Newest DXVK, VKD3D (Vulkan v1.3+)"
-msgstr  ""
-
-msgid   "Newest DXVK, VKD3D, D8VK (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 "

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"
+"POT-Creation-Date: 2025-07-23 21:55+0500\n"
-"PO-Revision-Date: 2025-07-01 20:00+0300\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)"
+msgid "DXVK-Sarek, VKD3D (Vulkan v1.1+)"
-msgstr "DXVK heredado (Vulkan v1.1)"
+msgstr "DXVK-Sarek, VKD3D (Vulkan v1.1+)"
 
-msgid "Stable DXVK, VKD3D (Vulkan v1.2)"
+msgid "Newest DXVK, VKD3D (Vulkan v1.3+)"
-msgstr "DXVK estable, VKD3D (Vulkan v1.2)"
+msgstr "Más nuevo DXVK, VKD3D (Vulkan v1.3+)"
-
-msgid "Newest DXVK, VKD3D, D8VK (Vulkan v1.3+)"
-msgstr "Más nuevo DXVK, VKD3D, D8VK (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"
+#~ "Para agregar el acceso directo a STEAM, es necesario reiniciar."
-#~ "\\¿Quieres reiniciar STEAM ahora?"
+#~ "\\n\\¿Quieres reiniciar STEAM ahora?"
 
 #~ msgid "Restarting STEAM... Please wait."
 #~ msgstr "Restarting STEAM... Please wait."

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"
+"POT-Creation-Date: 2025-07-23 21:55+0500\n"
-"PO-Revision-Date: 2025-07-21 16:55+0300\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"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
-"%10<=4 && (n%100<12 || n%100>14) ? 1 : 2);\n"
+"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)"
+msgid "DXVK-Sarek, VKD3D (Vulkan v1.1+)"
-msgstr "Устаревший DXVK (Vulkan v1.1)"
+msgstr "DXVK-Sarek, VKD3D (Vulkan v1.1+)"
 
-msgid "Stable DXVK, VKD3D (Vulkan v1.2)"
+msgid "Newest DXVK, VKD3D (Vulkan v1.3+)"
-msgstr "Стабильные DXVK, VKD3D (Vulkan v1.2)"
+msgstr "Новейшие DXVK, VKD3D (Vulkan v1.3+)"
-
-msgid "Newest DXVK, VKD3D, D8VK (Vulkan v1.3+)"
-msgstr "Новейшие DXVK, VKD3D, D8VK (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."
+"<b>Super + S :</b> Take screenshot (currently goes to /tmp/"
-"png)\n"
+"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 (клавиши <b>R_SHIFT + F12</b> отключают MangoHud)"
-"MangoHud)\\n<b>Примечание:</b> Чтобы отобразить справку для каждого "
+"\\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. Может вызвать проблемы с "
+"новейшими и sarek версиями dxvk и vkd3d. Может вызвать проблемы с запуском "
-"запуском игр) (Direct3D + Glide)"
+"игр) (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."
+#~ "command in the terminal:\\nflatpak install -y runtime/"
-#~ "Platform.VulkanLayer.gamescope/x86_64/$%{GAMESCOPE_VERSION}%\\n(Can be "
+#~ "org.freedesktop.Platform.VulkanLayer.gamescope/x86_64/$%"
-#~ "selected and copied)</b>"
+#~ "{GAMESCOPE_VERSION}%\\n(Can be selected and copied)</b>"
 #~ msgstr ""
 #~ "<b>Gamescope не найден в системе, для его установки выполните команду в "
-#~ "терминале:\\nflatpak install -y runtime/org.freedesktop.Platform."
+#~ "терминале:\\nflatpak install -y runtime/"
-#~ "VulkanLayer.gamescope/x86_64/$%{GAMESCOPE_VERSION}%\\n(Данный текст можно "
+#~ "org.freedesktop.Platform.VulkanLayer.gamescope/x86_64/$%"
-#~ "выделить и скопировать)</b>"
+#~ "{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."
+#~ "<b>-S stretch:</b> use stretch scaling, the game will fill the window. "
-#~ "g. 4:3 to 16:9).\n"
+#~ "(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>  установить разрешение, используемое в игре. Если указано -"
+#~ "<b>-w, -h:</b>  установить разрешение, используемое в игре. Если указано "
-#~ "h, а -w нет, предполагается соотношение сторон 16:9. По умолчанию "
+#~ "-h, а -w нет, предполагается соотношение сторон 16:9. По умолчанию "
 #~ "используются значения, указанные в -W и -H.\n"
 #~ "<b>-r:</b>  установить ограничение частоты кадров для игры. По умолчанию "
 #~ "значение неограниченно.\n"

data_from_portwine/scripts/functions_helper

@@ -2161,8 +2161,8 @@ pw_check_and_download_wine () {
 }
 
 pw_check_and_download_dxvk_and_vkd3d () {
-    # Download stable and git version DXVK
+    # Download DXVK versions
-    for DXVK_VAR_VER in "${DXVK_STABLE_VER}" "${DXVK_GIT_VER}" "${DXVK_LEGACY_VER}" ; do
+    for DXVK_VAR_VER in "${DXVK_SAREK_VER}" "${DXVK_GIT_VER}" ; do
         if [[ ! -d "${PW_VULKAN_DIR}/dxvk-${DXVK_VAR_VER}" ]] ; then
             print_info "Download and install DXVK v.${DXVK_VAR_VER}"
             if try_download "https://github.com/Castro-Fidel/vulkan/releases/download/dxvk-${DXVK_VAR_VER}/dxvk-${DXVK_VAR_VER}.tar.xz" \
@@ -2191,8 +2191,8 @@ pw_check_and_download_dxvk_and_vkd3d () {
         fi
     done
 
-    # Download stable and git version VKD3D
+    # Download VKD3D versions
-    for VKD3D_VAR_VER in "${VKD3D_STABLE_VER}" "${VKD3D_GIT_VER}" ; do
+    for VKD3D_VAR_VER in "${VKD3D_SAREK_VER}" "${VKD3D_GIT_VER}" ; do
         if [[ ! -d "${PW_VULKAN_DIR}/vkd3d-proton-${VKD3D_VAR_VER}" ]] ; then
             print_info "Download and install VKD3D-PROTON v.${VKD3D_VAR_VER}"
             if try_download "https://github.com/Castro-Fidel/vulkan/releases/download/vkd3d-proton-${VKD3D_VAR_VER}/vkd3d-proton-${VKD3D_VAR_VER}.tar.xz" \
@@ -2807,16 +2807,22 @@ pw_check_command () {
 }
 export -f pw_check_command
 
+pw_check_vulkan () {
+    if [[ ! -f "${PW_TMPFS_PATH}/vulkaninfo.tmp" ]] ; then
+        TIMEOUT_CMD="5"
+        if ! pw_check_command vulkaninfo ; then
+            print_warning "use portable vulkaninfo"
+            "$PW_PLUGINS_PATH"/portable/bin/x86_64-linux-gnu-vulkaninfo &> "${PW_TMPFS_PATH}/vulkaninfo.tmp"
+        fi
+    fi
+}
+
 pw_get_tmp_files () {
     for f_cmd in "gamescope --help" "lspci -k" "xrandr --current" "locale -a"
     do pw_check_command "$f_cmd"
     done
 
-    TIMEOUT_CMD="5"
+    pw_check_vulkan
-    if ! pw_check_command vulkaninfo ; then
-        print_warning "use portable vulkaninfo"
-        "$PW_PLUGINS_PATH"/portable/bin/x86_64-linux-gnu-vulkaninfo &> "${PW_TMPFS_PATH}/vulkaninfo.tmp"
-    fi
 
     # GALLIUM NINE
     unset FIND_D3D_MODULE D3D_MODULE_PATH
@@ -3764,15 +3770,21 @@ fi
             CP_WINE_FILES="d3d12 d3d12core d3d11 d3d10core d3d10_1 d3d10 d3d9 d3d8 dxgi"
             ;;
         1)
-            # STABLE DXVK AND VKD3D
+            # DXVK-Sarek AND VKD3D
-            print_info "DXVK v.${DXVK_STABLE_VER} in use"
+            print_info "DXVK v.${DXVK_SAREK_VER} in use"
-            print_info "VKD3D-PROTON v.${VKD3D_STABLE_VER} in use"
+            print_info "VKD3D-PROTON v.${VKD3D_SAREK_VER} in use"
-            PATH_TO_DXVK_FILES="${PW_VULKAN_DIR}/dxvk-${DXVK_STABLE_VER}"
+            if [[ $PW_USE_SAREK_ASYNC == "1" ]] ; then
-            PATH_TO_VKD3D_FILES="${PW_VULKAN_DIR}/vkd3d-proton-${VKD3D_STABLE_VER}"
+                PATH_TO_DXVK_FILES="${PW_VULKAN_DIR}/dxvk-${DXVK_SAREK_VER}/sarek-async"
-            CP_DXVK_FILES="d3d11 d3d10core d3d10_1 d3d10 d3d9 dxgi"
+                export ASYNC_DRAW_CALL_THRESHOLD="1"
+                export DXVK_ALL_CORES="1"
+            else
+                PATH_TO_DXVK_FILES="${PW_VULKAN_DIR}/dxvk-${DXVK_SAREK_VER}/sarek"
+            fi
+            PATH_TO_VKD3D_FILES="${PW_VULKAN_DIR}/vkd3d-proton-${VKD3D_SAREK_VER}"
+            CP_DXVK_FILES="d3d11 d3d10core d3d9 d3d8 dxgi"
             [[ "$PW_USE_VRCLIENT" = "1" ]] && add_to_var CP_DXVK_FILES "openvr_api_dxvk"
-            CP_VKD3D_FILES="d3d12 libvkd3d-shader-1"
+            CP_VKD3D_FILES="d3d12 libvkd3d-1 libvkd3d-shader-1"
-            CP_WINE_FILES="d3d12core d3d8"
+            CP_WINE_FILES="d3d12core d3d10_1 d3d10"
             ;;
         2)
             # NEWEST DXVK AND VKD3D
@@ -3785,15 +3797,6 @@ fi
             CP_VKD3D_FILES="d3d12 d3d12core libvkd3d-1 libvkd3d-shader-1"
             CP_WINE_FILES="d3d10_1 d3d10"
             ;;
-        3)
-            # LEGACY DXVK
-            print_info "DXVK v.${DXVK_LEGACY_VER} in use"
-            PATH_TO_DXVK_FILES="${PW_VULKAN_DIR}/dxvk-${DXVK_LEGACY_VER}"
-            PATH_TO_VKD3D_FILES="${PW_VULKAN_DIR}/vkd3d-proton-${VKD3D_GIT_VER}"
-            CP_DXVK_FILES="d3d11 d3d10core d3d10_1 d3d10 d3d9 dxgi"
-            CP_VKD3D_FILES="libvkd3d-1 libvkd3d-shader-1"
-            CP_WINE_FILES="d3d12 d3d12core d3d8"
-            ;;
     esac
 
     if [[ $PW_USE_GALLIUM_NINE == "1" ]] \
@@ -3845,7 +3848,6 @@ fi
     if [[ $PW_USE_SUPPLIED_DXVK_VKD3D == "1" ]] \
     && [[ ! $PW_WINE_USE =~ (PROTON_LG|WINE_LG) ]] \
     && [[ -f "${WINEDIR}/lib64/wine/dxvk/d3d9.dll" || -f "${WINEDIR}/lib/wine/dxvk/x86_64-windows/d3d9.dll" ]] ; then
-        export DXVK_ASYNC="1"
         if [[ -f "${WINEDIR}/lib64/wine/dxvk/d3d10.dll" && -f "${WINEDIR}/lib64/wine/dxvk/d3d10_1.dll" ]] ; then
             CP_DXVK_FILES="d3d11 d3d10core d3d10_1 d3d10 d3d9 dxgi"
             CP_WINE_FILES=""
@@ -3921,17 +3923,9 @@ fi
                     0)
                         rm_from_var CP_WINE_FILES "d3d9 d3d8"
                         ;;
-                    1)
+                    1|2|6)
-                        rm_from_var CP_DXVK_FILES "d3d9"
-                        rm_from_var CP_WINE_FILES "d3d8"
-                        ;;
-                    2)
                         rm_from_var CP_DXVK_FILES "d3d9 d3d8"
                         ;;
-                    3)
-                        rm_from_var CP_DXVK_FILES "d3d9"
-                        rm_from_var CP_WINE_FILES "d3d8"
-                        ;;
                 esac
             fi
         fi
@@ -4156,9 +4150,9 @@ fi
             try_force_link_file "${WINEDIR}/lib64/wine/nvapi/nvapi64.dll" "${WINEPREFIX}/drive_c/windows/system32/nvapi64.dll"
             try_force_link_file "${WINEDIR}/lib64/wine/nvapi/nvofapi64.dll" "${WINEPREFIX}/drive_c/windows/system32/nvofapi64.dll"
         else
-            try_force_link_file "${PATH_TO_DXVK_FILES}/x32/nvapi.dll" "${WINEPREFIX}/drive_c/windows/syswow64/nvapi.dll"
+            try_force_link_file "${PW_VULKAN_DIR}/dxvk-${DXVK_GIT_VER}/x32/nvapi.dll" "${WINEPREFIX}/drive_c/windows/syswow64/nvapi.dll"
-            try_force_link_file "${PATH_TO_DXVK_FILES}/x64/nvapi64.dll" "${WINEPREFIX}/drive_c/windows/system32/nvapi64.dll"
+            try_force_link_file "${PW_VULKAN_DIR}/dxvk-${DXVK_GIT_VER}/x64/nvapi64.dll" "${WINEPREFIX}/drive_c/windows/system32/nvapi64.dll"
-            try_force_link_file "${PATH_TO_DXVK_FILES}/x64/nvofapi64.dll" "${WINEPREFIX}/drive_c/windows/system32/nvofapi64.dll"
+            try_force_link_file "${PW_VULKAN_DIR}/dxvk-${DXVK_GIT_VER}/x64/nvofapi64.dll" "${WINEPREFIX}/drive_c/windows/system32/nvofapi64.dll"
         fi
         var_winedlloverride_update "nvapi64,nvofapi64,nvapi=n;nvcuda=b"
     else
@@ -5382,9 +5376,9 @@ gui_edit_db () {
         rm_from_array "PW_EDIT_DB_LIST" PW_USE_SUPPLIED_DXVK_VKD3D
     fi
     check_flatpak && rm_from_array "PW_EDIT_DB_LIST" PW_USE_RUNTIME
-
     # GALLIUM NINE
     [[ ! -f "${PW_TMPFS_PATH}/gallium_nine.tmp" ]] && rm_from_array "PW_EDIT_DB_LIST" PW_USE_GALLIUM_NINE
+    [[ $PW_VULKAN_USE == "1" ]] && add_to_array "PW_EDIT_DB_LIST" PW_USE_SAREK_ASYNC
 
     PW_MANGOHUD_INFO=${translations[Using FPS and system load monitoring (Turns on and off by the key combination - right Shift + F12)]}
     PW_MANGOHUD_USER_CONF_INFO=${translations[Forced use of MANGOHUD system settings (GOverlay, etc.)]}
@@ -5432,6 +5426,7 @@ gui_edit_db () {
     PW_USE_GALLIUM_NINE_INFO=${translations[Use Gallium Nine (native DirectX 9 for MESA)]}
     PW_USE_WINED3D_VULKAN_INFO=${translations[Instead of DXVK, use WineD3D vulkan (Damavand). Experimental function.]}
     PW_USE_SUPPLIED_DXVK_VKD3D_INFO=${translations[Use dxvk and vkd3d which are bundled with wine or proton. (Does not work with PROTON_LG and WINE_LG)]}
+    PW_USE_SAREK_ASYNC_INFO=${translations[Use async version of dxvk-sarek. (May work better or vice versa)]}
 
 #     PW_VULKAN_NO_ASYNC_INFO=${translations[Disable asynchronous calls for VULKAN and DXVK modes]}
 #     PW_OLD_GL_STRING_INFO=${translations[Forced use of older versions of OpenGL]}
@@ -5444,15 +5439,10 @@ gui_edit_db () {
             VKD3D_CB="DCB"
             DISABLE_EDIT_DB_LIST="PW_VKBASALT PW_VKBASALT_USER_CONF PW_USE_RAY_TRACING PW_USE_OBS_VKCAPTURE PW_USE_GALLIUM_ZINK PW_USE_WINED3D_VULKAN"
             ;;
-        1|2)
+        1|2|6)
-            # Stable, Newest
+            # Sarek, Newest
             VKD3D_CB="CB"
             ;;
-        3)
-            # Legacy
-            VKD3D_CB="DCB"
-            DISABLE_EDIT_DB_LIST="PW_USE_RAY_TRACING"
-            ;;
     esac
 
     [[ ! -e "/dev/ntsync" ]] && DISABLE_EDIT_DB_LIST+=" PW_USE_NTSYNC"
@@ -6036,7 +6026,7 @@ gui_dgvoodoo2 () {
     PW_DGV2_INACTIVE_APP_STATE
     )
 
-    PW_DGV2_USE_DX12_INFO=${translations[Use DirectX12 for dgVoodoo2. Doesnt always work better. (Working only on newest and stable dxvk/vkd3d) (Direct3D and Glide settings)]}
+    PW_DGV2_USE_DX12_INFO=${translations[Use DirectX12 for dgVoodoo2. Doesnt always work better. (Working only on newest and sarek dxvk/vkd3d) (Direct3D and Glide settings)]}
     PW_DGV2_FORCE_VSYNC_INFO=${translations[Force the vertical sync to avoid tearing or prevent the GPU from rendering at crazy high speed. Keep in mind that some application need unforced vSync because of synchronization reasons. (Direct3D settings)]}
     PW_DGV2_DGVOODOO_WATERMARK_INFO=${translations[Shows the dgVoodoo watermark in-game when enabled. (Direct3D settings)]}
     PW_DGV2_ENABLE_CRT_INFO=${translations[CRT-like blurred appearance. (Direct3D and Glide settings)]}
@@ -6061,7 +6051,7 @@ gui_dgvoodoo2 () {
     [[ "${PW_DGV2_ANTIALIASING}" == "0" ]] && export PW_DGV2_ANTIALIASING="disabled" && edit_db_from_gui PW_DGV2_ANTIALIASING
 
     case "${PW_VULKAN_USE}" in
-        0|3)
+        0)
             DISABLE_DGV2_LIST="PW_DGV2_USE_DX12
             "
             ;;
@@ -7095,9 +7085,8 @@ portwine_start_debug () {
     echo "--------------------------------------------------------" >> "${PORT_WINE_PATH}/PortProton.log"
     case "$PW_VULKAN_USE" in
         0) echo "PW_VULKAN_USE=${PW_VULKAN_USE} - DirectX to wined3d opengl" >> "${PORT_WINE_PATH}/PortProton.log" ;;
-        1) echo "PW_VULKAN_USE=${PW_VULKAN_USE} - DXVK v.${DXVK_STABLE_VER}, VKD3D-PROTON v.${VKD3D_STABLE_VER}" >> "${PORT_WINE_PATH}/PortProton.log" ;;
+        1) echo "PW_VULKAN_USE=${PW_VULKAN_USE} - DXVK v.${DXVK_SAREK_VER}, VKD3D-PROTON v.${VKD3D_SAREK_VER}" >> "${PORT_WINE_PATH}/PortProton.log" ;;
         2) echo "PW_VULKAN_USE=${PW_VULKAN_USE} - DXVK v.${DXVK_GIT_VER}, VKD3D-PROTON v.${VKD3D_GIT_VER}" >> "${PORT_WINE_PATH}/PortProton.log" ;;
-        3) echo "PW_VULKAN_USE=${PW_VULKAN_USE} - DXVK v.${DXVK_LEGACY_VER}" >> "${PORT_WINE_PATH}/PortProton.log" ;;
         *) echo "PW_VULKAN_USE=${PW_VULKAN_USE}" >> "${PORT_WINE_PATH}/PortProton.log" ;;
     esac
     echo "--------------------------------------------" >> "${PORT_WINE_PATH}/PortProton.log"

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_SAREK="${translations[DXVK-Sarek, VKD3D (Vulkan v1.1+)]}"
-SORT_STABLE="${translations[Stable DXVK, VKD3D (Vulkan v1.2)]}"
+SORT_NEWEST="${translations[Newest DXVK, VKD3D (Vulkan v1.3+)]}"
-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
 
 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

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_SAREK_VER="sarek-1.11.0"
-export DXVK_STABLE_VER="1.10.3-28"
 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"