Compare commits

..

9 Commits

Author SHA1 Message Date
Mikhail Tergoev
779fc18eb5 updated locales 2025-07-24 16:56:23 +03:00
Mikhail Tergoev
b5564b32c5 refactored 3D Api 2025-07-24 16:56:08 +03:00
Mikhail Tergoev
812cadac41 Merge branch 'Htylol-added_dxvk_stable-2' into devel 2025-07-24 15:08:00 +03:00
Mikhail Tergoev
6bee5b77f1 Merge branch 'added_dxvk_stable-2' of github.com:Htylol/PortWINE into Htylol-added_dxvk_stable-2 2025-07-24 15:07:53 +03:00
a480074dc8 Refactoring 3D api number 2 (Added stable 1.3+ dvxk,vkd3d) 2025-07-24 17:07:28 +05:00
Mikhail Tergoev
a841a3a72c Merge branch 'Boria138-cachy-v3' into devel 2025-07-24 12:54:16 +03:00
Mikhail Tergoev
cf9f9c4561 Merge branch 'cachy-v3' of github.com:Boria138/PortWINE into Boria138-cachy-v3 2025-07-24 12:54:06 +03:00
Mikhail Tergoev
152c8191af updated PROTON_LG to 10-10 (with ntsync support) 2025-07-24 12:39:59 +03:00
b41bf42d2a feat: added cachy v3 to get_other_wine if supported
Signed-off-by: Boris Yumankulov <boria138@altlinux.org>
2025-07-24 12:49:36 +05:00
6 changed files with 213 additions and 118 deletions

View File

@@ -7,7 +7,7 @@
msgid "" msgid ""
msgstr "Project-Id-Version: PACKAGE VERSION\n" msgstr "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2025-07-23 21:55+0500\n" "POT-Creation-Date: 2025-07-24 16:50+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -61,16 +61,36 @@ msgid "--autoinstall and the name of what needs to be installed is given in "
"the list below:" "the list below:"
msgstr "" msgstr ""
msgid "Select DXVK and VKD3D versions for DirectX to Vulkan translation:\n"
" - The newest ones work only with MESA 25+ drivers, or NVIDIA "
"550.54.14+\n"
" - Stable ones work with any drivers, provided that the video card "
"supports Vulkan version 1.3+\n"
" - Sarek works with almost any video card that supports Vulkan\n"
" - WineD3D OpenGL works on any PC, but with low performance and "
"old games"
msgstr ""
msgid "Selecting a WINE version."
msgstr ""
msgid "Select a prefix to launch the game/application (if you enter a non-"
"existent name, a new prefix will be created)."
msgstr ""
msgid "USE_SYSTEM_WINE" msgid "USE_SYSTEM_WINE"
msgstr "" msgstr ""
msgid "WineD3D OpenGL (For video cards without Vulkan)" msgid "WineD3D OpenGL (For video cards without Vulkan)"
msgstr "" msgstr ""
msgid "DXVK-Sarek, VKD3D (Vulkan v1.1+)" msgid "DXVK, VKD3D (Sarek) (Vulkan v1.1+)"
msgstr "" msgstr ""
msgid "Newest DXVK, VKD3D (Vulkan v1.3+)" msgid "DXVK, VKD3D (Stable) (Vulkan v1.3+)"
msgstr ""
msgid "DXVK, VKD3D (Newest) (Vulkan v1.3+)"
msgstr "" msgstr ""
msgid "GET-OTHER-WINE" msgid "GET-OTHER-WINE"
@@ -381,6 +401,9 @@ msgstr ""
msgid "Check new version WINE..." msgid "Check new version WINE..."
msgstr "" msgstr ""
msgid "Error: failed to fetch metadata."
msgstr ""
msgid "Error: check wine." msgid "Error: check wine."
msgstr "" msgstr ""

View File

