forked from CastroFidel/winehelper
updated vulkan functions
This commit is contained in:
parent
90f334816c
commit
ec08aa36db
36
winehelper
36
winehelper
@ -74,16 +74,14 @@ check_variables WH_DLL_INSTALL ""
|
|||||||
|
|
||||||
check_variables WINE_WIN_START "start /wait /high /unix"
|
check_variables WINE_WIN_START "start /wait /high /unix"
|
||||||
|
|
||||||
check_variables WINE_CPU_TOPOLOGY "4"
|
check_variables WINE_CPU_TOPOLOGY "8"
|
||||||
|
|
||||||
check_variables USE_OPENGL "1"
|
check_variables USE_RENDERER "opengl" # opengl, damavand, proton
|
||||||
|
|
||||||
check_variables DXVK_STABLE_VER "1.10.3-28"
|
check_variables DXVK_VER "1.10.3-28"
|
||||||
check_variables DXVK_GIT_VER "2.2-164"
|
|
||||||
# check_variables DXVK_CONFIG_FILE "path/to/dxvk.conf"
|
# check_variables DXVK_CONFIG_FILE "path/to/dxvk.conf"
|
||||||
|
|
||||||
check_variables VKD3D_STABLE_VER "1.1-2602"
|
check_variables VKD3D_VER "1.1-2602"
|
||||||
check_variables VKD3D_GIT_VER "1.1-3556"
|
|
||||||
# check_variables VKD3D_LIMIT_TESS_FACTORS 64
|
# check_variables VKD3D_LIMIT_TESS_FACTORS 64
|
||||||
# check_variables VKD3D_FEATURE_LEVEL "12_0"
|
# check_variables VKD3D_FEATURE_LEVEL "12_0"
|
||||||
|
|
||||||
@ -455,14 +453,17 @@ run_installed_programs () {
|
|||||||
}
|
}
|
||||||
|
|
||||||
##### USED WINED3D LIBRARY #####
|
##### USED WINED3D LIBRARY #####
|
||||||
init_opengl () {
|
init_wined3d () {
|
||||||
if [[ "$USE_OPENGL" == 1 ]] ; then
|
if [[ "$USE_RENDERER" != "proton" ]] ; then
|
||||||
WINED3D_FILES="d3d8 d3d9 d3d10_1 d3d10 d3d10core d3d11 dxgi d3d12" # d3d12core
|
WINED3D_FILES="d3d8 d3d9 d3d10_1 d3d10 d3d10core d3d11 dxgi d3d12 d3d12core"
|
||||||
for wined3dfiles in $WINED3D_FILES ; do
|
for wined3dfiles in $WINED3D_FILES ; do
|
||||||
try_copy_wine_dll_to_pfx_64 "$wined3dfiles.dll"
|
try_copy_wine_dll_to_pfx_64 "$wined3dfiles.dll"
|
||||||
try_copy_wine_dll_to_pfx_32 "$wined3dfiles.dll"
|
try_copy_wine_dll_to_pfx_32 "$wined3dfiles.dll"
|
||||||
done
|
done
|
||||||
# check_variables WINE_D3D_CONFIG "renderer="
|
if [[ "$USE_RENDERER" == "damavand" ]]
|
||||||
|
then export WINE_D3D_CONFIG="renderer=vulkan"
|
||||||
|
else export WINE_D3D_CONFIG="renderer=gl"
|
||||||
|
fi
|
||||||
return 0
|
return 0
|
||||||
else
|
else
|
||||||
return 1
|
return 1
|
||||||
@ -487,7 +488,7 @@ init_dxvk () {
|
|||||||
|
|
||||||
for DXVK_VAR_VER in "$USE_DXVK_VER" $@ ; do
|
for DXVK_VAR_VER in "$USE_DXVK_VER" $@ ; do
|
||||||
if [[ ! -d "${WH_VULKAN_LIBDIR}/dxvk-$DXVK_VAR_VER" ]] ; then
|
if [[ ! -d "${WH_VULKAN_LIBDIR}/dxvk-$DXVK_VAR_VER" ]] ; then
|
||||||
get_dxvk "$CLOUD_URL/dxvk-${DXVK_VAR_VER}.tar.gz"
|
get_dxvk "$CLOUD_URL/dxvk-${DXVK_VAR_VER}.tar.xz"
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
@ -825,14 +826,13 @@ prepair_wine () {
|
|||||||
init_wineprefix
|
init_wineprefix
|
||||||
use_winetricks
|
use_winetricks
|
||||||
|
|
||||||
unset MANGOHUD_RUN
|
if init_wined3d ; then
|
||||||
if init_opengl ; then
|
:
|
||||||
[[ "$MANGOHUD" == 1 ]] && MANGOHUD_RUN="mangohud --dlsym"
|
|
||||||
else
|
else
|
||||||
init_dxvk "$DXVK_STABLE_VER"
|
init_dxvk "$DXVK_VER"
|
||||||
init_vkd3d "$VKD3D_STABLE_VER"
|
init_vkd3d "$VKD3D_VER"
|
||||||
[[ "$MANGOHUD" == 1 ]] && MANGOHUD_RUN="mangohud"
|
|
||||||
fi
|
fi
|
||||||
|
[[ "$MANGOHUD" == 1 ]] && MANGOHUD_RUN="mangohud"
|
||||||
}
|
}
|
||||||
|
|
||||||
wine_run () {
|
wine_run () {
|
||||||
@ -880,7 +880,7 @@ run_autoinstall () {
|
|||||||
echo
|
echo
|
||||||
elif [[ -f "$WH_AUTOINSTALL_DIR/$AI_SCRIPT" ]] ; then
|
elif [[ -f "$WH_AUTOINSTALL_DIR/$AI_SCRIPT" ]] ; then
|
||||||
export USE_AI_SCRIPTS="1"
|
export USE_AI_SCRIPTS="1"
|
||||||
source "$WH_AUTOINSTALL_DIR/$AI_SCRIPT"
|
source "$WH_AUTOINSTALL_DIR/$AI_SCRIPT" "$@"
|
||||||
print_info "Завершена установка $AI_SCRIPT"
|
print_info "Завершена установка $AI_SCRIPT"
|
||||||
else
|
else
|
||||||
fatal "Скрипт автоматической установки для $AI_SCRIPT не найден!"
|
fatal "Скрипт автоматической установки для $AI_SCRIPT не найден!"
|
||||||
|
Loading…
Reference in New Issue
Block a user