From 44e8826f23844273fbef4768338c164e9221940b Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jackpot51@gmail.com>
Date: Fri, 9 May 2025 10:19:26 -0600
Subject: [PATCH] Re-enable GLX using DRI (much faster)

---
 recipes/wip/x11/mesa-x11/recipe.toml     | 3 +--
 recipes/wip/x11/xserver-xorg/recipe.toml | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/recipes/wip/x11/mesa-x11/recipe.toml b/recipes/wip/x11/mesa-x11/recipe.toml
index dc5ef289e..fceb29d98 100644
--- a/recipes/wip/x11/mesa-x11/recipe.toml
+++ b/recipes/wip/x11/mesa-x11/recipe.toml
@@ -18,11 +18,10 @@ dependencies = [
 ]
 script = """
 DYNAMIC_INIT
-#TODO: use glx=dri
 cookbook_meson \
     -Ddri-drivers-path=/usr/lib/dri \
     -Degl=disabled \
-    -Dglx=xlib \
+    -Dglx=dri \
     -Dllvm=enabled \
     -Dplatforms=x11 \
     -Dshader-cache=disabled
diff --git a/recipes/wip/x11/xserver-xorg/recipe.toml b/recipes/wip/x11/xserver-xorg/recipe.toml
index fc5ff18a7..8436f7b72 100644
--- a/recipes/wip/x11/xserver-xorg/recipe.toml
+++ b/recipes/wip/x11/xserver-xorg/recipe.toml
@@ -21,7 +21,7 @@ dependencies = [
     "libxfont2",
     "libxkbfile",
     "libxxf86vm",
-    #TODO: used for glx, which is currently broken: "mesa-x11",
+    "mesa-x11",
     "openssl1",
     "pixman",
     "x11proto",
@@ -33,7 +33,6 @@ script = """
 DYNAMIC_INIT
 cookbook_meson \
     -Dglamor=false \
-    -Dglx=false \
     -Dint10=false \
     -Dpciaccess=false \
     -Dsecure-rpc=false \