From 5e39bf3ae3b44890af2439bfb3dc1ee6b49522b8 Mon Sep 17 00:00:00 2001
From: Htylol <dixperm909@yandex.ru>
Date: Fri, 30 May 2025 01:49:42 +0500
Subject: [PATCH] Use WINE_D3D_CONFIG=renderer=gl for default

---
 data_from_portwine/scripts/functions_helper | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper
index ed3b19e4..d1bc08e5 100755
--- a/data_from_portwine/scripts/functions_helper
+++ b/data_from_portwine/scripts/functions_helper
@@ -1814,8 +1814,10 @@ pw_mangohud_check () {
             export PW_MANGOHUD_SLR='MANGOHUD=1'
         fi
         # TODO: need to fix work for OpenGL without flatpak...
-        MANGOHUD_LIB_NAME="libMangoHud_shim.so"
-        export PW_LD_PRELOAD="${PW_LD_PRELOAD:+$PW_LD_PRELOAD:}${MANGOHUD_LIB_NAME}"
+        if [[ $PW_USE_GALLIUM_ZINK == "0" ]] ; then # без этого могут быть вылеты
+            MANGOHUD_LIB_NAME="libMangoHud_shim.so"
+            export PW_LD_PRELOAD="${PW_LD_PRELOAD:+$PW_LD_PRELOAD:}${MANGOHUD_LIB_NAME}"
+        fi
     else
         export PW_MANGOHUD_SLR=''
         print_info "MangoHud is disabled"
@@ -3632,9 +3634,6 @@ start_portwine () {
             PATH_TO_VKD3D_FILES="${PW_VULKAN_DIR}/vkd3d-proton-${VKD3D_GIT_VER}"
             CP_VKD3D_FILES="libvkd3d-1 libvkd3d-shader-1"
             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"
             ;;
         1)
@@ -3682,9 +3681,6 @@ start_portwine () {
     # GALLIUM ZINK
     if [[ $PW_USE_GALLIUM_ZINK == "1" ]] ; then
         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 MESA_LOADER_DRIVER_OVERRIDE="zink"
         export GALLIUM_DRIVER="zink"
@@ -3704,9 +3700,6 @@ start_portwine () {
         print_info "Use GALLIUM-NINE (Native DX9 on MESA drivers)"
         rm_from_var CP_WINE_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_MANGOHUD="0"
         export PW_WINE_FULLSCREEN_FSR="0"
@@ -3718,8 +3711,13 @@ start_portwine () {
     if [[ $PW_USE_WINED3D_VULKAN == "1" ]] ; then
         print_info "Use DAMAVAND (DirectX to wined3d vulkan)"
         export WINE_D3D_CONFIG="renderer=vulkan"
+    else
+        export WINE_D3D_CONFIG="renderer=gl"
     fi
 
+    export __GL_YIELD="NOTHING"
+    export mesa_glthread="true"
+
     if [[ $PW_USE_SUPPLIED_DXVK_VKD3D == "1" ]] \
     && [[ ! $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" ]] \