From de3b44dd572fb5e2a6a7514304c3a27230f04390 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Mon, 10 Aug 2020 14:32:50 +0200
Subject: [xorg] Conditionally apply Iris workaround

---
 .../xorg/data/etc/X11/Xsession.d/10-fix-vmware-3d      | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

(limited to 'core/modules/xorg')

diff --git a/core/modules/xorg/data/etc/X11/Xsession.d/10-fix-vmware-3d b/core/modules/xorg/data/etc/X11/Xsession.d/10-fix-vmware-3d
index 05382879..8a436ec1 100644
--- a/core/modules/xorg/data/etc/X11/Xsession.d/10-fix-vmware-3d
+++ b/core/modules/xorg/data/etc/X11/Xsession.d/10-fix-vmware-3d
@@ -6,5 +6,21 @@
 # and newer, which unfortunately completely breaks 3D acceleration with
 # VMware 15.5.6 (as of 2020-08-04 with Mesa 20.0 + Ubuntu 20.04 as base)
 
-export MESA_LOADER_DRIVER_OVERRIDE=i965
+drivers="$( grep -Po '(?<=Matched )\S*' /var/log/Xorg.0.log )"
+intel=false
+other=false
+for driver in $drivers; do
+	case "$driver" in
+	ati|amdgpu|nvidia|nouveau|vmware)
+		other=true
+		;;
+	intel)
+		intel=true
+		;;
+	esac
+done
+if $intel && ! $other; then
+	export MESA_LOADER_DRIVER_OVERRIDE=i965
+fi
+true
 
-- 
cgit v1.2.3-55-g7522