CastroFidel/PortWINE
3
2
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Gallium zink and WineD3D vulkan moved to 3D api

Browse Source
This commit is contained in:
Htylol
2025-05-25 01:38:10 +05:00
parent a0b8077fc0
commit 280b1b044d
6 changed files with 93 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
data_from_portwine/locales/PortProton.pot
View File

@ -7,7 +7,7 @@
msgid ""
msgstr "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2025-05-24 23:31+0500\n"
"POT-Creation-Date: 2025-05-25 01:15+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"
@ -76,6 +76,9 @@ msgstr ""
msgid "Newest DXVK, VKD3D, D8VK (Vulkan v1.3+)"
msgstr ""
msgid "Gallium Zink and WineD3D Vulkan (Damavand)"
msgstr ""
msgid "GET-OTHER-WINE"
msgstr ""
@ -520,11 +523,6 @@ msgid "Enable experemental native Wayland support (need special wine build "
"to work)"
msgstr ""
msgid "Use Gallium Zink (OpenGL driver is implemented via Vulkan), also "
"instead of dxvk WineD3D vulkan (Damavand) is used. This function "
"does not work with Gallium Nine."
msgstr ""
msgid "Use Gallium Nine (native DirectX 9 for MESA)"
msgstr ""

23
data_from_portwine/locales/es/LC_MESSAGES/PortProton.po
View File

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2025-05-24 23:31+0500\n"
"POT-Creation-Date: 2025-05-25 01:15+0500\n"
"PO-Revision-Date: 2025-05-24 23:34+0500\n"
"Last-Translator: \n"
"Language-Team: \n"
@ -87,6 +87,9 @@ 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 "Gallium Zink and WineD3D Vulkan (Damavand)"
msgstr ""
msgid "GET-OTHER-WINE"
msgstr "OBTENER OTRO WINE"
@ -624,15 +627,6 @@ msgstr ""
"Habilite el soporte experimental nativo de Wayland (necesita una compilación "
"de vino especial para funcionar)"
msgid ""
"Use Gallium Zink (OpenGL driver is implemented via Vulkan), also instead of "
"dxvk WineD3D vulkan (Damavand) is used. This function does not work with "
"Gallium Nine."
msgstr ""
"Utilice Gallium Zink (el controlador OpenGL se implementa mediante Vulkan). "
"En lugar de dxvk, se utiliza WineD3D Vulkan (Damavand). Esta función no "
"funciona con Gallium Nine."
msgid "Use Gallium Nine (native DirectX 9 for MESA)"
msgstr ""
@ -2171,6 +2165,15 @@ msgstr "UNIRSE"
msgid "THIRD PARTY LIBRARIES"
msgstr "BIBLIOTECAS DE TERCEROS"
#~ msgid ""
#~ "Use Gallium Zink (OpenGL driver is implemented via Vulkan), also instead "
#~ "of dxvk WineD3D vulkan (Damavand) is used. This function does not work "
#~ "with Gallium Nine."
#~ msgstr ""
#~ "Utilice Gallium Zink (el controlador OpenGL se implementa mediante "
#~ "Vulkan). En lugar de dxvk, se utiliza WineD3D Vulkan (Damavand). Esta "
#~ "función no funciona con Gallium Nine."
#~ msgid ""
#~ "d3dadapter9.so.1.0.0 - Not found in the system.\\nInstall the missing "
#~ "package: <b>d3dadapter9</b>"

28
data_from_portwine/locales/ru/LC_MESSAGES/PortProton.po
View File

