Scripts version 2216

This commit is contained in:
Mikhail Tergoev
2023-08-31 12:40:15 +03:00
parent 72bb951959
commit 19bad2db6f
20 changed files with 88 additions and 317 deletions

View File

@ -67,7 +67,7 @@ start_portwine () {
export DXVK_LOG_LEVEL="warn"
export VKD3D_DEBUG="warn"
export WINE_MONO_TRACE="E:System.NotImplementedException"
export VK_LOADER_DEBUG="warn"
export VK_LOADER_DEBUG="none"
export VKBASALT_LOG_LEVEL="warn"
export DXVK_NVAPI_LOG_LEVEL=warn
else
@ -164,12 +164,6 @@ start_portwine () {
var_winedlloverride_update "nvngx,_nvngx="
fi
grep '"renderer"=' "${WINEPREFIX}/user.reg" &>/dev/null
if [[ "$?" == 0 ]] ; then
sed -i /'"renderer"='/d "${WINEPREFIX}/user.reg" &>/dev/null
sed -i /'renderer='/d "${WINEPREFIX}/winetricks.log" &>/dev/null
fi
if [[ ! -z "${optirun_on}" && "${optirun_on}" != "" ]] ; then
export PW_PRIME_RENDER_OFFLOAD=1
print_info "force PW_PRIME_RENDER_OFFLOAD=1"
@ -207,11 +201,11 @@ start_portwine () {
case "$PW_FORCE_USE_VSYNC" in # 0-FORCE_OFF, 1-FORCE_ON, 2-BY_DEFAULT
"0")
unset vblank_mode
unset __GL_SYNC_TO_VBLANK ;;
unset vblank_mode
unset __GL_SYNC_TO_VBLANK ;;
"1")
export vblank_mode=1
export __GL_SYNC_TO_VBLANK=1 ;;
export vblank_mode=1
export __GL_SYNC_TO_VBLANK=1 ;;
esac
export int_xneur=0
if [[ ! -z "`pgrep xneur`" ]]; then
@ -427,12 +421,12 @@ start_portwine () {
else
print_info "Use VKD3D-PROTON, DXVK and D8VK (DirectX to vulkan)"
if [[ "${PW_USE_WINE_DXGI}" == 1 ]] ; then
export CP_DXVK_FILES="d3d11 d3d10core d3d9 dxvk_config openvr_api_dxvk"
export CP_DXVK_FILES="d3d11 d3d10core d3d9 dxvk_config" # openvr_api_dxvk
var_winedlloverride_update dxgi=b
elif [[ "${USE_ALL_DXVK_DLLS}" == 1 ]] ; then
export CP_DXVK_FILES="d3d11 d3d10core d3d10_1 d3d10 d3d9 dxgi dxvk_config openvr_api_dxvk"
export CP_DXVK_FILES="d3d11 d3d10core d3d10_1 d3d10 d3d9 dxgi dxvk_config" # openvr_api_dxvk
else
export CP_DXVK_FILES="d3d11 d3d10core d3d9 dxgi dxvk_config openvr_api_dxvk"
export CP_DXVK_FILES="d3d11 d3d10core d3d9 dxgi dxvk_config" # openvr_api_dxvk
fi
if [[ "${PW_VULKAN_USE}" == "1" ]] ; then
PATH_TO_DXVK_FILES="${PW_VULKAN_DIR}/dxvk-${DXVK_STABLE_VER}"
@ -456,13 +450,11 @@ start_portwine () {
done
print_info "Try link native VKD3D files..."
for wine_vkd3d_dll in d3d12 d3d12core libvkd3d-shader-1 libvkd3d-proton-utils-3 libvkd3d-1 ; do
# libvkd3d-proton-utils-
for wine_vkd3d_dll in d3d12 d3d12core libvkd3d-1 libvkd3d-shader-1; do
if [[ -f "${PATH_TO_VKD3D_FILES}/x64/${wine_vkd3d_dll}.dll" ]] ; then
try_force_link_file "${PATH_TO_VKD3D_FILES}/x86/${wine_vkd3d_dll}.dll" "${WINEPREFIX}/drive_c/windows/syswow64/${wine_vkd3d_dll}.dll"
try_force_link_file "${PATH_TO_VKD3D_FILES}/x64/${wine_vkd3d_dll}.dll" "${WINEPREFIX}/drive_c/windows/system32/${wine_vkd3d_dll}.dll"
else
try_force_link_file "${WINEDIR}/lib/vkd3d/${wine_vkd3d_dll}.dll" "${WINEPREFIX}/drive_c/windows/syswow64/${wine_vkd3d_dll}.dll"
try_force_link_file "${WINEDIR}/lib64/vkd3d/${wine_vkd3d_dll}.dll" "${WINEPREFIX}/drive_c/windows/system32/${wine_vkd3d_dll}.dll"
fi
done
@ -711,6 +703,9 @@ 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
cd "${PORT_SCRIPTS_PATH}"
. "${PORT_SCRIPTS_PATH}/var"