From 6d32500a043564a32ac2ab4a66db38f7fa598f05 Mon Sep 17 00:00:00 2001
From: Mikhail Tergoev <fidel@altlinux.org>
Date: Sun, 4 Feb 2024 15:54:50 +0300
Subject: [PATCH] minor - zink

---
 data_from_portwine/changelog_rus  |  1 +
 data_from_portwine/scripts/runlib | 11 ++---------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/data_from_portwine/changelog_rus b/data_from_portwine/changelog_rus
index e67b71e..bd807d9 100755
--- a/data_from_portwine/changelog_rus
+++ b/data_from_portwine/changelog_rus
@@ -3,6 +3,7 @@
 История изменений:
 
 * добалена проверка на кирилицу в путях с предупреждением
+* исправлена работа zink в x11 в новых версиях mesa (спасибо Htylol)
 
 ###Scripts version 2251### Дата: 02.02.2024 / Размер скачиваемого обновления: 8 мегабайт
 * HOTFIX - исправлено автоматическое закрытие EAapp после его установки на некоторых системах
diff --git a/data_from_portwine/scripts/runlib b/data_from_portwine/scripts/runlib
index 4af1f96..7d98f75 100755
--- a/data_from_portwine/scripts/runlib
+++ b/data_from_portwine/scripts/runlib
@@ -465,21 +465,14 @@ start_portwine () {
         export WINE_D3D_CONFIG='renderer=gl'
     elif [[ "${PW_VULKAN_USE}" == "5" ]] ; then
         print_info "Use OpenGL Zink"
-        if [[ "${XDG_SESSION_TYPE}" == "wayland" ]] || [[ "${PW_USE_GAMESCOPE}" == 1 ]] ; then
         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
-        else
-        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
-        export LIBGL_KOPPER_DRI2=1
+        if [[ "${XDG_SESSION_TYPE}" != "wayland" ]] || [[ "${PW_USE_GAMESCOPE}" != 1 ]] ; then
+            export LIBGL_KOPPER_DRI2=1
         fi
     elif [[ "${PW_VULKAN_USE}" == "3" ]] ; then
         print_info "Use GALLIUM-NINE (Native DX9 on MESA drivers)"