diff --git a/data_from_portwine/changelog_eng b/data_from_portwine/changelog_eng index f249f468..3993f2d8 100755 --- a/data_from_portwine/changelog_eng +++ b/data_from_portwine/changelog_eng @@ -2,6 +2,9 @@ You can help us in the development of the project on the website: https://linux- ----------------------------------------- Changelog: +###Scripts version 2217### Date: 31.08.2023 / Download update size: 8 megabytes +* the latest versions of DXVK and VKD3D are selected by default + ###Scripts version 2216### Date: 30.08.2023 / Download update size: 650 megabytes * updated PROTON_LG to version 8-14 there is no extra symbol on the screen when starting STEAM_PP diff --git a/data_from_portwine/changelog_rus b/data_from_portwine/changelog_rus index 5205a096..d4197734 100755 --- a/data_from_portwine/changelog_rus +++ b/data_from_portwine/changelog_rus @@ -2,6 +2,10 @@ ----------------------------------------- История изменений: +###Scripts version 2217### Дата: 31.08.2023 / Размер скачиваемого обновления: 8 мегабайт +* временно отключено определение Vulkan API из за возможных проблем на стороне vulkaninfo +* новейшие версии DXVK и VKD3D выбраны по умолчанию (более востребованы для новейших игр) + ###Scripts version 2216### Дата: 30.08.2023 / Размер скачиваемого обновления: 650 мегабайт * обновлен PROTON_LG до версии 8-14: нет лишнего символа, на экране, при запуске STEAM_PP diff --git a/data_from_portwine/scripts/portwine_db/Anno4 b/data_from_portwine/scripts/portwine_db/Anno4 index d3d9eb60..f1b32de8 100755 --- a/data_from_portwine/scripts/portwine_db/Anno4 +++ b/data_from_portwine/scripts/portwine_db/Anno4 @@ -8,8 +8,7 @@ export PW_COMMENT_DB="If after the first launch you see a black screen,\njust re ##export PW_DLL_INSTALL="vcrun2017" # 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_WINE_USE=PROTON_GE -export PW_VULKAN_USE=dxvk +export PW_VULKAN_USE=1 ##export PW_USE_DXR10=1 ##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN ##export PW_USE_NVAPI_AND_DLSS=0 diff --git a/data_from_portwine/scripts/portwine_db/Forsaken_World b/data_from_portwine/scripts/portwine_db/Forsaken_World index 27891962..27886540 100755 --- a/data_from_portwine/scripts/portwine_db/Forsaken_World +++ b/data_from_portwine/scripts/portwine_db/Forsaken_World @@ -8,7 +8,7 @@ export PW_WINDOWS_VER="10" export PW_DLL_INSTALL="" export WINEDLLOVERRIDES="" export LAUNCH_PARAMETERS="" -export PW_WINE_USE="PROTON_GE" +export PW_WINE_USE="PROTON_LG" export PW_VULKAN_USE="1" export PW_USE_DXR10="0" ##export PW_DLSS_ON=1 diff --git a/data_from_portwine/scripts/portwine_db/GalaxyClient b/data_from_portwine/scripts/portwine_db/GalaxyClient index 76e5d1e2..1e187f0d 100755 --- a/data_from_portwine/scripts/portwine_db/GalaxyClient +++ b/data_from_portwine/scripts/portwine_db/GalaxyClient @@ -4,7 +4,7 @@ #GOG_Galaxy_2.0.exe #Rating=1-5 ################################################ -export PW_VULKAN_USE=1 +export PW_VULKAN_USE=2 export WINEDLLOVERRIDES="galaxycommunication.exe=n;libglesv2=" export LAUNCH_PARAMETERS="/runWithoutUpdating /deelevated" export PW_DLL_INSTALL="vcrun2019" diff --git a/data_from_portwine/scripts/portwine_db/HogwartsLegacy b/data_from_portwine/scripts/portwine_db/HogwartsLegacy index f3ef752a..47a449a0 100644 --- a/data_from_portwine/scripts/portwine_db/HogwartsLegacy +++ b/data_from_portwine/scripts/portwine_db/HogwartsLegacy @@ -14,7 +14,7 @@ export PW_DLL_INSTALL="" export WINEDLLOVERRIDES="" export LAUNCH_PARAMETERS="" export PW_WINE_USE="PROTON_LG" -export PW_VULKAN_USE="1" +export PW_VULKAN_USE="2" export PW_USE_DXR10="0" ##export PW_DLSS_ON=1 ##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN diff --git a/data_from_portwine/scripts/portwine_db/fc3_blooddragon_d3d11 b/data_from_portwine/scripts/portwine_db/fc3_blooddragon_d3d11 index 597db216..b9264423 100755 --- a/data_from_portwine/scripts/portwine_db/fc3_blooddragon_d3d11 +++ b/data_from_portwine/scripts/portwine_db/fc3_blooddragon_d3d11 @@ -8,8 +8,8 @@ export PW_DLL_INSTALL="corefonts" # Install DDL in port prefix (used winetricks) export WINEDLLOVERRIDES=xaudio2_7=n,b ##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')" # Additional launch options -export PW_WINE_USE=PROTON_GE -export PW_VULKAN_USE=dxvk +export PW_WINE_USE=PROTON_LG +export PW_VULKAN_USE=1 export PW_USE_DXR10=0 export PW_VULKAN_NO_ASYNC=0 export PW_USE_NVAPI_AND_DLSS=0 diff --git a/data_from_portwine/scripts/portwine_db/gfclient b/data_from_portwine/scripts/portwine_db/gfclient index 0878c732..4216e8ae 100755 --- a/data_from_portwine/scripts/portwine_db/gfclient +++ b/data_from_portwine/scripts/portwine_db/gfclient @@ -4,7 +4,7 @@ #Rating=1-5 #####################examples########################### export PW_COMMENT_DB="GameForge\nClient" -export PW_VULKAN_USE=dxvk +export PW_VULKAN_USE=1 export PW_WINE_USE=PROTON_GE export PW_WINDOWS_VER=10 # Set windows version 10, 7 or XP export PW_DLL_INSTALL="vcrun2019 d3dcompiler_43 d3dcompiler_47" # Install DDL in port prefix (used winetricks) diff --git a/data_from_portwine/scripts/portwine_db/gu b/data_from_portwine/scripts/portwine_db/gu index 9b194791..1818e011 100755 --- a/data_from_portwine/scripts/portwine_db/gu +++ b/data_from_portwine/scripts/portwine_db/gu @@ -9,7 +9,7 @@ ##export WINEDLLOVERRIDES="blabla=n,b" ##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')" # Additional launch options export PW_WINE_USE=PROTON_LG -export PW_VULKAN_USE=dxvk +export PW_VULKAN_USE=1 export PW_DXR_ON=0 export PW_VULKAN_NO_ASYNC=0 ##export PW_USE_NVAPI=0 diff --git a/data_from_portwine/scripts/portwine_db/hl2 b/data_from_portwine/scripts/portwine_db/hl2 index ac8a270f..95f60ccd 100755 --- a/data_from_portwine/scripts/portwine_db/hl2 +++ b/data_from_portwine/scripts/portwine_db/hl2 @@ -9,7 +9,7 @@ ##export WINEDLLOVERRIDES="blabla=n,b" ##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')" # Additional launch options export PW_WINE_USE=PROTON_LG -export PW_VULKAN_USE=dxvk +export PW_VULKAN_USE=1 export PW_DXR_ON=0 ##export PW_DLSS_ON=1 export PW_VULKAN_NO_ASYNC=0 diff --git a/data_from_portwine/scripts/runlib b/data_from_portwine/scripts/runlib index 70a512c8..437867f1 100755 --- a/data_from_portwine/scripts/runlib +++ b/data_from_portwine/scripts/runlib @@ -703,8 +703,7 @@ create_new_dir "${PORT_WINE_TMP_PATH}"/mono export PW_VULKAN_DIR="${PORT_WINE_TMP_PATH}/VULKAN" create_new_dir "${PW_VULKAN_DIR}" -export VULKAN_API_VERSION="$(vulkaninfo 2>/dev/null | grep "api" | head -n 1 | awk '{print $3}')" -print_var VULKAN_API_VERSION +# export VULKAN_API_VERSION="$(vulkaninfo 2>/dev/null | grep "api" | head -n 1 | awk '{print $3}')" cd "${PORT_SCRIPTS_PATH}" . "${PORT_SCRIPTS_PATH}/var" diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh index 0c60d3ae..09a5bdb1 100755 --- a/data_from_portwine/scripts/start.sh +++ b/data_from_portwine/scripts/start.sh @@ -514,13 +514,13 @@ if [[ -n "${PORTWINE_DB_FILE}" ]] ; then [[ -z "${PW_COMMENT_DB}" ]] && PW_COMMENT_DB="${loc_gui_db_comments} ${PORTWINE_DB}." if [[ -z "${PW_VULKAN_USE}" || -z "${PW_WINE_USE}" ]] ; then unset PW_GUI_DISABLED_CS - [[ -z "${PW_VULKAN_USE}" ]] && export PW_VULKAN_USE=1 + [[ -z "${PW_VULKAN_USE}" ]] && export PW_VULKAN_USE=2 fi case "${PW_VULKAN_USE}" in - "0") export PW_DEFAULT_VULKAN_USE="${loc_gui_open_gl}!${loc_gui_vulkan_stable}!${loc_gui_vulkan_git}!${loc_gui_gallium_nine}" ;; - "2") export PW_DEFAULT_VULKAN_USE="${loc_gui_vulkan_git}!${loc_gui_vulkan_stable}!${loc_gui_open_gl}!${loc_gui_gallium_nine}" ;; - "3") export PW_DEFAULT_VULKAN_USE="${loc_gui_gallium_nine}!${loc_gui_vulkan_stable}!${loc_gui_vulkan_git}!${loc_gui_open_gl}" ;; - *) export PW_DEFAULT_VULKAN_USE="${loc_gui_vulkan_stable}!${loc_gui_vulkan_git}!${loc_gui_open_gl}!${loc_gui_gallium_nine}" ;; + 0) export PW_DEFAULT_VULKAN_USE="${loc_gui_open_gl}!${loc_gui_vulkan_stable}!${loc_gui_vulkan_git}!${loc_gui_gallium_nine}" ;; + 1) export PW_DEFAULT_VULKAN_USE="${loc_gui_vulkan_stable}!${loc_gui_vulkan_git}!${loc_gui_open_gl}!${loc_gui_gallium_nine}" ;; + 3) export PW_DEFAULT_VULKAN_USE="${loc_gui_gallium_nine}!${loc_gui_vulkan_stable}!${loc_gui_vulkan_git}!${loc_gui_open_gl}" ;; + *) export PW_DEFAULT_VULKAN_USE="${loc_gui_vulkan_git}!${loc_gui_vulkan_stable}!${loc_gui_open_gl}!${loc_gui_gallium_nine}" ;; esac if [[ -n $(echo "${PW_WINE_USE}" | grep "^PROTON_LG$") ]] ; then export PW_DEFAULT_WINE_USE="${PW_PROTON_LG_VER}!${PW_PROTON_GE_VER}${DIST_ADD_TO_GUI}!GET-OTHER-WINE" @@ -537,7 +537,7 @@ if [[ -n "${PORTWINE_DB_FILE}" ]] ; then fi fi else - export PW_DEFAULT_VULKAN_USE="${loc_gui_vulkan_stable}!${loc_gui_vulkan_git}!${loc_gui_open_gl}!${loc_gui_gallium_nine}" + export PW_DEFAULT_VULKAN_USE="${loc_gui_vulkan_git}!${loc_gui_vulkan_stable}!${loc_gui_open_gl}!${loc_gui_gallium_nine}" if [[ -n $(echo "${PW_WINE_USE}" | grep "^PROTON_LG$") ]] ; then export PW_DEFAULT_WINE_USE="${PW_PROTON_LG_VER}!${PW_PROTON_GE_VER}${DIST_ADD_TO_GUI}!GET-OTHER-WINE" elif [[ -n $(echo "${PW_WINE_USE}" | grep "^PROTON_GE$") ]] ; then @@ -690,6 +690,7 @@ else fi PW_GENERATE_BUTTONS+="--field= ${PW_DESKTOP_FILES//".desktop"/""}!${PW_NAME_D_ICON_48}!:FBTN%@bash -c \"run_desktop_b_click "${PW_DESKTOP_FILES//" "/¬}"\"%" done + IFS="$orig_IFS" old_IFS=$IFS && IFS="%" "${pw_yad_v12_3}" --plug=$KEY --tabnum=${PW_GUI_SORT_TABS[4]} --form --columns=3 --align-buttons --keep-icon-size --scroll --separator=" " ${PW_GENERATE_BUTTONS} 2>/dev/null & @@ -707,7 +708,7 @@ else --field=" $loc_gui_credits"!"$PW_GUI_ICON_PATH/separator.png"!"":"FBTN" '@bash -c "button_click gui_credits"' 2>/dev/null & "${pw_yad_v12_3}" --plug=${KEY} --tabnum=${PW_GUI_SORT_TABS[2]} --form --columns=3 --align-buttons --keep-icon-size --separator=";" \ - --field=" 3D API : :CB" "${loc_gui_vulkan_stable}!${loc_gui_vulkan_git}!${loc_gui_open_gl}!${loc_gui_gallium_nine}" \ + --field=" 3D API : :CB" "${loc_gui_vulkan_git}!${loc_gui_vulkan_stable}!${loc_gui_open_gl}!${loc_gui_gallium_nine}" \ --field=" PREFIX : :CBE" "${PW_ADD_PREFIXES_TO_GUI}" \ --field=" WINE : :CB" "${PW_DEFAULT_WINE_USE}" \ --field=" DOWNLOAD OTHER WINE"!"$PW_GUI_ICON_PATH/separator.png"!"${loc_download_other_wine}":"FBTN" '@bash -c "button_click gui_proton_downloader"' \ diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index 58251289..dd6f0a9f 100755 --- a/data_from_portwine/scripts/var +++ b/data_from_portwine/scripts/var @@ -1,6 +1,6 @@ #!/usr/bin/env bash #Author: Castro-Fidel (linux-gaming.ru) -#SCRIPTS_NEXT_VERSION=2216 +#SCRIPTS_NEXT_VERSION=2217 ######################################################################## export PW_MANGOHUD=0 export MANGOHUD_CONFIG=cpu_stats,cpu_temp,cpu_mhz,cpu_color=2e97cb,cpu_text=CPU,gpu_stats,gpu_temp,gpu_core_clock,gpu_mem_clock,vulkan_driver,gpu_name,gpu_color=2e9762,gpu_text=GPU,vram,vram_color=ad64c1,ram,ram_color=c26693,io_color=a491d3,frame_timing=1,frametime_color=00ff00,time,arch,wine,wine_color=eb5b5b,engine_color=eb5b5b,background_alpha=0.2,font_size=24,background_color=020202,text_color=ffffff,toggle_hud=Shift_R+F12,resolution,vkbasalt @@ -15,6 +15,7 @@ export PW_LOG="0" export PW_USE_TERMINAL="0" export PW_WINEDBG_DISABLE="1" export PW_WINDOWS_VER="10" +export PW_VULKAN_USE="2" export WINEARCH="win64" export PW_LIBS_VER="_v44" export GDK_BACKEND="x11" @@ -47,14 +48,9 @@ export PW_WINE_FULLSCREEN_FSR="1" ###DXVK_AND_VKD3D### export VKD3D_LIMIT_TESS_FACTORS="32" export D8VK_VER="1.0" -if [[ $VULKAN_API_VERSION == 1.2.* ]] ; then - export DXVK_STABLE_VER="1.10.3-28" - export VKD3D_STABLE_VER="1.1-2602" -else - export DXVK_STABLE_VER="2.2-34" - export VKD3D_STABLE_VER="1.1-3445" -fi +export DXVK_STABLE_VER="1.10.3-28" export DXVK_GIT_VER="2.2-164" +export VKD3D_STABLE_VER="1.1-2602" export VKD3D_GIT_VER="1.1-3556" ###PREFIX_VERSION### export DOTPFX_VER="48v1"