From d3d6be4948fa19947fd3b03e6694247109cc0ffb Mon Sep 17 00:00:00 2001
From: Julien Cristau <jcristau@debian.org>
Date: Fri, 7 Nov 2008 18:36:00 +0100
Subject: mi: Fix infinite loop on regen when swrast_dri.so is missing

The swrast DRI provider gets pushed on the glx provider stack at every
server generation, so the stack turns into a circular list on regen.

X.Org bug#18388 <https://bugs.freedesktop.org/show_bug.cgi?id=18388>
---
 mi/miinitext.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mi/miinitext.c b/mi/miinitext.c
index 753abc13a..92d6cd2f0 100644
--- a/mi/miinitext.c
+++ b/mi/miinitext.c
@@ -473,7 +473,8 @@ InitExtensions(int argc, char *argv[])
 #endif
 
 #ifdef GLXEXT
-    GlxPushProvider(&__glXDRISWRastProvider);
+    if (serverGeneration == 1)
+	GlxPushProvider(&__glXDRISWRastProvider);
     if (!noGlxExtension) GlxExtensionInit();
 #endif
 }
-- 
cgit v1.2.3