From b723eb5085a8a5312923f401fa3064a5e39a11bf 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>
---
 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 778627a91..2864e7c3d 100644
--- a/hw/xwayland/xwayland-screen.c
+++ b/hw/xwayland/xwayland-screen.c
@@ -896,6 +896,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) {