summaryrefslogtreecommitdiff
path: root/mi/miinitext.c
diff options
context:
space:
mode:
authorJulien Cristau <jcristau@debian.org>2008-11-07 18:36:00 +0100
committerJulien Cristau <jcristau@debian.org>2008-11-07 19:03:32 +0100
commitd3d6be4948fa19947fd3b03e6694247109cc0ffb (patch)
treee205c53b1839b8e9b22a31fd241732975f532da8 /mi/miinitext.c
parentf59352881f315a634f60c9aac885b2764b28b167 (diff)
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>
Diffstat (limited to 'mi/miinitext.c')
-rw-r--r--mi/miinitext.c3
1 files changed, 2 insertions, 1 deletions
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
}