@@ -8,8 +8,8 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: \n" "Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2025-07-23 21:55+0500\n" "POT-Creation-Date: 2025-07-24 16:50+0300\n"
"PO-Revision-Date: 2025-07-21 23:18+0500\n" "PO-Revision-Date: 2025-07-24 15:26+0500\n"
"Last-Translator: \n" "Last-Translator: \n"
"Language-Team: \n" "Language-Team: \n"
"Language: es_ES\n" "Language: es_ES\n"
@@ -81,17 +81,38 @@ msgstr ""
"--autoinstall y el nombre de lo que se debe instalar se indica en la lista a " "--autoinstall y el nombre de lo que se debe instalar se indica en la lista a "
"continuación:" "continuación:"
msgid ""
"Select DXVK and VKD3D versions for DirectX to Vulkan translation:\n"
" - The newest ones work only with MESA 25+ drivers, or NVIDIA 550.54.14+\n"
" - Stable ones work with any drivers, provided that the video card "
"supports Vulkan version 1.3+\n"
" - Sarek works with almost any video card that supports Vulkan\n"
" - WineD3D OpenGL works on any PC, but with low performance and old games"
msgstr ""
#, fuzzy
msgid "Selecting a WINE version."
msgstr "Seleccionar WINE para descargar:"
msgid ""
"Select a prefix to launch the game/application (if you enter a non-existent "
"name, a new prefix will be created)."
msgstr ""
msgid "USE_SYSTEM_WINE" msgid "USE_SYSTEM_WINE"
msgstr "Usar Wine del sistema" msgstr "Usar Wine del sistema"
msgid "WineD3D OpenGL (For video cards without Vulkan)" msgid "WineD3D OpenGL (For video cards without Vulkan)"
msgstr "WineD3D OpenGL (Para tarjetas de video sin Vulkan)" msgstr "WineD3D OpenGL (Para tarjetas de video sin Vulkan)"
msgid "DXVK-Sarek, VKD3D (Vulkan v1.1+)" msgid "DXVK, VKD3D (Sarek) (Vulkan v1.1+)"
msgstr "DXVK-Sarek, VKD3D (Vulkan v1.1+)" msgstr "DXVK, VKD3D (Sarek) (Vulkan v1.1+)"
msgid "Newest DXVK, VKD3D (Vulkan v1.3+)" msgid "DXVK, VKD3D (Stable) (Vulkan v1.3+)"
msgstr "Más nuevo DXVK, VKD3D (Vulkan v1.3+)" msgstr "DXVK, VKD3D (Stable) (Vulkan v1.3+)"
msgid "DXVK, VKD3D (Newest) (Vulkan v1.3+)"
msgstr "DXVK, VKD3D (Newest) (Vulkan v1.3+)"
msgid "GET-OTHER-WINE" msgid "GET-OTHER-WINE"
msgstr "OBTENER OTRO WINE" msgstr "OBTENER OTRO WINE"
@@ -427,6 +448,9 @@ msgstr "FORZAR SALIDA"
msgid "Check new version WINE..." msgid "Check new version WINE..."
msgstr "Comprobar nueva versión de WINE..." msgstr "Comprobar nueva versión de WINE..."
msgid "Error: failed to fetch metadata."
msgstr ""
msgid "Error: check wine." msgid "Error: check wine."
msgstr "Error: verificar wine." msgstr "Error: verificar wine."
@@ -2245,8 +2269,8 @@ msgstr "BIBLIOTECAS DE TERCEROS"
#~ msgid "" #~ msgid ""
#~ "For adding shortcut to STEAM, needed restart.\\n\\nRestart STEAM now?" #~ "For adding shortcut to STEAM, needed restart.\\n\\nRestart STEAM now?"
#~ msgstr "" #~ msgstr ""
#~ "Para agregar el acceso directo a STEAM, es necesario reiniciar." #~ "Para agregar el acceso directo a STEAM, es necesario reiniciar.\\n"
#~ "\\n\\¿Quieres reiniciar STEAM ahora?" #~ "\\¿Quieres reiniciar STEAM ahora?"
#~ msgid "Restarting STEAM... Please wait." #~ msgid "Restarting STEAM... Please wait."
#~ msgstr "Restarting STEAM... Please wait." #~ msgstr "Restarting STEAM... Please wait."

View File

