Use WINE_D3D_CONFIG=renderer=gl for default
This commit is contained in:
@ -1814,8 +1814,10 @@ pw_mangohud_check () {
|
|||||||
export PW_MANGOHUD_SLR='MANGOHUD=1'
|
export PW_MANGOHUD_SLR='MANGOHUD=1'
|
||||||
fi
|
fi
|
||||||
# TODO: need to fix work for OpenGL without flatpak...
|
# TODO: need to fix work for OpenGL without flatpak...
|
||||||
|
if [[ $PW_USE_GALLIUM_ZINK == "0" ]] ; then # без этого могут быть вылеты
|
||||||
MANGOHUD_LIB_NAME="libMangoHud_shim.so"
|
MANGOHUD_LIB_NAME="libMangoHud_shim.so"
|
||||||
export PW_LD_PRELOAD="${PW_LD_PRELOAD:+$PW_LD_PRELOAD:}${MANGOHUD_LIB_NAME}"
|
export PW_LD_PRELOAD="${PW_LD_PRELOAD:+$PW_LD_PRELOAD:}${MANGOHUD_LIB_NAME}"
|
||||||
|
fi
|
||||||
else
|
else
|
||||||
export PW_MANGOHUD_SLR=''
|
export PW_MANGOHUD_SLR=''
|
||||||
print_info "MangoHud is disabled"
|
print_info "MangoHud is disabled"
|
||||||
@ -3632,9 +3634,6 @@ start_portwine () {
|
|||||||
PATH_TO_VKD3D_FILES="${PW_VULKAN_DIR}/vkd3d-proton-${VKD3D_GIT_VER}"
|
PATH_TO_VKD3D_FILES="${PW_VULKAN_DIR}/vkd3d-proton-${VKD3D_GIT_VER}"
|
||||||
CP_VKD3D_FILES="libvkd3d-1 libvkd3d-shader-1"
|
CP_VKD3D_FILES="libvkd3d-1 libvkd3d-shader-1"
|
||||||
CP_WINE_FILES="d3d12 d3d12core d3d11 d3d10core d3d10_1 d3d10 d3d9 d3d8 dxgi"
|
CP_WINE_FILES="d3d12 d3d12core d3d11 d3d10core d3d10_1 d3d10 d3d9 d3d8 dxgi"
|
||||||
export __GL_YIELD="NOTHING"
|
|
||||||
export mesa_glthread="true"
|
|
||||||
export WINE_D3D_CONFIG="renderer=gl"
|
|
||||||
export PW_VKBASALT="0"
|
export PW_VKBASALT="0"
|
||||||
;;
|
;;
|
||||||
1)
|
1)
|
||||||
@ -3682,9 +3681,6 @@ start_portwine () {
|
|||||||
# GALLIUM ZINK
|
# GALLIUM ZINK
|
||||||
if [[ $PW_USE_GALLIUM_ZINK == "1" ]] ; then
|
if [[ $PW_USE_GALLIUM_ZINK == "1" ]] ; then
|
||||||
print_info "Use GALLIUM-ZINK (OpenGL on MESA vulkan drivers)"
|
print_info "Use GALLIUM-ZINK (OpenGL on MESA vulkan drivers)"
|
||||||
export __GL_YIELD="NOTHING"
|
|
||||||
export mesa_glthread="true"
|
|
||||||
export WINE_D3D_CONFIG="renderer=gl"
|
|
||||||
export __GLX_VENDOR_LIBRARY_NAME="mesa"
|
export __GLX_VENDOR_LIBRARY_NAME="mesa"
|
||||||
export MESA_LOADER_DRIVER_OVERRIDE="zink"
|
export MESA_LOADER_DRIVER_OVERRIDE="zink"
|
||||||
export GALLIUM_DRIVER="zink"
|
export GALLIUM_DRIVER="zink"
|
||||||
@ -3704,9 +3700,6 @@ start_portwine () {
|
|||||||
print_info "Use GALLIUM-NINE (Native DX9 on MESA drivers)"
|
print_info "Use GALLIUM-NINE (Native DX9 on MESA drivers)"
|
||||||
rm_from_var CP_WINE_FILES "d3d9"
|
rm_from_var CP_WINE_FILES "d3d9"
|
||||||
CP_GALLIUM_NINE_FILES="d3d9"
|
CP_GALLIUM_NINE_FILES="d3d9"
|
||||||
export __GL_YIELD="NOTHING"
|
|
||||||
export mesa_glthread="true"
|
|
||||||
export WINE_D3D_CONFIG="renderer=gl"
|
|
||||||
export PW_VKBASALT="0"
|
export PW_VKBASALT="0"
|
||||||
export PW_MANGOHUD="0"
|
export PW_MANGOHUD="0"
|
||||||
export PW_WINE_FULLSCREEN_FSR="0"
|
export PW_WINE_FULLSCREEN_FSR="0"
|
||||||
@ -3718,8 +3711,13 @@ start_portwine () {
|
|||||||
if [[ $PW_USE_WINED3D_VULKAN == "1" ]] ; then
|
if [[ $PW_USE_WINED3D_VULKAN == "1" ]] ; then
|
||||||
print_info "Use DAMAVAND (DirectX to wined3d vulkan)"
|
print_info "Use DAMAVAND (DirectX to wined3d vulkan)"
|
||||||
export WINE_D3D_CONFIG="renderer=vulkan"
|
export WINE_D3D_CONFIG="renderer=vulkan"
|
||||||
|
else
|
||||||
|
export WINE_D3D_CONFIG="renderer=gl"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
export __GL_YIELD="NOTHING"
|
||||||
|
export mesa_glthread="true"
|
||||||
|
|
||||||
if [[ $PW_USE_SUPPLIED_DXVK_VKD3D == "1" ]] \
|
if [[ $PW_USE_SUPPLIED_DXVK_VKD3D == "1" ]] \
|
||||||
&& [[ ! $PW_WINE_USE =~ (PROTON_LG|WINE_LG) ]] && [[ $PW_VULKAN_USE != 0 ]] \
|
&& [[ ! $PW_WINE_USE =~ (PROTON_LG|WINE_LG) ]] && [[ $PW_VULKAN_USE != 0 ]] \
|
||||||
&& [[ $PW_USE_GALLIUM_ZINK != "1" ]] && [[ $PW_USE_GALLIUM_NINE != "1" ]] && [[ $PW_USE_WINED3D_VULKAN != "1" ]] \
|
&& [[ $PW_USE_GALLIUM_ZINK != "1" ]] && [[ $PW_USE_GALLIUM_NINE != "1" ]] && [[ $PW_USE_WINED3D_VULKAN != "1" ]] \
|
||||||
|
Reference in New Issue
Block a user