@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2025-05-24 23:31+0500\n"
"PO-Revision-Date: 2025-05-24 23:33+0500\n"
"POT-Creation-Date: 2025-05-25 01:15+0500\n"
"PO-Revision-Date: 2025-05-25 01:17+0500\n"
"Last-Translator: \n"
"Language-Team: \n"
"Language: ru_RU\n"
@ -95,6 +95,9 @@ msgstr "Стабильные DXVK, VKD3D (Vulkan v1.2)"
msgid "Newest DXVK, VKD3D, D8VK (Vulkan v1.3+)"
msgstr "Новейшие DXVK, VKD3D, D8VK (Vulkan v1.3+)"
msgid "Gallium Zink and WineD3D Vulkan (Damavand)"
msgstr "Gallium Zink и WineD3D Vulkan (Damavand)"
msgid "GET-OTHER-WINE"
msgstr "Скачать другие версии wine"
@ -645,15 +648,6 @@ msgstr ""
"Включить экспериментальную поддержку запуска игры/программы из-под нативной "
"сессии Wayland, минуя XWayland (для работы требуется специальная сборка Wine)"
msgid ""
"Use Gallium Zink (OpenGL driver is implemented via Vulkan), also instead of "
"dxvk WineD3D vulkan (Damavand) is used. This function does not work with "
"Gallium Nine."
msgstr ""
"Использовать Gallium Zink (трансляция OpenGL в Vulkan), так же заместо dxvk "
"используется WineD3D vulkan (Damavand). Данная функция не работает вместе с "
"Gallium Nine."
msgid "Use Gallium Nine (native DirectX 9 for MESA)"
msgstr "Принудительно использовать Gallium Nine (нативный DirectX9 для Mesa)"
@ -2153,6 +2147,15 @@ msgstr "ПРИСОЕДЕНИТЬСЯ"
msgid "THIRD PARTY LIBRARIES"
msgstr "БИБЛИОТЕКИ"
#~ msgid ""
#~ "Use Gallium Zink (OpenGL driver is implemented via Vulkan), also instead "
#~ "of dxvk WineD3D vulkan (Damavand) is used. This function does not work "
#~ "with Gallium Nine."
#~ msgstr ""
#~ "Использовать Gallium Zink (трансляция OpenGL в Vulkan), так же заместо "
#~ "dxvk используется WineD3D vulkan (Damavand). Данная функция не работает "
#~ "вместе с Gallium Nine."
#~ msgid ""
#~ "d3dadapter9.so.1.0.0 - Not found in the system.\\nInstall the missing "
#~ "package: <b>d3dadapter9</b>"
@ -2231,9 +2234,6 @@ msgstr "БИБЛИОТЕКИ"
#~ msgid "Copyright © $%DATE% Castro-Fidel (linux-gaming.ru)"
#~ msgstr "Авторские права © $%DATE% Castro-Fidel (linux-gaming.ru)"
#~ msgid "WineD3D Vulkan (Damavand experimental)"
#~ msgstr "WineD3D Vulkan (Damavand - экспериментальный)"
#~ msgid "Change the version of WINDOWS 10 to WINDOWS 7 in the prefix"
#~ msgstr "Изменить версию WINDOWS 10 на WINDOWS 7 в префиксе"

37
data_from_portwine/scripts/functions_helper
View File

