diff options
| author | Pierre Ossman <ossman@cendio.se> | 2013-04-09 14:50:15 +0000 |
|---|---|---|
| committer | Pierre Ossman <ossman@cendio.se> | 2013-04-09 14:50:15 +0000 |
| commit | 87524d2c77702d247228f11f801518eb8f6e865b (patch) | |
| tree | 0a7de8cbe84d6cc901550938a02008f8e019868f /unix | |
| parent | accdd9518674c9c0111dd7263f4d94ecfba2534e (diff) | |
| download | tigervnc-87524d2c77702d247228f11f801518eb8f6e865b.tar.gz tigervnc-87524d2c77702d247228f11f801518eb8f6e865b.zip | |
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
Diffstat (limited to 'unix')
| -rw-r--r-- | unix/xserver/hw/vnc/xvnc.cc | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/unix/xserver/hw/vnc/xvnc.cc b/unix/xserver/hw/vnc/xvnc.cc index 9bd8171c..a52c945f 100644 --- 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 */ |