From b192c66e0569352128a3d9fff5e40124a6d22270 Mon Sep 17 00:00:00 2001
From: Olivier Fourdan <ofourdan@redhat.com>
Date: Tue, 26 Nov 2024 10:34:59 +0100
Subject: [PATCH] xwayland: Refuse to start with indirect GLX enabled

Xwayland does not support indirect GLX contexts and enabling them will
crash the xserver.

Refuse to start if indirect GLX contexts are enabled on the command
line.

Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1745>
---
 hw/xwayland/xwayland-screen.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/hw/xwayland/xwayland-screen.c b/hw/xwayland/xwayland-screen.c
index 61e5c85a9..0a21c449c 100644
--- a/hw/xwayland/xwayland-screen.c
+++ b/hw/xwayland/xwayland-screen.c
@@ -914,6 +914,10 @@ xwl_screen_validate_options(int argc, char **argv)
         else if (strcmp(argv[i], "-rootless") == 0) {
             rootless = TRUE;
         }
+        else if (strcmp(argv[i], "+iglx") == 0) {
+            ErrorF("Invalid argument, '+iglx' (indirect GLX context) is not supported\n");
+            return FALSE;
+        }
     }
 
     if (rootless && use_fixed_size) {