@@ -7,16 +7,16 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: \n" "Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2025-07-23 21:55+0500\n" "POT-Creation-Date: 2025-07-24 16:50+0300\n"
"PO-Revision-Date: 2025-07-23 21:56+0500\n" "PO-Revision-Date: 2025-07-24 16:51+0300\n"
"Last-Translator: \n" "Last-Translator: \n"
"Language-Team: \n" "Language-Team: \n"
"Language: ru_RU\n" "Language: ru_RU\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && " "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
"n%10<=4 && (n%100<12 || n%100>14) ? 1 : 2);\n" "%10<=4 && (n%100<12 || n%100>14) ? 1 : 2);\n"
"X-Generator: Poedit 3.6\n" "X-Generator: Poedit 3.6\n"
msgid "" msgid ""
@@ -80,17 +80,46 @@ msgstr ""
"--autoinstall и название того, что необходимо установить, указано в списке " "--autoinstall и название того, что необходимо установить, указано в списке "
"ниже:" "ниже:"
msgid ""
"Select DXVK and VKD3D versions for DirectX to Vulkan translation:\n"
" - The newest ones work only with MESA 25+ drivers, or NVIDIA 550.54.14+\n"
" - Stable ones work with any drivers, provided that the video card "
"supports Vulkan version 1.3+\n"
" - Sarek works with almost any video card that supports Vulkan\n"
" - WineD3D OpenGL works on any PC, but with low performance and old games"
msgstr ""
"Выберите версии DXVK и VKD3D для трансляции DirectX в Vulkan:\n"
" - Новейшие работают только с драйверами MESA 25+, или NVIDIA 550.54.14+\n"
" - Стабильные работают с любыми драйверами при условии что видеокарта "
"поддерживает Vulkan версии 1.3+\n"
" - Sarek работает почти с любой видеокартой поддерживающей Vulkan\n"
" - WineD3D OpenGL работает на любом ПК, но с низкой производительностью и "
"старыми играми"
msgid "Selecting a WINE version."
msgstr "Выбор версии WINE."
msgid ""
"Select a prefix to launch the game/application (if you enter a non-existent "
"name, a new prefix will be created)."
msgstr ""
"Выбор префикса для запуска игры/приложения (при вводе не существующего "
"названия будет создан новый префикс)."
msgid "USE_SYSTEM_WINE" msgid "USE_SYSTEM_WINE"
msgstr "Использовать системную версию wine" msgstr "Использовать системную версию wine"
msgid "WineD3D OpenGL (For video cards without Vulkan)" msgid "WineD3D OpenGL (For video cards without Vulkan)"
msgstr "WineD3D OpenGL (для видеокарт без поддержки Vulkan)" msgstr "WineD3D OpenGL (для видеокарт без поддержки Vulkan)"
msgid "DXVK-Sarek, VKD3D (Vulkan v1.1+)" msgid "DXVK, VKD3D (Sarek) (Vulkan v1.1+)"
msgstr "DXVK-Sarek, VKD3D (Vulkan v1.1+)" msgstr "DXVK, VKD3D (Sarek) (Vulkan v1.1+)"
msgid "Newest DXVK, VKD3D (Vulkan v1.3+)" msgid "DXVK, VKD3D (Stable) (Vulkan v1.3+)"
msgstr "Новейшие DXVK, VKD3D (Vulkan v1.3+)" msgstr "DXVK, VKD3D (Стабильные) (Vulkan v1.3+)"
msgid "DXVK, VKD3D (Newest) (Vulkan v1.3+)"
msgstr "DXVK, VKD3D (Новейшие) (Vulkan v1.3+)"
msgid "GET-OTHER-WINE" msgid "GET-OTHER-WINE"
msgstr "Скачать другие версии wine" msgstr "Скачать другие версии wine"
@@ -339,8 +368,8 @@ msgid ""
"More than one DB file found for the application being launched.\\nSelect the " "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" "required one, or delete the extra DB file before the next run.\\n"
msgstr "" msgstr ""
"Для запускаемого приложения найдено более одного конфигурационного " "Для запускаемого приложения найдено более одного конфигурационного файла ."
"файла .ppdb.\\nВыберите нужный или удалите лишний файл .ppdb перед следующим " "ppdb.\\nВыберите нужный или удалите лишний файл .ppdb перед следующим "
"запуском\\n" "запуском\\n"
msgid "Update scripts:" msgid "Update scripts:"
@@ -428,6 +457,9 @@ msgstr "ПРИНУДИТЕЛЬНЫЙ ВЫХОД"
msgid "Check new version WINE..." msgid "Check new version WINE..."
msgstr "Проверяем новые версии WINE..." msgstr "Проверяем новые версии WINE..."
msgid "Error: failed to fetch metadata."
msgstr "Ошибка: не удалось получить метаданные."
msgid "Error: check wine." msgid "Error: check wine."
msgstr "Ошибка во время проверки версии WINE." msgstr "Ошибка во время проверки версии WINE."
@@ -474,8 +506,8 @@ msgid ""
"<b>Super + Y :</b> Toggle NIS upscaling\n" "<b>Super + Y :</b> Toggle NIS upscaling\n"
"<b>Super + I :</b> Increase FSR sharpness by 1\n" "<b>Super + I :</b> Increase FSR sharpness by 1\n"
"<b>Super + O :</b> Decrease 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/" "<b>Super + S :</b> Take screenshot (currently goes to /tmp/gamescope_DATE."
"gamescope_DATE.png)\n" "png)\n"
"<b>Super + G :</b> Toggle keyboard grab\n" "<b>Super + G :</b> Toggle keyboard grab\n"
"<b>Super + C :</b> Update clipboard" "<b>Super + C :</b> Update clipboard"
msgstr "" msgstr ""
@@ -1317,9 +1349,9 @@ msgid ""
"MangoHud settings (Keys <b>R_SHIFT + F12</b> disable MangoHud)\\n<b>note:</" "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." "b> To display help for each item, just hover the mouse cursor over the text."
msgstr "" msgstr ""
"Настройки MangoHud (клавиши <b>R_SHIFT + F12</b> отключают MangoHud)" "Настройки MangoHud (клавиши <b>R_SHIFT + F12</b> отключают "
"\\n<b>Примечание:</b> Чтобы отобразить справку для каждого элемента, " "MangoHud)\\n<b>Примечание:</b> Чтобы отобразить справку для каждого "
"наведите курсор мыши на текст." "элемента, наведите курсор мыши на текст."
msgid "" msgid ""
"Enabling fps limitation with MANGOHUD tools built into PortProton (Keys " "Enabling fps limitation with MANGOHUD tools built into PortProton (Keys "
@@ -2235,14 +2267,14 @@ msgstr "БИБЛИОТЕКИ"
#~ msgid "" #~ msgid ""
#~ "<b>Gamescope is not detected on the system, to install it, run the " #~ "<b>Gamescope is not detected on the system, to install it, run the "
#~ "command in the terminal:\\nflatpak install -y runtime/" #~ "command in the terminal:\\nflatpak install -y runtime/org.freedesktop."
#~ "org.freedesktop.Platform.VulkanLayer.gamescope/x86_64/$%" #~ "Platform.VulkanLayer.gamescope/x86_64/$%{GAMESCOPE_VERSION}%\\n(Can be "
#~ "{GAMESCOPE_VERSION}%\\n(Can be selected and copied)</b>" #~ "selected and copied)</b>"
#~ msgstr "" #~ msgstr ""
#~ "<b>Gamescope не найден в системе, для его установки выполните команду в " #~ "<b>Gamescope не найден в системе, для его установки выполните команду в "
#~ "терминале:\\nflatpak install -y runtime/" #~ "терминале:\\nflatpak install -y runtime/org.freedesktop.Platform."
#~ "org.freedesktop.Platform.VulkanLayer.gamescope/x86_64/$%" #~ "VulkanLayer.gamescope/x86_64/$%{GAMESCOPE_VERSION}%\\n(Данный текст можно "
#~ "{GAMESCOPE_VERSION}%\\n(Данный текст можно выделить и скопировать)</b>" #~ "выделить и скопировать)</b>"
#, sh-format #, sh-format
#~ msgid "" #~ msgid ""
@@ -2529,8 +2561,8 @@ msgstr "БИБЛИОТЕКИ"
#~ "<b>-F fsr:</b> use AMD FidelityFX™ Super Resolution 1.0 for upscaling.\n" #~ "<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>-F nis:</b> use NVIDIA Image Scaling v1.0.3 for upscaling.\n"
#~ "<b>-S integer:</b> use integer scaling.\n" #~ "<b>-S integer:</b> use integer scaling.\n"
#~ "<b>-S stretch:</b> use stretch scaling, the game will fill the window. " #~ "<b>-S stretch:</b> use stretch scaling, the game will fill the window. (e."
#~ "(e.g. 4:3 to 16:9).\n" #~ "g. 4:3 to 16:9).\n"
#~ "<b>-b:</b> create a border-less window.\n" #~ "<b>-b:</b> create a border-less window.\n"
#~ "<b>-f:</b> create a full-screen window." #~ "<b>-f:</b> create a full-screen window."
#~ msgstr "" #~ msgstr ""
@@ -2539,8 +2571,8 @@ msgstr "БИБЛИОТЕКИ"
#~ "размера окна Gamescope обновит эти настройки. Если указано -H, а -W нет, " #~ "размера окна Gamescope обновит эти настройки. Если указано -H, а -W нет, "
#~ "предполагается соотношение сторон 16:9. По умолчанию установлено значение " #~ "предполагается соотношение сторон 16:9. По умолчанию установлено значение "
#~ "1280×720.\n" #~ "1280×720.\n"
#~ "<b>-w, -h:</b> установить разрешение, используемое в игре. Если указано " #~ "<b>-w, -h:</b> установить разрешение, используемое в игре. Если указано -"
#~ "-h, а -w нет, предполагается соотношение сторон 16:9. По умолчанию " #~ "h, а -w нет, предполагается соотношение сторон 16:9. По умолчанию "
#~ "используются значения, указанные в -W и -H.\n" #~ "используются значения, указанные в -W и -H.\n"
#~ "<b>-r:</b> установить ограничение частоты кадров для игры. По умолчанию " #~ "<b>-r:</b> установить ограничение частоты кадров для игры. По умолчанию "
#~ "значение неограниченно.\n" #~ "значение неограниченно.\n"

