GLX is no longer initialised by the dix. Patch originally by

Adam Tkac for Fedora.

git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@5067 3789f03b-4d11-0410-bbf8-ca57d06f2519

diff --git a/unix/xserver/hw/vnc/xvnc.cc b/unix/xserver/hw/vnc/xvnc.cc
index 9bd8171c44fe38a5e5295b0fa57c9d0f51ad4ba4..a52c945f30dd21610655bc1d47c5e5266fcc1cc8 100644 (file)
--- a/unix/xserver/hw/vnc/xvnc.cc
+++ b/unix/xserver/hw/vnc/xvnc.cc
@@ -1563,6 +1563,18 @@ vfbScreenInit(ScreenPtr pScreen, int argc, char **argv)
 static void vfbClientStateChange(CallbackListPtr*, pointer, pointer) {
   dispatchException &= ~DE_RESET;
 }
+ 
+#if XORG >= 113
+#ifdef GLXEXT
+extern "C" void GlxExtensionInit(void);
+
+static ExtensionModule glxExt = {
+    GlxExtensionInit,
+    "GLX",
+    &noGlxExtension
+};
+#endif
+#endif
 
 void
 InitOutput(ScreenInfo *screenInfo, int argc, char **argv)
@@ -1573,6 +1585,13 @@ InitOutput(ScreenInfo *screenInfo, int argc, char **argv)
     int i;
     int NumFormats = 0;
 
+#if XORG >= 113
+#ifdef GLXEXT
+    if (serverGeneration == 1)
+        LoadExtension(&glxExt, TRUE);
+#endif
+#endif
+
     /* initialize pixmap formats */
 
     /* must have a pixmap depth to match every screen depth */