From e5a40d8fe356fdb98c6742405a0bfd83c10a902b Mon Sep 17 00:00:00 2001 From: Mikhail Tergoev Date: Sun, 21 May 2023 12:39:45 +0300 Subject: [PATCH] Scripts version 2185 --- data_from_portwine/changelog_eng | 5 +++++ data_from_portwine/changelog_rus | 5 +++++ data_from_portwine/scripts/runlib | 10 ++++++---- data_from_portwine/scripts/var | 10 +++++----- 4 files changed, 21 insertions(+), 9 deletions(-) diff --git a/data_from_portwine/changelog_eng b/data_from_portwine/changelog_eng index 243772a..f333ae7 100755 --- a/data_from_portwine/changelog_eng +++ b/data_from_portwine/changelog_eng @@ -2,6 +2,11 @@ You can help us in the development of the project on the website: boosty.to/linu ----------------------------------------- Changelog: +###Scripts version 2185### +* updated versions: + DXVK_GIT_VER="2.2-7" + VKD3D_GIT_VER="1.1-3424" + ###Scripts version 2184### * FIX for EveLauncher diff --git a/data_from_portwine/changelog_rus b/data_from_portwine/changelog_rus index 17c007f..e09a75d 100755 --- a/data_from_portwine/changelog_rus +++ b/data_from_portwine/changelog_rus @@ -2,6 +2,11 @@ ----------------------------------------- История изменений: +###Scripts version 2185### +* обновлены версии: + DXVK_GIT_VER="2.2-7" + VKD3D_GIT_VER="1.1-3424" + ###Scripts version 2184### * фикс установки EveLauncher diff --git a/data_from_portwine/scripts/runlib b/data_from_portwine/scripts/runlib index 7e561c9..956c7dc 100755 --- a/data_from_portwine/scripts/runlib +++ b/data_from_portwine/scripts/runlib @@ -171,9 +171,11 @@ start_portwine () { [[ ! -z "${PW_MANGOHUD_USER_CONF}" && "${PW_MANGOHUD_USER_CONF}" != 0 ]] && unset MANGOHUD_CONFIG if [[ "${PW_USE_DXR11}" == 1 ]] || [[ "${PW_USE_DXR10}" == 1 ]] || [[ "${PW_USE_RAY_TRACING}" == 1 ]]; then - var_vkd3d_config_update dxr10 - var_radv_perftest_config_update rt,gpl - # export VKD3D_FEATURE_LEVEL=12_1 + var_vkd3d_config_update dxr11 + var_radv_perftest_config_update rt + export VKD3D_FEATURE_LEVEL="12_1" + export DXVK_ENABLE_NVAPI=1 + export WINE_HIDE_NVIDIA_GPU=0 fi export optirun_on="" @@ -462,7 +464,7 @@ start_portwine () { unset WINE_FULLSCREEN_FAKE_CURRENT_RES WINE_FULLSCREEN_FSR_STRENGTH WINE_FULLSCREEN_INTEGER_SCALING fi - for try_cp_dll_from_wine in "ntdll.dll" "vulkan-1.dll" ; do + for try_cp_dll_from_wine in "ntdll.dll" "vulkan-1.dll" "winevulkan.dll" ; do if ! try_copy_file "${WINEDIR}"/lib/wine/fakedlls/${try_cp_dll_from_wine} "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/syswow64/${try_cp_dll_from_wine}" then try_copy_file "${WINEDIR}"/lib/wine/i386-windows/${try_cp_dll_from_wine} "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/syswow64/${try_cp_dll_from_wine}" fi diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index 85d625f..4d2faf4 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=2184 +#SCRIPTS_NEXT_VERSION=2185 ######################################################################## 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 @@ -43,10 +43,12 @@ export PW_GE_VER="8-3" export PW_PROTON_GE_VER="PROTON_GE_${PW_GE_VER}" export PW_WINE_FULLSCREEN_FSR="1" ###DXVK_AND_VKD3D### +# export VKD3D_FEATURE_LEVEL=12_1 +export VKD3D_LIMIT_TESS_FACTORS="16" export DXVK_STABLE_VER="1.10.3-28" -export DXVK_GIT_VER="2.2-1" +export DXVK_GIT_VER="2.2-7" export VKD3D_STABLE_VER="1.1-2602" -export VKD3D_GIT_VER="1.1-3414" +export VKD3D_GIT_VER="1.1-3424" ###PREFIX_VERSION### export DOTPFX_VER="48v1" export DEFPFX_VER="v1" @@ -78,5 +80,3 @@ pw_other_fixes () { echo "" } - -# export VKD3D_FEATURE_LEVEL=12_0