diff --git a/data_from_portwine/changelog b/data_from_portwine/changelog index 2b4f021..261c5de 100755 --- a/data_from_portwine/changelog +++ b/data_from_portwine/changelog @@ -7,15 +7,18 @@ * добавить комментарии описывающие функционал скриптов и db файлов * заниматься только развитием проекта за счет вашей подписки на https://boosty.to/portwine-linux.ru ----------------------------------------- -###Scripts version 2025### +###Scripts version 2026### +* MANGOHUD работает под любыми режимами запуска и с любыми играми, даже если выбран неправильный режим запуска игры (правый_шифт+F12) +* удалена функция переодического запроса о донатах (теперь это только на Вашей совести =) +* обновлены команды управления режимами запуска: + - удален режим VKD3D и на его месте теперь режим VULKAN (совместный режим DXVK и VKD3D) + - из за изменений описанных выше, теперь не надо перезапускать лаунры под разные игры под VULKAN + - увеличена производительность во многих играх работающих на DX9-11 при использовании PROTON_STEAM, или PROTON_GE + - увеличена производительность во многих играх работающих на DX9-12 при использовании тестового PROTON_PW_6.19 (WMF работает) + +###Scripts version 2023...2025### * Доработка новых функций для работы на разных ОС Linux -###Scripts version 2024### -* HOTFIX - неправильное место сохранения tmp файлов при использовании "GET OTHER WINE" - -###Scripts version 2023### -* HOTFIX - отрабатывания "GET OTHER WINE" - ###Scripts version 2022### * добавлен фикc для работы EVE Online * добавлен в GUI вывод версий WINE используемых по умолчанию diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index 457d86f..4bdc998 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -160,10 +160,10 @@ unpack_tar () { pw_mangohud_check () { export RUN_MANGOHUD="" if [ "${PW_MANGOHUD}" == "1" ] ; then - if [ "${PW_VULKAN_USE}" = "0" ] - then export RUN_MANGOHUD="mangohud --dlsym" - else export RUN_MANGOHUD="mangohud" - fi + #if [ "${PW_VULKAN_USE}" = "0" ] ; then + export RUN_MANGOHUD="mangohud --dlsym" + #else export RUN_MANGOHUD="mangohud" + #fi else export DISABLE_MANGOHUD=1 fi @@ -566,33 +566,6 @@ pw_port_update () { esac fi fi - if [ ! -f "${HOME}/.config/.PortTime" ] ; then - echo "10" > "${HOME}/.config/.PortTime" - fi - read "port_time" < "${HOME}/.config/.PortTime" - if [ "${port_time}" -gt "1" ] ; then - port_time=$((${port_time}-1)) - echo "${port_time}" > "${HOME}/.config/.PortTime" - else - xsd2=`zenity --title "${port_time1}" --text "${port_time2}" --list --radiolist --height=230 --column="${inst_set3}" --column "${port_time3}" \ - TRUE "${port_time4}" \ - FALSE "${port_time5}" \ - FALSE "${port_time6}" ` - if [ $? = 1 ] ; then - echo "1" > "${HOME}/.config/.PortTime" - else - case $xsd2 in - "${port_time4}") - xdg-open "$urlg" & - echo "300" > "${HOME}/.config/.PortTime" - exit 0 ;; - "${port_time5}") - echo "75" > "${HOME}/.config/.PortTime" ;; - "${port_time6}") - echo "150" > "${HOME}/.config/.PortTime" ;; - esac - fi - fi ###SCRIPTS UPDATE### if [ ! -f "${PORT_WINE_TMP_PATH}/scripts_ver" ] ; then echo "2000" > "${PORT_WINE_TMP_PATH}/scripts_ver" diff --git a/data_from_portwine/scripts/portwine_db/Battle.net_Launcher b/data_from_portwine/scripts/portwine_db/Battle.net_Launcher index 178922b..417fdd3 100755 --- a/data_from_portwine/scripts/portwine_db/Battle.net_Launcher +++ b/data_from_portwine/scripts/portwine_db/Battle.net_Launcher @@ -5,9 +5,9 @@ #Battle.net.exe #Rating=5 ################################################ -export PW_COMMENT_DB="We recommend using PROTON_GE + DXVK!" +export PW_COMMENT_DB="We recommend using PROTON_GE + VULKAN!" export PW_WINE_USE=PROTON_GE -export PW_VULKAN_USE=dxvk +export PW_VULKAN_USE=1 export LAUNCH_PARAMETERS="" export WINEDLLOVERRIDES="locationapi=" export PW_DLL_INSTALL="vcrun2019 d3dx11_42 d3dx11_43" diff --git a/data_from_portwine/scripts/portwine_db/Biomutant b/data_from_portwine/scripts/portwine_db/Biomutant index a17178a..933dbf4 100755 --- a/data_from_portwine/scripts/portwine_db/Biomutant +++ b/data_from_portwine/scripts/portwine_db/Biomutant @@ -3,7 +3,7 @@ #Biomutant.exe #Rating=1-5 ######################################################## -export PW_VULKAN_USE=vkd3d +export PW_VULKAN_USE=1 #####################examples########################### ##export PW_COMMENT_DB="blablabla" ##export PW_WINDOWS_VER=10 # Set windows version 10, 7 or XP diff --git a/data_from_portwine/scripts/portwine_db/Cyberpunk2077 b/data_from_portwine/scripts/portwine_db/Cyberpunk2077 index 77860e6..4007add 100755 --- a/data_from_portwine/scripts/portwine_db/Cyberpunk2077 +++ b/data_from_portwine/scripts/portwine_db/Cyberpunk2077 @@ -3,7 +3,7 @@ #Cyberpunk2077.exe #Rating=1-5 #####################examples########################### -export PW_VULKAN_USE=vkd3d +export PW_VULKAN_USE=1 ##export PW_COMMENT_DB="blablabla" export WINEDLLOVERRIDES="Crash*,REDEngineErrorReporter.exe=" ##export PW_DLL_INSTALL="d3dcompiler_47" # Install DDL in port prefix (used winetricks) diff --git a/data_from_portwine/scripts/portwine_db/DOOM Eternal b/data_from_portwine/scripts/portwine_db/DOOM Eternal index 237039c..5f36a59 100755 --- a/data_from_portwine/scripts/portwine_db/DOOM Eternal +++ b/data_from_portwine/scripts/portwine_db/DOOM Eternal @@ -3,7 +3,7 @@ #DOOMEternalx64vk.exe #Rating=? ################################################ -export PW_VULKAN_USE=vkd3d +export PW_VULKAN_USE=1 #export WINEDLLOVERRIDES="amd_ags_x64=b" #export PW_LOG=0 # Enable debug mode fo terminal #export PW_NO_FSYNC=1 # Do not use futex-based in-process synchronization primitives. (Automatically disabled on systems with no FUTEX_WAIT_MULTIPLE support. diff --git a/data_from_portwine/scripts/portwine_db/DOOMx64vk b/data_from_portwine/scripts/portwine_db/DOOMx64vk index a25543d..6f13561 100755 --- a/data_from_portwine/scripts/portwine_db/DOOMx64vk +++ b/data_from_portwine/scripts/portwine_db/DOOMx64vk @@ -4,7 +4,7 @@ #DOOMx64vk.exe #Rating=1-5 ######################################################## -export PW_VULKAN_USE=dxvk +export PW_VULKAN_USE=1 #####################examples########################### export PW_COMMENT_DB="DOOM 2016" export PW_DLL_INSTALL="xact xact_x64 vcrun2019" diff --git a/data_from_portwine/scripts/portwine_db/EpicGamesLauncher b/data_from_portwine/scripts/portwine_db/EpicGamesLauncher index 092144c..f33bcef 100755 --- a/data_from_portwine/scripts/portwine_db/EpicGamesLauncher +++ b/data_from_portwine/scripts/portwine_db/EpicGamesLauncher @@ -3,5 +3,7 @@ #EpicGamesLauncher.exe #Rating=5 ################################################ +export PW_WINE_USE=PROTON_GE +export PW_VULKAN_USE=1 export LAUNCH_PARAMETERS="-opengl -SkipBuildPatchPrereq" export PW_DLL_INSTALL="vcrun2010 vcrun2012 vcrun2013 vcrun2019 d3dcompiler_43 d3dcompiler_47 d3dx9" diff --git a/data_from_portwine/scripts/portwine_db/Origin b/data_from_portwine/scripts/portwine_db/Origin index e58bbdb..fe9be99 100755 --- a/data_from_portwine/scripts/portwine_db/Origin +++ b/data_from_portwine/scripts/portwine_db/Origin @@ -6,11 +6,11 @@ ##export PW_COMMENT_DB="blablabla" ##export PW_WINDOWS_VER=10 # Set windows version 10, 7 or XP -export PW_DLL_INSTALL="vcrun2010 vcrun2012 vcrun2017 d3dcompiler_43 d3dcompiler_47 d3dx9 xact" # Install DDL in port prefix (used winetricks) +export PW_DLL_INSTALL="vcrun2010 vcrun2012 vcrun2019 d3dcompiler_43 d3dcompiler_47 d3dx9 xact" # Install DDL in port prefix (used winetricks) ##export WINEDLLOVERRIDES="blabla=n,b" ##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')" # Additional launch options -##export PW_VULKAN_USE=dxvk # dxvk, vkd3d or 0 for OpenGL +export PW_VULKAN_USE=1 # dxvk, vkd3d or 0 for OpenGL ##export PW_DXVK_VER=1.8.1 ##export PW_VKD3D_VER=2.2 ##export PW_DXR_ON=1 diff --git a/data_from_portwine/scripts/portwine_db/RDR2 b/data_from_portwine/scripts/portwine_db/RDR2 index d870d7c..d1cf16e 100755 --- a/data_from_portwine/scripts/portwine_db/RDR2 +++ b/data_from_portwine/scripts/portwine_db/RDR2 @@ -4,10 +4,9 @@ #PlayRDR2.exe #Rating=? ################################################ -export PW_VULKAN_USE=vkd3d -export WINEDLLOVERRIDES="vulkan-1=n" +export PW_VULKAN_USE=1 +#export WINEDLLOVERRIDES="vulkan-1=n" export PW_DXGI_FROM_DXVK=1 -export LAUNCH_PARAMETERS="-adapter=1 -vulkan -width=1920 -height=1080 -USEALLAVAILABLECORES -cpuLoadRebalancing -ignorepipelinecach" +export LAUNCH_PARAMETERS=("-fullscreen" "-vulkan") #-adapter=1 -width=1920 -height=1080 -USEALLAVAILABLECORES -cpuLoadRebalancing -ignorepipelinecach") export PULSE_LATENCY_MSEC=60 #export VK_ICD_FILENAMES="/usr/share/vulkan/icd.d/radeon_icd.i686.json:/usr/share/vulkan/icd.d/radeon_icd.x86_64.json" -#?PID=$(pgrep RDR2.exe); kill -s SIGSTOP $PID; kill -s SIGCONT $PID diff --git a/data_from_portwine/scripts/portwine_db/Rockstar_Games_Launcher b/data_from_portwine/scripts/portwine_db/Rockstar_Games_Launcher index 8ee3f49..b290021 100755 --- a/data_from_portwine/scripts/portwine_db/Rockstar_Games_Launcher +++ b/data_from_portwine/scripts/portwine_db/Rockstar_Games_Launcher @@ -5,6 +5,6 @@ #LauncherPatcher.exe #Rating=? ################################################ -export PW_VULKAN_USE=dxvk +export PW_VULKAN_USE=1 export PW_DLL_INSTALL="vcrun2019" export PW_WINDOWS_VER=10 diff --git a/data_from_portwine/scripts/portwine_db/SR2_pc b/data_from_portwine/scripts/portwine_db/SR2_pc index 0b75d7c..066ce54 100755 --- a/data_from_portwine/scripts/portwine_db/SR2_pc +++ b/data_from_portwine/scripts/portwine_db/SR2_pc @@ -4,7 +4,7 @@ #Rating=1-5 #####################examples########################### ##export PW_COMMENT_DB="blablabla" -##export PW_DLL_INSTALL="xact" # Install DDL in port prefix (used winetricks) +export PW_DLL_INSTALL="faudio" # Install DDL in port prefix (used winetricks) ##export WINEDLLOVERRIDES="blabla=n,b" ##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')" # Additional launch options ##export PW_VULKAN_USE=dxvk # dxvk, vkd3d or 0 for OpenGL diff --git a/data_from_portwine/scripts/portwine_db/WorldOfTanks b/data_from_portwine/scripts/portwine_db/WorldOfTanks index 0a1bdba..190a113 100755 --- a/data_from_portwine/scripts/portwine_db/WorldOfTanks +++ b/data_from_portwine/scripts/portwine_db/WorldOfTanks @@ -3,7 +3,7 @@ #WorldOfTanks.exe #Rating=5 ################################################ -export PW_VULKAN_USE=dxvk #dxvk, vkd3d or 0 for OpenGL +export PW_VULKAN_USE=1 #dxvk, vkd3d or 0 for OpenGL export PW_DLL_INSTALL="lucida vcrun2019" # Install DDL in port prefix (used winetricks) export WINEDLLOVERRIDES="xaudio2_7=" export PW_WINEDBG_DISABLE=1 # Disabled WINEDBG diff --git a/data_from_portwine/scripts/portwine_db/WorldOfTanksEnCoreLauncher b/data_from_portwine/scripts/portwine_db/WorldOfTanksEnCoreLauncher index f2dd894..db2ab16 100755 --- a/data_from_portwine/scripts/portwine_db/WorldOfTanksEnCoreLauncher +++ b/data_from_portwine/scripts/portwine_db/WorldOfTanksEnCoreLauncher @@ -3,7 +3,7 @@ #WorldOfTanksEnCoreLauncher.exe #Rating=1-5 ################################################ - export PW_VULKAN_USE=dxvk + export PW_VULKAN_USE=1 export PW_USE_TERMINAL=0 export WINEPREFIX="${PORT_WINE_PATH}/data/pfx_dotnet/" export PW_DLL_INSTALL="vcrun2017 mfc42 vb6run physx dotnet40 " # Install DDL in port prefix (used winetricks) diff --git a/data_from_portwine/scripts/portwine_db/avengers b/data_from_portwine/scripts/portwine_db/avengers index 6c94824..e77d455 100755 --- a/data_from_portwine/scripts/portwine_db/avengers +++ b/data_from_portwine/scripts/portwine_db/avengers @@ -5,7 +5,8 @@ ################################################ export PW_VULKAN_USE=dxvk export LAUNCH_PARAMETERS="" -export WINEDLLOVERRIDES="atiadlxx=n" +#export WINEDLLOVERRIDES="atiadlxx=n" export PW_WINDOWS_VER=10 # Set windows version 10, 7 or XP -export PW_NO_FSYNC=1 # Do not use futex-based in-process synchronization primitives. (Automatically disabled on systems with no FUTEX_WAIT_MULTIPLE support. -export PW_NO_ESYNC=1 # Do not use eventfd-based in-process synchronization primitives \ No newline at end of file +#export PW_NO_FSYNC=0 # Do not use futex-based in-process synchronization primitives. (Automatically disabled on systems with no FUTEX_WAIT_MULTIPLE support. +#export PW_NO_ESYNC=1 # Do not use eventfd-based in-process synchronization primitives +export PW_DLL_INSTALL="d3dcompiler_47 vcrun2019" \ No newline at end of file diff --git a/data_from_portwine/scripts/portwine_db/default b/data_from_portwine/scripts/portwine_db/default index 0333868..386e465 100755 --- a/data_from_portwine/scripts/portwine_db/default +++ b/data_from_portwine/scripts/portwine_db/default @@ -11,7 +11,7 @@ ##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')" # Additional launch options ##export PW_WINE_USE=PROTON_GE # PROTON_STEAM or PROTON_GE -##export PW_VULKAN_USE=vkd3d # dxvk, vkd3d or 0 for OpenGL +##export PW_VULKAN_USE=1 # 1 ,dxvk or 0 for OpenGL ##export PW_DXR_ON=1 ##export PW_DLSS_ON=1 ##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN diff --git a/data_from_portwine/scripts/portwine_db/eve b/data_from_portwine/scripts/portwine_db/eve index 72a5a56..0a7a974 100755 --- a/data_from_portwine/scripts/portwine_db/eve +++ b/data_from_portwine/scripts/portwine_db/eve @@ -6,7 +6,7 @@ #####################examples########################### ##export PW_COMMENT_DB="blablabla" export PW_WINE_USE=PROTON_GE -export PW_VULKAN_USE=dxvk +export PW_VULKAN_USE=1 export PW_WINDOWS_VER=7 # Set windows version 10, 7 or XP export PW_DLL_INSTALL="vcrun2019 d3dcompiler_47" # Install DDL in port prefix (used winetricks) export WINEDLLOVERRIDES="concrt140,msvcp140,msvcp140_1,msvcp140_2,d3dcompiler_47=n" diff --git a/data_from_portwine/scripts/portwine_db/steam b/data_from_portwine/scripts/portwine_db/steam index 08d255d..e7e9261 100755 --- a/data_from_portwine/scripts/portwine_db/steam +++ b/data_from_portwine/scripts/portwine_db/steam @@ -4,9 +4,9 @@ #Rating=5 ################################################ export PW_COMMENT_DB="Steam" -export PW_WINDOWS_VER=7 # Set windows version 10, 7 or XP +export PW_WINDOWS_VER=10 # Set windows version 10, 7 or XP export PW_DLL_INSTALL="vcrun2019 d3dcompiler_46" export WINEDLLOVERRIDES="libglesv2,lsteamclient=" export LAUNCH_PARAMETERS="-no-cef-sandbox" -export PW_VULKAN_USE=dxvk +export PW_VULKAN_USE=1 export PW_WINE_USE=PROTON_GE diff --git a/data_from_portwine/scripts/portwine_db/wgc b/data_from_portwine/scripts/portwine_db/wgc index 9096f55..6d7a652 100755 --- a/data_from_portwine/scripts/portwine_db/wgc +++ b/data_from_portwine/scripts/portwine_db/wgc @@ -5,7 +5,7 @@ #Rating=5 export PW_COMMENT_DB="Wargaming Game Center" ################################################ -#export PW_VULKAN_USE=dxvk #dxvk, vkd3d or 0 for OpenGL +export PW_VULKAN_USE=1 #dxvk, vkd3d or 0 for OpenGL export LAUNCH_PARAMETERS="--disable-gpu" # Additional launch options #export PW_USE_TERMINAL=1 export PW_WINDOWS_VER=10 # Set windows version 10, 7 or XP diff --git a/data_from_portwine/scripts/runlib b/data_from_portwine/scripts/runlib index 2908f7d..031b153 100755 --- a/data_from_portwine/scripts/runlib +++ b/data_from_portwine/scripts/runlib @@ -271,17 +271,22 @@ start_portwine () { # export TOTAL_VRAM=`"${PW_WINELIB}/runtime/bin/glxinfo" -B | grep Total | awk -F: '{print $2}' | awk '{print $1}'` # echo "TOTAL_VRAM=${TOTAL_VRAM}" - echo "Try copy native DXGI" - if ! try_copy_file "${WINEDIR}"/lib/wine/fakedlls/dxgi.dll "${WINEPREFIX}/drive_c/windows/syswow64/" - then try_copy_file "${WINEDIR}"/lib/wine/i386-windows/dxgi.dll "${WINEPREFIX}/drive_c/windows/syswow64/" - fi - if ! try_copy_file "${WINEDIR}"/lib64/wine/fakedlls/dxgi.dll "${WINEPREFIX}/drive_c/windows/system32/" - then try_copy_file "${WINEDIR}"/lib64/wine/x86_64-windows/dxgi.dll "${WINEPREFIX}/drive_c/windows/system32/" - fi + + [[ "${PW_VULKAN_USE}" = "vkd3d" ]] && export PW_VULKAN_USE=1 + echo "Try copy dxvk_config file" try_copy_file "${WINEDIR}/lib/wine/dxvk/dxvk_config.dll" "${WINEPREFIX}/drive_c/windows/syswow64/" try_copy_file "${WINEDIR}/lib64/wine/dxvk/dxvk_config.dll" "${WINEPREFIX}/drive_c/windows/system32/" - + + if [[ "${PW_VULKAN_USE}" = "0" || "${PW_VULKAN_USE}" = "1" ]] ; then + echo "Try copy native DXGI" + if ! try_copy_file "${WINEDIR}"/lib/wine/fakedlls/dxgi.dll "${WINEPREFIX}/drive_c/windows/syswow64/" + then try_copy_file "${WINEDIR}"/lib/wine/i386-windows/dxgi.dll "${WINEPREFIX}/drive_c/windows/syswow64/" + fi + if ! try_copy_file "${WINEDIR}"/lib64/wine/fakedlls/dxgi.dll "${WINEPREFIX}/drive_c/windows/system32/" + then try_copy_file "${WINEDIR}"/lib64/wine/x86_64-windows/dxgi.dll "${WINEPREFIX}/drive_c/windows/system32/" + fi + fi if [ "${PW_VULKAN_USE}" = "0" ] ; then echo "Use OpenGL" export MESA_GLSL_CACHE_DIR="${PORT_WINE_TMP_PATH}" @@ -295,20 +300,27 @@ start_portwine () { then try_copy_file "${WINEDIR}/lib64/wine/x86_64-windows/${wine_build_dll}.dll" "${WINEPREFIX}/drive_c/windows/system32/" fi done - var_winedlloverride_update "d3d11,d3d10,d3d10core,d3d10_1,d3d9,dxgi=b;d3d12=" - elif [ "${PW_VULKAN_USE}" = "vkd3d" ] ; then - echo "Use VKD3D-PROTON only (DX12 to vulkan)" - echo "Try copy native VKD3D files" - for wine_vkd3d_dll in d3d12 libvkd3d-proton-utils-3 ; do - try_copy_file "${WINEDIR}/lib/wine/vkd3d-proton/${wine_vkd3d_dll}.dll" "${WINEPREFIX}/drive_c/windows/syswow64/" - try_copy_file "${WINEDIR}/lib64/wine/vkd3d-proton/${wine_vkd3d_dll}.dll" "${WINEPREFIX}/drive_c/windows/system32/" + var_winedlloverride_update "d3d11,d3d10,d3d10core,d3d10_1,d3d9,dxgi=b" + elif [ "${PW_VULKAN_USE}" = "1" ] ; then + echo "Use VKD3D-PROTON and DXVK (DX12 to vulkan)" + export CP_DXVK_FILES="d3d11 d3d10 d3d10core d3d10_1 d3d9" + echo "Try copy native DXVK files" + for wine_dxvk_dll in ${CP_DXVK_FILES} ; do + try_copy_file "${WINEDIR}/lib/wine/dxvk/${wine_dxvk_dll}.dll" "${WINEPREFIX}/drive_c/windows/syswow64/" + try_copy_file "${WINEDIR}/lib64/wine/dxvk/${wine_dxvk_dll}.dll" "${WINEPREFIX}/drive_c/windows/system32/" + var_winedlloverride_update "${wine_dxvk_dll}=n" done - var_winedlloverride_update "d3d12=n;dxgi=b" + echo "Try copy native VKD3D files" try_copy_file "${WINEDIR}/lib/vkd3d/libvkd3d-shader-1.dll" "${WINEPREFIX}/drive_c/windows/syswow64/" - try_copy_file "${WINEDIR}/lib64/vkd3d/libvkd3d-shader-1.dll" "${WINEPREFIX}/drive_c/windows/system32/" + try_copy_file "${WINEDIR}/lib64/vkd3d/libvkd3d-shader-1.dll" "${WINEPREFIX}/drive_c/windows/system32/" + for wine_vkd3d_dll in d3d12 libvkd3d-proton-utils-3 ; do + try_copy_file "${WINEDIR}/lib/wine/vkd3d-proton/${wine_vkd3d_dll}.dll" "${WINEPREFIX}/drive_c/windows/syswow64/" + try_copy_file "${WINEDIR}/lib64/wine/vkd3d-proton/${wine_vkd3d_dll}.dll" "${WINEPREFIX}/drive_c/windows/system32/" + done + var_winedlloverride_update "d3d12=n;dxgi=b" else + echo "Use DXVK only." export CP_DXVK_FILES="d3d11 d3d10 d3d10core d3d10_1 d3d9 dxgi" - echo "Use DXVK" echo "Try copy native DXVK files" for wine_dxvk_dll in ${CP_DXVK_FILES} ; do try_copy_file "${WINEDIR}/lib/wine/dxvk/${wine_dxvk_dll}.dll" "${WINEPREFIX}/drive_c/windows/syswow64/" diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh index 1171c7b..69a8a80 100755 --- a/data_from_portwine/scripts/start.sh +++ b/data_from_portwine/scripts/start.sh @@ -245,9 +245,9 @@ if [ ! -z "${PORTWINE_DB_FILE}" ] ; then [ -z "${PW_WINE_USE}" ] && export PW_WINE_USE=PROTON_STEAM fi case "${PW_VULKAN_USE}" in - "vkd3d") export PW_DEFAULT_VULKAN_USE='VKD3D (DX 12 to Vulkan)\!DXVK (DX 9-11 to Vulkan)\!OPENGL ' ;; - "0") export PW_DEFAULT_VULKAN_USE='OPENGL \!DXVK (DX 9-11 to Vulkan)\!VKD3D (DX 12 to Vulkan)' ;; - *) export PW_DEFAULT_VULKAN_USE='DXVK (DX 9-11 to Vulkan)\!VKD3D (DX 12 to Vulkan)\!OPENGL ' ;; + "dxvk") export PW_DEFAULT_VULKAN_USE='DXVK (DX 9-11 to Vulkan)\!VULKAN (DXVK and VKD3D)\!OPENGL ' ;; + "0") export PW_DEFAULT_VULKAN_USE='OPENGL \!VULKAN (DXVK and VKD3D)\!DXVK (DX 9-11 to Vulkan)' ;; + *) export PW_DEFAULT_VULKAN_USE='VULKAN (DXVK and VKD3D)\!DXVK (DX 9-11 to Vulkan)\!OPENGL ' ;; esac case "${PW_WINE_USE}" in "PROTON_GE") export PW_DEFAULT_WINE_USE="PROTON_GE (${PW_GE_VER})\!PROTON_STEAM (${PW_STEAM_VER})${DIST_ADD_TO_GUI}" ;; @@ -257,7 +257,7 @@ if [ ! -z "${PORTWINE_DB_FILE}" ] ; then export PW_DEFAULT_WINE_USE="${PW_WINE_USE}\!PROTON_STEAM (${PW_STEAM_VER})\!PROTON_GE (${PW_GE_VER})${DIST_ADD_TO_GUI}" ;; esac else - export PW_DEFAULT_VULKAN_USE='DXVK (DX 9-11 to Vulkan)\!VKD3D (DX 12 to Vulkan)\!OPENGL ' + export PW_DEFAULT_VULKAN_USE='VULKAN (DXVK and VKD3D)\!DXVK (DX 9-11 to Vulkan)\!OPENGL ' export PW_DEFAULT_WINE_USE="PROTON_STEAM (${PW_STEAM_VER})\!PROTON_GE (${PW_GE_VER})${DIST_ADD_TO_GUI}" unset PW_GUI_DISABLED_CS fi @@ -352,7 +352,7 @@ else "${pw_yad}" --plug=${KEY} --tabnum=1 --columns=3 --form --separator=";" \ --image "$PW_GUI_ICON_PATH/port_proton.png" \ - --field=":CB" " DXVK (DX 9-11 to Vulkan)"\!"VKD3D (DX 12 to Vulkan)"\!"OPENGL " \ + --field=":CB" "VULKAN (DXVK and VKD3D)\!DXVK (DX 9-11 to Vulkan)\!OPENGL" \ --field=":LBL" "" \ --field='DEBUG'!!"${loc_debug}":"BTN" '@bash -c "button_click DEBUG"' \ --field='WINECFG'!!"${loc_winecfg}":"BTN" '@bash -c "button_click WINECFG"' \ @@ -384,7 +384,7 @@ else fi if [ ! -z "${VULKAN_MOD}" ] ; then if [ "${VULKAN_MOD}" = "DXVK" ] ; then export PW_VULKAN_USE="dxvk" - elif [ "${VULKAN_MOD}" = "VKD3D" ]; then export PW_VULKAN_USE="vkd3d" + elif [ "${VULKAN_MOD}" = "VULKAN" ]; then export PW_VULKAN_USE="1" elif [ "${VULKAN_MOD}" = "OPENGL" ]; then export PW_VULKAN_USE="0" fi fi diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index 0ab5810..90e1e99 100755 --- a/data_from_portwine/scripts/var +++ b/data_from_portwine/scripts/var @@ -1,6 +1,6 @@ #!/bin/bash #Author: Castro-Fidel (PortWINE-Linux.ru) -#SCRIPTS_NEXT_VERSION=2025 +#SCRIPTS_NEXT_VERSION=2026 #PORT_NEXT_VERSION=97 ######################################################################## export PW_MANGOHUD=1