@ -1814,10 +1814,8 @@ pw_mangohud_check () {
export PW_MANGOHUD_SLR='MANGOHUD=1'
fi
# TODO: need to fix work for OpenGL without flatpak...
if [[ $PW_USE_GALLIUM_ZINK == "0" ]] ; then
MANGOHUD_LIB_NAME="libMangoHud_shim.so"
export PW_LD_PRELOAD="${PW_LD_PRELOAD:+$PW_LD_PRELOAD:}${MANGOHUD_LIB_NAME}"
fi
else
export PW_MANGOHUD_SLR=''
print_info "MangoHud is disabled"
@ -3670,13 +3668,10 @@ start_portwine () {
CP_VKD3D_FILES="libvkd3d-1 libvkd3d-shader-1"
CP_WINE_FILES="d3d12 d3d12core d3d8"
;;
esac
# GALLIUM ZINK
if [[ $PW_USE_GALLIUM_ZINK == "1" ]] && [[ $PW_USE_GALLIUM_NINE != "1" && $PW_VULKAN_USE != "0" ]] ; then
4)
# GALLIUM ZINK AND WINED3D VULKAN
print_info "Use GALLIUM-ZINK (OpenGL on MESA vulkan drivers)"
print_info "Use DAMAVAND (DirectX to wined3d vulkan)"
unset PATH_TO_DXVK_FILES CP_DXVK_FILES
PATH_TO_VKD3D_FILES="${PW_VULKAN_DIR}/vkd3d-proton-${VKD3D_GIT_VER}"
CP_VKD3D_FILES="libvkd3d-1 libvkd3d-shader-1"
CP_WINE_FILES="d3d12 d3d12core d3d11 d3d10core d3d10_1 d3d10 d3d9 d3d8 dxgi"
@ -3695,11 +3690,12 @@ start_portwine () {
if [[ $(check_vendor_gpu) =~ nouveau ]] ; then
export NOUVEAU_USE_ZINK="1"
fi
fi
esac
# GALLIUM NINE
if [[ $PW_USE_GALLIUM_NINE == "1" ]] ; then
print_info "Use GALLIUM-NINE (Native DX9 on MESA drivers)"
unset PATH_TO_DXVK_FILES CP_DXVK_FILES
PATH_TO_VKD3D_FILES="${PW_VULKAN_DIR}/vkd3d-proton-${VKD3D_GIT_VER}"
CP_GALLIUM_NINE_FILES="d3d9"
CP_VKD3D_FILES="libvkd3d-1 libvkd3d-shader-1"
@ -3715,9 +3711,9 @@ start_portwine () {
fi
if [[ $PW_USE_SUPPLIED_DXVK_VKD3D == "1" ]] \
&& [[ ! $PW_WINE_USE =~ (PROTON_LG|WINE_LG) ]] && [[ $PW_VULKAN_USE != "0" ]] \
&& [[ ! $PW_WINE_USE =~ (PROTON_LG|WINE_LG) ]] \
&& [[ ! $PW_VULKAN_USE =~ (0|4) ]] && [[ $PW_USE_GALLIUM_NINE != "1" ]] \
&& [[ -f "${WINEDIR}/lib64/wine/dxvk/d3d9.dll" || -f "${WINEDIR}/lib/wine/dxvk/x86_64-windows/d3d9.dll" ]] ; then
if [[ $PW_USE_GALLIUM_NINE != "1" && $PW_USE_GALLIUM_ZINK != "1" ]] ; 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"
@ -3736,7 +3732,6 @@ start_portwine () {
else add_to_var CP_WINE_FILES "d3d8"
fi
fi
fi
if [[ -f "${WINEDIR}/lib64/wine/vkd3d-proton/d3d12core.dll" && -f "${WINEDIR}/lib64/vkd3d/libvkd3d-1.dll" ]] \
|| [[ -f "${WINEDIR}/lib/wine/vkd3d-proton/x86_64-windows/d3d12core.dll" && -f "${WINEDIR}/lib/vkd3d/x86_64-windows/libvkd3d-1.dll" ]] ; then
CP_VKD3D_FILES="d3d12 d3d12core libvkd3d-1 libvkd3d-shader-1"
@ -3769,10 +3764,11 @@ start_portwine () {
if [[ $PW_USE_GALLIUM_NINE == "1" ]] ; then
rm_from_var CP_GALLIUM_NINE_FILES "d3d9"
rm_from_var CP_WINE_FILES "d3d8"
elif [[ $PW_USE_GALLIUM_ZINK == "1" ]] ; then
rm_from_var CP_WINE_FILES "d3d9 d3d8"
elif [[ $PW_USE_SUPPLIED_DXVK_VKD3D != "0" ]] ; then
rm_from_var CP_DXVK_FILES "d3d9"
if [[ $PW_VULKAN_USE = "4" ]]
then rm_from_var CP_WINE_FILES "d3d9"
else rm_from_var CP_DXVK_FILES "d3d9"
fi
else
case "${PW_VULKAN_USE}" in
0)
@ -3789,6 +3785,9 @@ start_portwine () {
rm_from_var CP_DXVK_FILES "d3d9"
rm_from_var CP_WINE_FILES "d3d8"
;;
4)
rm_from_var CP_WINE_FILES "d3d9 d3d8"
;;
esac
fi
fi
@ -5188,7 +5187,7 @@ gui_edit_db () {
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_NATIVE_WAYLAND PW_USE_GALLIUM_ZINK PW_USE_GALLIUM_NINE
PW_DISABLE_COMPOSITING PW_USE_RUNTIME PW_DINPUT_PROTOCOL PW_USE_NATIVE_WAYLAND PW_USE_GALLIUM_NINE
PW_USE_SUPPLIED_DXVK_VKD3D
)
@ -5242,7 +5241,6 @@ gui_edit_db () {
PW_USE_RUNTIME_INFO=${translations[Use container launch mode (It is recommended not to change the value)]}
PW_DINPUT_PROTOCOL_INFO=${translations[Force use DirectInput protocol instead of XInput]}
PW_USE_NATIVE_WAYLAND_INFO=${translations[Enable experemental native Wayland support (need special wine build to work)]}
PW_USE_GALLIUM_ZINK_INFO=${translations[Use Gallium Zink (OpenGL driver is implemented via Vulkan), also instead of dxvk WineD3D vulkan (Damavand) is used. This function does not work with Gallium Nine.]}
PW_USE_GALLIUM_NINE_INFO=${translations[Use Gallium Nine (native DirectX 9 for MESA)]}
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)]}
@ -5255,13 +5253,13 @@ gui_edit_db () {
0)
# WineD3D OpenGL
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"
DISABLE_EDIT_DB_LIST="PW_VKBASALT PW_VKBASALT_USER_CONF PW_USE_RAY_TRACING PW_USE_OBS_VKCAPTURE"
;;
1|2)
# Stable, Newest
VKD3D_CB="CB"
;;
3)
3|4)
# Legacy
VKD3D_CB="DCB"
DISABLE_EDIT_DB_LIST="PW_USE_RAY_TRACING"
@ -5858,7 +5856,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|3|4)
DISABLE_DGV2_LIST="PW_DGV2_USE_DX12
"
;;
@ -6885,6 +6883,7 @@ portwine_start_debug () {
1) echo "PW_VULKAN_USE=${PW_VULKAN_USE} - DXVK v.${DXVK_STABLE_VER}, VKD3D-PROTON v.${VKD3D_STABLE_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" ;;
4) echo "PW_VULKAN_USE=${PW_VULKAN_USE} - Gallium Zink and WineD3D Vulkan" >> "${PORT_WINE_PATH}/PortProton.log" ;;
*) echo "PW_VULKAN_USE=${PW_VULKAN_USE}" >> "${PORT_WINE_PATH}/PortProton.log" ;;
esac
echo "--------------------------------------------" >> "${PORT_WINE_PATH}/PortProton.log"