View File

@@ -2162,7 +2162,7 @@ pw_check_and_download_wine () {
pw_check_and_download_dxvk_and_vkd3d () { pw_check_and_download_dxvk_and_vkd3d () {
# Download DXVK versions # Download DXVK versions
for DXVK_VAR_VER in "${DXVK_SAREK_VER}" "${DXVK_GIT_VER}" ; do for DXVK_VAR_VER in "${DXVK_SAREK_VER}" "${DXVK_OLD_VER}" "${DXVK_NEW_VER}" ; do
if [[ ! -d "${PW_VULKAN_DIR}/dxvk-${DXVK_VAR_VER}" ]] ; then if [[ ! -d "${PW_VULKAN_DIR}/dxvk-${DXVK_VAR_VER}" ]] ; then
print_info "Download and install DXVK v.${DXVK_VAR_VER}" 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" \ if try_download "https://github.com/Castro-Fidel/vulkan/releases/download/dxvk-${DXVK_VAR_VER}/dxvk-${DXVK_VAR_VER}.tar.xz" \
@@ -2192,7 +2192,7 @@ pw_check_and_download_dxvk_and_vkd3d () {
done done
# Download VKD3D versions # Download VKD3D versions
for VKD3D_VAR_VER in "${VKD3D_SAREK_VER}" "${VKD3D_GIT_VER}" ; do for VKD3D_VAR_VER in "${VKD3D_SAREK_VER}" "${VKD3D_OLD_VER}" "${VKD3D_NEW_VER}" ; do
if [[ ! -d "${PW_VULKAN_DIR}/vkd3d-proton-${VKD3D_VAR_VER}" ]] ; then if [[ ! -d "${PW_VULKAN_DIR}/vkd3d-proton-${VKD3D_VAR_VER}" ]] ; then
print_info "Download and install VKD3D-PROTON v.${VKD3D_VAR_VER}" 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" \ if try_download "https://github.com/Castro-Fidel/vulkan/releases/download/vkd3d-proton-${VKD3D_VAR_VER}/vkd3d-proton-${VKD3D_VAR_VER}.tar.xz" \
@@ -2817,12 +2817,23 @@ pw_check_vulkan () {
fi fi
} }
pw_check_glxinfo () {
if [[ ! -f "${PW_TMPFS_PATH}/glxinfo.tmp" ]] ; then
TIMEOUT_CMD="5"
if pw_check_command glxinfo -B
then return 0
else return 1
fi
fi
}
pw_get_tmp_files () { pw_get_tmp_files () {
for f_cmd in "gamescope --help" "lspci -k" "xrandr --current" "locale -a" for f_cmd in "gamescope --help" "lspci -k" "xrandr --current" "locale -a"
do pw_check_command "$f_cmd" do pw_check_command "$f_cmd"
done done
pw_check_vulkan pw_check_vulkan
pw_check_glxinfo
# GALLIUM NINE # GALLIUM NINE
unset FIND_D3D_MODULE D3D_MODULE_PATH unset FIND_D3D_MODULE D3D_MODULE_PATH
@@ -3765,7 +3776,7 @@ fi
# WINED3D OPENGL # WINED3D OPENGL
print_info "Use WINED3D OpenGL" print_info "Use WINED3D OpenGL"
unset PW_VKBASALT PW_USE_GALLIUM_ZINK PW_USE_WINED3D_VULKAN PW_USE_SUPPLIED_DXVK_VKD3D unset PW_VKBASALT PW_USE_GALLIUM_ZINK PW_USE_WINED3D_VULKAN PW_USE_SUPPLIED_DXVK_VKD3D
PATH_TO_VKD3D_FILES="${PW_VULKAN_DIR}/vkd3d-proton-${VKD3D_GIT_VER}" PATH_TO_VKD3D_FILES="${PW_VULKAN_DIR}/vkd3d-proton-${VKD3D_NEW_VER}"
CP_VKD3D_FILES="libvkd3d-1 libvkd3d-shader-1" CP_VKD3D_FILES="libvkd3d-1 libvkd3d-shader-1"
CP_WINE_FILES="d3d12 d3d12core d3d11 d3d10core d3d10_1 d3d10 d3d9 d3d8 dxgi" CP_WINE_FILES="d3d12 d3d12core d3d11 d3d10core d3d10_1 d3d10 d3d9 d3d8 dxgi"
;; ;;
@@ -3782,28 +3793,38 @@ fi
fi fi
PATH_TO_VKD3D_FILES="${PW_VULKAN_DIR}/vkd3d-proton-${VKD3D_SAREK_VER}" PATH_TO_VKD3D_FILES="${PW_VULKAN_DIR}/vkd3d-proton-${VKD3D_SAREK_VER}"
CP_DXVK_FILES="d3d11 d3d10core d3d9 d3d8 dxgi" 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-1 libvkd3d-shader-1" CP_VKD3D_FILES="d3d12 libvkd3d-1 libvkd3d-shader-1"
CP_WINE_FILES="d3d12core d3d10_1 d3d10" CP_WINE_FILES="d3d12core d3d10_1 d3d10"
;; ;;
2) 2)
# NEWEST DXVK AND VKD3D # NEWEST DXVK AND VKD3D
print_info "DXVK v.${DXVK_GIT_VER} in use" print_info "DXVK v.${DXVK_NEW_VER} in use"
print_info "VKD3D-PROTON v.${VKD3D_GIT_VER} in use" print_info "VKD3D-PROTON v.${VKD3D_NEW_VER} in use"
PATH_TO_DXVK_FILES="${PW_VULKAN_DIR}/dxvk-${DXVK_GIT_VER}" PATH_TO_DXVK_FILES="${PW_VULKAN_DIR}/dxvk-${DXVK_NEW_VER}"
PATH_TO_VKD3D_FILES="${PW_VULKAN_DIR}/vkd3d-proton-${VKD3D_GIT_VER}" PATH_TO_VKD3D_FILES="${PW_VULKAN_DIR}/vkd3d-proton-${VKD3D_NEW_VER}"
CP_DXVK_FILES="d3d11 d3d10core d3d9 d3d8 dxgi"
CP_VKD3D_FILES="d3d12 d3d12core libvkd3d-1 libvkd3d-shader-1"
CP_WINE_FILES="d3d10_1 d3d10"
;;
6)
# STABLE DXVK AND VKD3D
print_info "DXVK v.${DXVK_OLD_VER} in use"
print_info "VKD3D-PROTON v.${VKD3D_OLD_VER} in use"
PATH_TO_DXVK_FILES="${PW_VULKAN_DIR}/dxvk-${DXVK_OLD_VER}"
PATH_TO_VKD3D_FILES="${PW_VULKAN_DIR}/vkd3d-proton-${VKD3D_OLD_VER}"
CP_DXVK_FILES="d3d11 d3d10core d3d9 d3d8 dxgi" 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 d3d12core libvkd3d-1 libvkd3d-shader-1" CP_VKD3D_FILES="d3d12 d3d12core libvkd3d-1 libvkd3d-shader-1"
CP_WINE_FILES="d3d10_1 d3d10" CP_WINE_FILES="d3d10_1 d3d10"
;; ;;
esac esac
[[ "$PW_USE_VRCLIENT" = "1" ]] && add_to_var CP_DXVK_FILES "openvr_api_dxvk"
if [[ $PW_USE_GALLIUM_NINE == "1" ]] \ if [[ $PW_USE_GALLIUM_NINE == "1" ]] \
|| [[ $PW_USE_GALLIUM_ZINK == "1" ]] \ || [[ $PW_USE_GALLIUM_ZINK == "1" ]] \
|| [[ $PW_USE_WINED3D_VULKAN == "1" ]] ; then || [[ $PW_USE_WINED3D_VULKAN == "1" ]] ; then
unset PATH_TO_DXVK_FILES CP_DXVK_FILES PW_USE_SUPPLIED_DXVK_VKD3D unset PATH_TO_DXVK_FILES CP_DXVK_FILES PW_USE_SUPPLIED_DXVK_VKD3D
PATH_TO_VKD3D_FILES="${PW_VULKAN_DIR}/vkd3d-proton-${VKD3D_GIT_VER}" PATH_TO_VKD3D_FILES="${PW_VULKAN_DIR}/vkd3d-proton-${VKD3D_NEW_VER}"
CP_VKD3D_FILES="libvkd3d-1 libvkd3d-shader-1" CP_VKD3D_FILES="libvkd3d-1 libvkd3d-shader-1"
CP_WINE_FILES="d3d12 d3d12core d3d11 d3d10core d3d10_1 d3d10 d3d9 d3d8 dxgi" CP_WINE_FILES="d3d12 d3d12core d3d11 d3d10core d3d10_1 d3d10 d3d9 d3d8 dxgi"
fi fi
@@ -3942,7 +3963,7 @@ fi
done done
# DGVOODOO2 settings: # DGVOODOO2 settings:
if [[ "${PW_DGV2_USE_DX12}" == "1" ]] ; then if [[ "${PW_DGV2_USE_DX12}" == "1" ]] ; then
if [[ "${PW_VULKAN_USE}" == "1" ]] || [[ "${PW_VULKAN_USE}" == "2" ]] if [[ "${PW_VULKAN_USE}" =~ ^(1|2|6)$ ]]
then sed -i "s/OutputAPI = d3d11_fl11_0/OutputAPI = d3d12_fl12_0/" "$DGV2CONF" then sed -i "s/OutputAPI = d3d11_fl11_0/OutputAPI = d3d12_fl12_0/" "$DGV2CONF"
fi fi
fi fi
@@ -4150,9 +4171,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/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" try_force_link_file "${WINEDIR}/lib64/wine/nvapi/nvofapi64.dll" "${WINEPREFIX}/drive_c/windows/system32/nvofapi64.dll"
else else
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 "${PW_VULKAN_DIR}/dxvk-${DXVK_NEW_VER}/x32/nvapi.dll" "${WINEPREFIX}/drive_c/windows/syswow64/nvapi.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 "${PW_VULKAN_DIR}/dxvk-${DXVK_NEW_VER}/x64/nvapi64.dll" "${WINEPREFIX}/drive_c/windows/system32/nvapi64.dll"
try_force_link_file "${PW_VULKAN_DIR}/dxvk-${DXVK_GIT_VER}/x64/nvofapi64.dll" "${WINEPREFIX}/drive_c/windows/system32/nvofapi64.dll" try_force_link_file "${PW_VULKAN_DIR}/dxvk-${DXVK_NEW_VER}/x64/nvofapi64.dll" "${WINEPREFIX}/drive_c/windows/system32/nvofapi64.dll"
fi fi
var_winedlloverride_update "nvapi64,nvofapi64,nvapi=n;nvcuda=b" var_winedlloverride_update "nvapi64,nvofapi64,nvapi=n;nvcuda=b"
else else
@@ -5145,8 +5166,24 @@ gui_proton_downloader () {
# PROTON_CACHYOS # PROTON_CACHYOS
PROTON_CACHYOS_GIT=($(echo "$METADATA" | jq -r '.proton_cachyos[]?.name' 2>/dev/null)) PROTON_CACHYOS_GIT=($(echo "$METADATA" | jq -r '.proton_cachyos[]?.name' 2>/dev/null))
if [[ -n "${PROTON_CACHYOS_GIT[0]}" ]] ; then if [[ -n "${PROTON_CACHYOS_GIT[0]}" ]] ; then
# The Pentium/Celeron don't have the full instruction set, but /lib/ld-linux-x86-64.so.2 --help | grep -B 3 -E “x86-64” says otherwise, so this is where checking all flags comes in (code from https://dl.xanmod.org/check_x86-64_psabi.sh)
CPU_LEVEL=$(awk '
BEGIN {
while (!/flags/) if (getline < "/proc/cpuinfo" != 1) exit 1
if (/lm/&&/cmov/&&/cx8/&&/fpu/&&/fxsr/&&/mmx/&&/syscall/&&/sse2/) level = 1
if (level == 1 && /cx16/&&/lahf/&&/popcnt/&&/sse4_1/&&/sse4_2/&&/ssse3/) level = 2
if (level == 2 && /avx/&&/avx2/&&/bmi1/&&/bmi2/&&/f16c/&&/fma/&&/abm/&&/movbe/&&/xsave/) level = 3
if (level == 3 && /avx512f/&&/avx512bw/&&/avx512cd/&&/avx512dq/&&/avx512vl/) level = 4
if (level > 0) { print level; exit level + 1 }
exit 1
}' /proc/cpuinfo)
for PGEGIT in "${PROTON_CACHYOS_GIT[@]}" ; do for PGEGIT in "${PROTON_CACHYOS_GIT[@]}" ; do
if [[ "$PGEGIT" =~ v3 ]] && [[ "$CPU_LEVEL" -lt 3 ]]; then
continue
else
echo "${PGEGIT}" >> "${PW_TMPFS_PATH}/tmp_proton_cachyos_git" echo "${PGEGIT}" >> "${PW_TMPFS_PATH}/tmp_proton_cachyos_git"
fi
done done
fi fi
@@ -7086,7 +7123,8 @@ portwine_start_debug () {
case "$PW_VULKAN_USE" in case "$PW_VULKAN_USE" in
0) echo "PW_VULKAN_USE=${PW_VULKAN_USE} - DirectX to wined3d opengl" >> "${PORT_WINE_PATH}/PortProton.log" ;; 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_SAREK_VER}, VKD3D-PROTON v.${VKD3D_SAREK_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" ;; 2) echo "PW_VULKAN_USE=${PW_VULKAN_USE} - DXVK v.${DXVK_NEW_VER}, VKD3D-PROTON v.${VKD3D_NEW_VER}" >> "${PORT_WINE_PATH}/PortProton.log" ;;
6) echo "PW_VULKAN_USE=${PW_VULKAN_USE} - DXVK v.${DXVK_OLD_VER}, VKD3D-PROTON v.${VKD3D_OLD_VER}" >> "${PORT_WINE_PATH}/PortProton.log" ;;
*) echo "PW_VULKAN_USE=${PW_VULKAN_USE}" >> "${PORT_WINE_PATH}/PortProton.log" ;; *) echo "PW_VULKAN_USE=${PW_VULKAN_USE}" >> "${PORT_WINE_PATH}/PortProton.log" ;;
esac esac
echo "--------------------------------------------" >> "${PORT_WINE_PATH}/PortProton.log" echo "--------------------------------------------" >> "${PORT_WINE_PATH}/PortProton.log"

View File

@@ -495,6 +495,14 @@ esac
### GUI ### ### GUI ###
INFO_3DAPI=${translations[Select DXVK and VKD3D versions for DirectX to Vulkan translation:
- The newest ones work only with MESA 25+ drivers, or NVIDIA 550.54.14+
- Stable ones work with any drivers, provided that the video card supports Vulkan version 1.3+
- Sarek works with almost any video card that supports Vulkan
- WineD3D OpenGL works on any PC, but with low performance and old games]}
INFO_WINE=${translations[Selecting a WINE version.]}
INFO_PREFIX=${translations[Select a prefix to launch the game/application (if you enter a non-existent name, a new prefix will be created).]}
unset PW_ADD_PREFIXES_TO_GUI unset PW_ADD_PREFIXES_TO_GUI
if [[ -d "${PORT_WINE_PATH}/data/prefixes/" ]] ; then if [[ -d "${PORT_WINE_PATH}/data/prefixes/" ]] ; then
for PAIG in "${PORT_WINE_PATH}"/data/prefixes/* ; do for PAIG in "${PORT_WINE_PATH}"/data/prefixes/* ; do
@@ -520,8 +528,26 @@ then DIST_ADD_TO_GUI+="!${translations[USE_SYSTEM_WINE]}"
fi fi
SORT_OPENGL="${translations[WineD3D OpenGL (For video cards without Vulkan)]}" SORT_OPENGL="${translations[WineD3D OpenGL (For video cards without Vulkan)]}"
SORT_SAREK="${translations[DXVK-Sarek, VKD3D (Vulkan v1.1+)]}" SORT_SAREK="${translations[DXVK, VKD3D (Sarek) (Vulkan v1.1+)]}"
SORT_NEWEST="${translations[Newest DXVK, VKD3D (Vulkan v1.3+)]}" SORT_STABLE="${translations[DXVK, VKD3D (Stable) (Vulkan v1.3+)]}"
SORT_NEWEST="${translations[DXVK, VKD3D (Newest) (Vulkan v1.3+)]}"
if [[ -z $PW_VULKAN_USE ]] \
|| [[ $PW_VULKAN_USE == [3-5] ]]
then
if [[ -e "/sys/module/nvidia/version" && $(</sys/module/nvidia/version) > 550.54.13 ]] \
|| [[ pw_check_glxinfo && $(grep "Version:" "$PW_TMPFS_PATH/glxinfo.tmp" | awk '{print $2}') > 25 ]]
then export PW_VULKAN_USE="6"
else export PW_VULKAN_USE="2"
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" ;;
2) PW_DEFAULT_VULKAN_USE="$SORT_STABLE!$SORT_NEWEST!$SORT_SAREK!$SORT_OPENGL" ;;
*) PW_DEFAULT_VULKAN_USE="$SORT_NEWEST!$SORT_STABLE!$SORT_SAREK!$SORT_OPENGL" ;;
esac
if [[ $PW_WINE_USE == PROTON_LG ]] ; then if [[ $PW_WINE_USE == PROTON_LG ]] ; then
PW_WINE_USE="${PW_PROTON_LG_VER}" PW_WINE_USE="${PW_PROTON_LG_VER}"
@@ -567,64 +593,15 @@ if [[ -f "$portwine_exe" ]] ; then
fi fi
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" export KEY_START="$RANDOM"
if [[ $PW_GUI_START == "NOTEBOOK" ]] ; then if [[ $PW_GUI_START == "NOTEBOOK" ]] ; then
"${pw_yad}" --plug=$KEY_START --tabnum=1 --form --separator=";" $START_GUI_TYPE \ "${pw_yad}" --plug=$KEY_START --tabnum=1 --form --separator=";" $START_GUI_TYPE \
--gui-type-box="$START_GUI_TYPE_BOX" --gui-type-layout="$START_GUI_TYPE_LAYOUT_UP" \ --gui-type-box="$START_GUI_TYPE_BOX" --gui-type-layout="$START_GUI_TYPE_LAYOUT_UP" \
--gui-type-text="$START_GUI_TYPE_TEXT" --gui-type-images="$START_GUI_TYPE_IMAGE" \ --gui-type-text="$START_GUI_TYPE_TEXT" --gui-type-images="$START_GUI_TYPE_IMAGE" \
--image="$PW_ICON_FOR_YAD" --text-align="center" --text "$PW_COMMENT_DB" \ --image="$PW_ICON_FOR_YAD" --text-align="center" --text "$PW_COMMENT_DB" \
--field="3D API : :CB" "$PW_DEFAULT_VULKAN_USE" \ --field="3D API : !$INFO_3DAPI:CB" "$PW_DEFAULT_VULKAN_USE" \
--field=" WINE : :CB" "$(combobox_fix "$PW_WINE_USE" "$PW_DEFAULT_WINE_USE")" \ --field=" WINE : !$INFO_WINE:CB" "$(combobox_fix "$PW_WINE_USE" "$PW_DEFAULT_WINE_USE")" \
--field="PREFIX : :CBE" "$PW_ADD_PREFIXES_TO_GUI" \ --field="PREFIX : !$INFO_PREFIX:CBE" "$PW_ADD_PREFIXES_TO_GUI" \
1> "${PW_TMPFS_PATH}/tmp_yad_form_vulkan" 2>/dev/null & 1> "${PW_TMPFS_PATH}/tmp_yad_form_vulkan" 2>/dev/null &
"${pw_yad}" --plug=$KEY_START --tabnum=2 --form --columns="$START_GUI_NOTEBOOK_COLUMNS" --align-buttons --homogeneous-column \ "${pw_yad}" --plug=$KEY_START --tabnum=2 --form --columns="$START_GUI_NOTEBOOK_COLUMNS" --align-buttons --homogeneous-column \
@@ -665,9 +642,9 @@ if [[ -f "$portwine_exe" ]] ; then
--gui-type-box="$START_GUI_TYPE_BOX" --gui-type-layout="$START_GUI_TYPE_LAYOUT_UP" \ --gui-type-box="$START_GUI_TYPE_BOX" --gui-type-layout="$START_GUI_TYPE_LAYOUT_UP" \
--gui-type-text="$START_GUI_TYPE_TEXT" --gui-type-images="$START_GUI_TYPE_IMAGE" \ --gui-type-text="$START_GUI_TYPE_TEXT" --gui-type-images="$START_GUI_TYPE_IMAGE" \
--image="$PW_ICON_FOR_YAD" --text-align="center" --text "$PW_COMMENT_DB" \ --image="$PW_ICON_FOR_YAD" --text-align="center" --text "$PW_COMMENT_DB" \
--field="3D API : :CB" "$PW_DEFAULT_VULKAN_USE" \ --field="3D API : !$INFO_3DAPI:CB" "$PW_DEFAULT_VULKAN_USE" \
--field=" WINE : :CB" "$(combobox_fix "$PW_WINE_USE" "$PW_DEFAULT_WINE_USE")" \ --field=" WINE : !$INFO_WINE:CB" "$(combobox_fix "$PW_WINE_USE" "$PW_DEFAULT_WINE_USE")" \
--field="PREFIX : :CBE" "$PW_ADD_PREFIXES_TO_GUI" \ --field="PREFIX : !$INFO_PREFIX:CBE" "$PW_ADD_PREFIXES_TO_GUI" \
1> "${PW_TMPFS_PATH}/tmp_yad_form_vulkan" 2>/dev/null & 1> "${PW_TMPFS_PATH}/tmp_yad_form_vulkan" 2>/dev/null &
"${pw_yad}" --plug=$KEY_START --tabnum=2 --form --columns="$START_GUI_PANED_COLUMNS" \ "${pw_yad}" --plug=$KEY_START --tabnum=2 --form --columns="$START_GUI_PANED_COLUMNS" \
@@ -863,8 +840,6 @@ else
else export PW_GUI_SORT_TABS=(2 3 4 5 1) else export PW_GUI_SORT_TABS=(2 3 4 5 1)
fi fi
PW_DEFAULT_VULKAN_USE="$SORT_NEWEST!$SORT_SAREK!$SORT_OPENGL"
KEY_MENU="$RANDOM" KEY_MENU="$RANDOM"
IFS="%" IFS="%"
@@ -888,9 +863,9 @@ else
"${pw_yad}" --plug=$KEY_MENU --tabnum="${PW_GUI_SORT_TABS[2]}" --form --columns=3 --align-buttons --separator=";" \ "${pw_yad}" --plug=$KEY_MENU --tabnum="${PW_GUI_SORT_TABS[2]}" --form --columns=3 --align-buttons --separator=";" \
--gui-type-layout="$MAIN_MENU_GUI_TYPE_LAYOUT" \ --gui-type-layout="$MAIN_MENU_GUI_TYPE_LAYOUT" \
--field=" 3D API : :CB" "$PW_DEFAULT_VULKAN_USE" \ --field=" 3D API : !$INFO_3DAPI:CB" "$PW_DEFAULT_VULKAN_USE" \
--field=" PREFIX : :CBE" "$PW_ADD_PREFIXES_TO_GUI" \ --field=" PREFIX : !$INFO_PREFIX:CBE" "$PW_ADD_PREFIXES_TO_GUI" \
--field=" WINE : :CB" "$(combobox_fix "$PW_WINE_USE" "$PW_DEFAULT_WINE_USE")" \ --field=" WINE : !$INFO_WINE:CB" "$(combobox_fix "$PW_WINE_USE" "$PW_DEFAULT_WINE_USE")" \
--field="${translations[Create prefix backup]}!$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png!":"CFBTN" '@bash -c "button_click --normal pw_create_prefix_backup"' \ --field="${translations[Create prefix backup]}!$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png!":"CFBTN" '@bash -c "button_click --normal pw_create_prefix_backup"' \
--field=" Winetricks!$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png!${translations[Run winetricks to install additional libraries to the selected prefix]}":"FBTN" '@bash -c "button_click --normal WINETRICKS"' \ --field=" Winetricks!$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png!${translations[Run winetricks to install additional libraries to the selected prefix]}":"FBTN" '@bash -c "button_click --normal WINETRICKS"' \
--field=" ${translations[Clear prefix]}!$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png!${translations[Clear the prefix to fix problems]}":"FBTN" '@bash -c "button_click --normal gui_clear_pfx"' \ --field=" ${translations[Clear prefix]}!$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png!${translations[Clear the prefix to fix problems]}":"FBTN" '@bash -c "button_click --normal gui_clear_pfx"' \
@@ -1011,7 +986,8 @@ fi
case "${VULKAN_MOD}" in case "${VULKAN_MOD}" in
"$SORT_OPENGL" ) export PW_VULKAN_USE="0" ;; "$SORT_OPENGL" ) export PW_VULKAN_USE="0" ;;
"$SORT_SAREK" ) export PW_VULKAN_USE="1" ;; "$SORT_SAREK" ) export PW_VULKAN_USE="1" ;;
"$SORT_NEWEST" ) export PW_VULKAN_USE="2" ;; "$SORT_STABLE" ) export PW_VULKAN_USE="2" ;;
"$SORT_NEWEST" ) export PW_VULKAN_USE="6" ;;
esac esac
init_wine_ver init_wine_ver

View File

@@ -52,16 +52,18 @@ export PW_OPTISCALER_VER="v1"
export PW_GALLIUM_NINE_VER="0.10" export PW_GALLIUM_NINE_VER="0.10"
export PW_LSFG_VK_VER="3.1-p11-cebe5e2" export PW_LSFG_VK_VER="3.1-p11-cebe5e2"
###WINE_AND_PROTON_LG### ###WINE_AND_PROTON_LG###
export PW_PROTON_LG_VER="PROTON_LG_10-8" export PW_PROTON_LG_VER="PROTON_LG_10-10"
export PW_WINE_LG_VER="WINE_LG_10-12" export PW_WINE_LG_VER="WINE_LG_10-12"
export PW_WINE_FULLSCREEN_FSR="1" export PW_WINE_FULLSCREEN_FSR="1"
export WINE_FULLSCREEN_FSR_MODE="ultra" export WINE_FULLSCREEN_FSR_MODE="ultra"
###DXVK_AND_VKD3D### ###DXVK_AND_VKD3D###
export VKD3D_LIMIT_TESS_FACTORS="64" export VKD3D_LIMIT_TESS_FACTORS="64"
export DXVK_NEW_VER="2.7-5"
export DXVK_OLD_VER="2.6.2"
export DXVK_SAREK_VER="sarek-1.11.0" export DXVK_SAREK_VER="sarek-1.11.0"
export DXVK_GIT_VER="2.6.1-368" export VKD3D_NEW_VER="1.1-4666"
export VKD3D_OLD_VER="2.14.1"
export VKD3D_SAREK_VER="sarek-2.6.0" export VKD3D_SAREK_VER="sarek-2.6.0"
export VKD3D_GIT_VER="1.1-4655"
###VKBASALT### ###VKBASALT###
export PW_VKBASALT_EFFECTS="Curves:cas" export PW_VKBASALT_EFFECTS="Curves:cas"
export PW_VKBASALT_FFX_CAS="0.50" export PW_VKBASALT_FFX_CAS="0.50"