Merge remote-tracking branch 'origin/pr/221'

* origin/pr/221: Also set software rendering via the new $GDK_DISABLE variable Pull request description: See commit message
QubesOS · Dec 27, 2024 · ff1c59e · ff1c59e
2 parents 52b890b + dcf6256
commit ff1c59e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/appvm-scripts/etc/profile.d/qubes-gui.csh b/appvm-scripts/etc/profile.d/qubes-gui.csh
@@ -2,6 +2,7 @@ setenv DISPLAY ":0"
 setenv _JAVA_AWT_WM_NONREPARENTING "1"
 if ( -f /var/run/qubes-service/software-rendering )
   setenv GSK_RENDERER "cairo"
+  setenv GDK_DISABLE "gl vulkan"
   setenv GDK_DEBUG "gl-disable vulkan-disable"
   setenv LIBGL_ALWAYS_SOFTWARE "1"
 endif
diff --git a/appvm-scripts/etc/profile.d/qubes-gui.sh b/appvm-scripts/etc/profile.d/qubes-gui.sh
@@ -1,5 +1,7 @@
 export DISPLAY=:0 _JAVA_AWT_WM_NONREPARENTING=1
 if test -f /var/run/qubes-service/software-rendering; then
-  export GSK_RENDERER="cairo" GDK_DEBUG="gl-disable vulkan-disable" \
+  export GSK_RENDERER="cairo" \
+         GDK_DISABLE="gl vulkan" \
+         GDK_DEBUG="gl-disable vulkan-disable" \
          LIBGL_ALWAYS_SOFTWARE=1
 fi