diff --git a/data_from_portwine/changelog_eng b/data_from_portwine/changelog_eng index 3ee7ce8..56e63ed 100644 --- a/data_from_portwine/changelog_eng +++ b/data_from_portwine/changelog_eng @@ -2,6 +2,10 @@ You can help us in the development of the project on the website: boosty.to/port ----------------------------------------- Changelog: +###Scripts version 2103### +* updated container launch mode +* temporary variable PW_USE_AMDVLK_DRIVER does not work + ###Scripts version 2102### * fixed work of GALLIUM_NINE on integrated video cards from Intel * fixed switching AMDVLK - RADV diff --git a/data_from_portwine/changelog_rus b/data_from_portwine/changelog_rus index 24b4b9d..f54cc8e 100755 --- a/data_from_portwine/changelog_rus +++ b/data_from_portwine/changelog_rus @@ -2,6 +2,10 @@ ----------------------------------------- История изменений: +###Scripts version 2103### +* обновлен режим запуска контейнера +* временно переменная PW_USE_AMDVLK_DRIVER не работает + ###Scripts version 2102### * исправлена работа GALLIUM_NINE на интегрированных видеокатрах от Intel * исправлено переключение AMDVLK - RADV diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index 899d9a7..05163d9 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -351,7 +351,10 @@ pw_init_runtime () { export PW_LD_LIBRARY_PATH="${WINEDIR}/lib64:${WINEDIR}/lib:${PW_WINELIB}/portable/lib/lib64:${PW_WINELIB}/portable/lib/lib32:${PW_PV_OVERRIDES}/x86_64-linux-gnu/aliases:${PW_PV_OVERRIDES}/i386-linux-gnu/aliases" fi - export PW_VK_LAYER_PATH="${PW_WINELIB}/portable/share/vulkan/implicit_layer.d/" + export PW_VK_LAYER_PATH="${PW_WINELIB}/portable/share/vulkan/implicit_layer.d" + + export DISABLE_VK_LAYER_VALVE_steam_fossilize_1=1 + export DISABLE_VK_LAYER_VALVE_steam_overlay_1=1 if [ ! -z ${PATH_TMP} ] then export PATH="${PATH_TMP}" @@ -374,22 +377,30 @@ pw_init_runtime () { var_winedlloverride_update "winegstreamer=" fi - if [[ ! -z "${PW_SANDBOX_HOME_PATH}" && -d "${PW_SANDBOX_HOME_PATH}" ]]; then - export pw_runtime="${PW_WINELIB}/run \ + if [[ ! -z "${PW_SANDBOX_HOME_PATH}" && -d "${PW_SANDBOX_HOME_PATH}" ]] ; then + export pw_runtime="${PW_WINELIB}/pressure-vessel/bin/pressure-vessel-unruntime \ --unshare-home \ --home="${PW_SANDBOX_HOME_PATH}" \ + --no-gc-legacy-runtimes \ + --no-gc-runtimes \ + --generate-locales \ + --remove-game-overlay \ + --systemd-scope \ ${PW_ADD_TO_ARGS_IN_RUNTIME} --" else - export pw_runtime="${PW_WINELIB}/run \ + export pw_runtime="${PW_WINELIB}/pressure-vessel/bin/pressure-vessel-unruntime \ --share-home \ + --no-gc-legacy-runtimes \ + --no-gc-runtimes \ + --generate-locales \ + --remove-game-overlay \ + --systemd-scope \ ${PW_ADD_TO_ARGS_IN_RUNTIME} --" fi - export PRESSURE_VESSEL_GC_RUNTIMES=1 export PRESSURE_VESSEL_COPY_RUNTIME=1 - export PRESSURE_VESSEL_GC_LEGACY_RUNTIMES=1 - export PRESSURE_VESSEL_REMOVE_GAME_OVERLAY=1 - export PRESSURE_VESSEL_IMPORT_VULKAN_LAYERS=1 + export PRESSURE_VESSEL_IMPORT_VULKAN_LAYERS=0 + # export PRESSURE_VESSEL_GRAPHICS_PROVIDER="" unset PRESSURE_VESSEL_RUNTIME_ARCHIVE export PRESSURE_VESSEL_RUNTIME=runtime @@ -415,7 +426,7 @@ pw_init_runtime () { pw_mangohud_check () { if [[ "${PW_MANGOHUD}" == "1" ]] ; then - export MANGOHUD=1 + export PW_MANGOHUD_SLR='MANGOHUD=1' MANGOHUD_LIB_NAME="libMangoHud.so" if [[ "${PW_VULKAN_USE}" = "0" ]] ; then MANGOHUD_LIB_NAME="libMangoHud_dlsym.so:${MANGOHUD_LIB_NAME}" @@ -427,7 +438,7 @@ pw_mangohud_check () { var_vk_istance_layers_config_update "VK_LAYER_MANGOHUD_overlay64:VK_LAYER_MANGOHUD_overlay32" print_info "MANGOHUD is enabled" else - export DISABLE_MANGOHUD=1 + export PW_MANGOHUD_SLR='DISABLE_MANGOHUD=1' print_info "MANGOHUD is disabled" fi return 0 diff --git a/data_from_portwine/scripts/lang b/data_from_portwine/scripts/lang index 0e192c9..4ad6b94 100755 --- a/data_from_portwine/scripts/lang +++ b/data_from_portwine/scripts/lang @@ -35,7 +35,7 @@ then export port_del2="Вы действительно хотите полностью удалить PortProton?" export port_deb1="PortWINE был запущен в режиме создания ${portname}.log и он успешно сохранен в корне каталога порта" - export port_deb2="Для диагностики проблемы, скопируйте ВЕСЬ лог в соответствующий канал у нас на сервере дискорда: discord.gg/FTaheP99wE" + export port_deb2="Для диагностики проблемы, скопируйте ВЕСЬ лог в соответствующий канал у нас на сервере дискорда: https://discord.gg/FTaheP99wE" export port_start1="Запуск PortWINE" export port_start2="В каком режиме вы хотите запустить PortWINE?" @@ -145,7 +145,7 @@ then export port_del2="Are you sure you want to delete the PortProton" export port_deb1="PortWINE was launched in creation mode ${portname}.log and it is successfully stored in the root directory of the port" - export port_deb2="To diagnose the problem, copy ALL of the log to discord server: discord.gg/FTaheP99wE" + export port_deb2="To diagnose the problem, copy ALL of the log to discord server: https://discord.gg/FTaheP99wE" export port_start1="Starting the PortWINE" export port_start2="In what mode you want to start the PortWINE?" diff --git a/data_from_portwine/scripts/runlib b/data_from_portwine/scripts/runlib index ba302f3..8fb0068 100755 --- a/data_from_portwine/scripts/runlib +++ b/data_from_portwine/scripts/runlib @@ -354,9 +354,11 @@ start_portwine () { echo "Use VKD3D-PROTON and DXVK (DX 9-12 to vulkan)" if [[ ! -z "${PW_USE_AMDVLK_DRIVER}" ]] && [[ "${PW_USE_AMDVLK_DRIVER}" != 0 ]] ; then export AMD_VULKAN_ICD=AMDVLK + unset DISABLE_LAYER_AMD_SWITCHABLE_GRAPHICS_1 print_info "Try to use AMDVLK driver (only with MESA)" else export AMD_VULKAN_ICD=RADV + export DISABLE_LAYER_AMD_SWITCHABLE_GRAPHICS_1=1 print_info "Try to use RADV driver (only with MESA)" fi export VKD3D_FEATURE_LEVEL="12_0" @@ -368,7 +370,7 @@ start_portwine () { try_force_link_file "${WINEDIR}/lib/wine/dxvk/${wine_dxvk_dll}.dll" "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/syswow64/${wine_dxvk_dll}.dll" try_force_link_file "${WINEDIR}/lib64/wine/dxvk/${wine_dxvk_dll}.dll" "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/system32/${wine_dxvk_dll}.dll" done - if [[ "${PW_USE_WINE_DXGI}" == 1 ]] || [[ "${PW_VULKAN_USE}" == "2" ]]; then + if [[ "${PW_USE_WINE_DXGI}" == 1 ]] || [[ "${PW_VULKAN_USE}" == 2 ]]; then echo "Try link wine DXGI..." if ! try_force_link_file "${WINEDIR}"/lib/wine/fakedlls/dxgi.dll "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/syswow64/dxgi.dll" then try_force_link_file "${WINEDIR}"/lib/wine/i386-windows/dxgi.dll "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/syswow64/dxgi.dll" @@ -404,7 +406,7 @@ start_portwine () { fi if [[ "${PW_USE_SHADER_CACHE}" == 1 ]] ; then - export MESA_GLSL_CACHE_DIR="${PORT_WINE_TMP_PATH}" + export MESA_SHADER_CACHE_DIR="${PORT_WINE_TMP_PATH}" create_new_dir "${PORT_WINE_TMP_PATH}/gl_shader_cache" export __GL_SHADER_DISK_CACHE=1 export __GL_SHADER_DISK_CACHE_PATH="${PORT_WINE_TMP_PATH}/gl_shader_cache" @@ -498,12 +500,12 @@ pw_run () { echo "WINEDLLOVERRIDES=${WINEDLLOVERRIDES}" >> "${PW_LOG_TO_FILE}" echo "------------------------------------" >> "${PW_LOG_TO_FILE}" echo "Log WINE:" >> "${PW_LOG_TO_FILE}" - ${optirun_on} ${PW_GAMEMODERUN_SLR} ${pw_runtime} env LD_PRELOAD="${PW_LD_PRELOAD}" VK_LAYER_PATH="${VK_LAYER_PATH}" \ + ${optirun_on} ${PW_GAMEMODERUN_SLR} ${pw_runtime} env ${PW_MANGOHUD_SLR} LD_PRELOAD="${PW_LD_PRELOAD}" \ PATH="${PATH}" VK_INSTANCE_LAYERS=${PW_VK_INSTANCE_LAYERS} LD_LIBRARY_PATH="${PW_LD_LIBRARY_PATH}" \ VK_LAYER_PATH="${PW_VK_LAYER_PATH}" "${WINELOADER}" "$@" ${LAUNCH_PARAMETERS[@]} &>>"${PW_LOG_TO_FILE}" else [ "${PW_USE_TERMINAL}" != "1" ] && export PW_TERM="" - $PW_TERM ${optirun_on} ${PW_GAMEMODERUN_SLR} ${pw_runtime} env LD_PRELOAD="${PW_LD_PRELOAD}" VK_LAYER_PATH="${VK_LAYER_PATH}" \ + $PW_TERM ${optirun_on} ${PW_GAMEMODERUN_SLR} ${pw_runtime} env ${PW_MANGOHUD_SLR} LD_PRELOAD="${PW_LD_PRELOAD}"\ PATH="${PATH}" VK_INSTANCE_LAYERS=${PW_VK_INSTANCE_LAYERS} LD_LIBRARY_PATH="${PW_LD_LIBRARY_PATH}" \ VK_LAYER_PATH="${PW_VK_LAYER_PATH}" "${WINELOADER}" "$@" ${LAUNCH_PARAMETERS[@]} fi @@ -605,7 +607,7 @@ fi . "${PORT_SCRIPTS_PATH}"/lang . "${PORT_SCRIPTS_PATH}"/zen_yad_gui -export urlg="portwine-linux.ru/portwine-faq/" +export urlg="https://portwine-linux.ru/portwine-faq/" export PW_WINELIB="${PORT_WINE_TMP_PATH}/libs${PW_LIBS_VER}" try_remove_dir "${PW_WINELIB}/var" export PW_GUI_ICON_PATH="${PORT_WINE_PATH}/data/img/gui" diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index bea5b88..ae7ea5e 100755 --- a/data_from_portwine/scripts/var +++ b/data_from_portwine/scripts/var @@ -1,6 +1,6 @@ #!/usr/bin/env bash #Author: Castro-Fidel (PortWINE-Linux.ru) -#SCRIPTS_NEXT_VERSION=2102 +#SCRIPTS_NEXT_VERSION=2103 ######################################################################## 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