frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kdrive: initialize GLX for xephyr 

Like commit ac1a60e7b6, re-add
initialization of GLX after it was accidentally dropped from non-Xorg
servers in 5f5bbbe543.

Signed-off-by: Sebastien Bacher <seb128@ubuntu.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=62346
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Eric Anholt <eric@anholt.net>
This commit is contained in:
Sebastien Bacher 2013-08-23 21:21:44 +02:00 committed by Eric Anholt
parent aa5534ec69
commit abc2bfca16
1 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
hw/kdrive/ephyr/ephyrinit.c
View File

@ -28,6 +28,7 @@
#endif #endif
#include "ephyr.h" #include "ephyr.h"
#include "ephyrlog.h" #include "ephyrlog.h"
#include "glx_extinit.h"
extern Window EphyrPreExistingHostWin; extern Window EphyrPreExistingHostWin;
extern Bool EphyrWantGrayScale; extern Bool EphyrWantGrayScale;
@ -54,9 +55,28 @@ InitCard(char *name)
KdCardInfoAdd(&ephyrFuncs, 0); KdCardInfoAdd(&ephyrFuncs, 0);
} }
static const ExtensionModule ephyrExtensions[] = {
#ifdef GLXEXT
{ GlxExtensionInit, "GLX", &noGlxExtension },
#endif
};
static
void ephyrExtensionInit(void)
{
int i;
for (i = 0; i < ARRAY_SIZE(ephyrExtensions); i++)
LoadExtension(&ephyrExtensions[i], TRUE);
}
void void
InitOutput(ScreenInfo * pScreenInfo, int argc, char **argv) InitOutput(ScreenInfo * pScreenInfo, int argc, char **argv)
{ {
if (serverGeneration == 1)
ephyrExtensionInit();
KdInitOutput(pScreenInfo, argc, argv); KdInitOutput(pScreenInfo, argc, argv);
} }