11
data_from_portwine/scripts/start.sh
View File

@ -509,15 +509,17 @@ then DIST_ADD_TO_GUI+="!${translations[USE_SYSTEM_WINE]}"
fi
SORT_OPENGL="${translations[WineD3D OpenGL (For video cards without Vulkan)]}"
SORT_VULKAN="${translations[Gallium Zink and WineD3D Vulkan (Damavand)]}"
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" ;;
*) PW_DEFAULT_VULKAN_USE="$SORT_NEWEST!$SORT_STABLE!$SORT_LEGACY!$SORT_OPENGL" ;;
3) PW_DEFAULT_VULKAN_USE="$SORT_LEGACY!$SORT_NEWEST!$SORT_STABLE!$SORT_OPENGL" ;;
0) PW_DEFAULT_VULKAN_USE="$SORT_OPENGL!$SORT_NEWEST!$SORT_STABLE!$SORT_LEGACY!$SORT_VULKAN" ;;
1) PW_DEFAULT_VULKAN_USE="$SORT_STABLE!$SORT_NEWEST!$SORT_LEGACY!$SORT_VULKAN!$SORT_OPENGL" ;;
3) PW_DEFAULT_VULKAN_USE="$SORT_LEGACY!$SORT_NEWEST!$SORT_STABLE!$SORT_VULKAN!$SORT_OPENGL" ;;
4) PW_DEFAULT_VULKAN_USE="$SORT_VULKAN!$SORT_NEWEST!$SORT_STABLE!$SORT_LEGACY!$SORT_OPENGL" ;;
*) PW_DEFAULT_VULKAN_USE="$SORT_NEWEST!$SORT_STABLE!$SORT_LEGACY!$SORT_VULKAN!$SORT_OPENGL" ;;
esac
if [[ $PW_WINE_USE == PROTON_LG ]] ; then
@ -959,6 +961,7 @@ case "${VULKAN_MOD}" in
"$SORT_STABLE" ) export PW_VULKAN_USE="1" ;;
"$SORT_NEWEST" ) export PW_VULKAN_USE="2" ;;
"$SORT_LEGACY" ) export PW_VULKAN_USE="3" ;;
"$SORT_VULKAN" ) export PW_VULKAN_USE="4" ;;
esac
init_wine_ver

1
data_from_portwine/scripts/var
View File

@ -38,7 +38,6 @@ export PW_LOCALE_SELECT="disabled"
export PW_DINPUT_PROTOCOL="0"
export PW_USE_VRCLIENT="0"
export STAGING_SHARED_MEMORY="1"
export PW_USE_GALLIUM_ZINK="0"
export PW_USE_GALLIUM_NINE="0"
export PW_USE_SUPPLIED_DXVK_VKD3D="1"
###DEFAULT_WINE###