ephyr: restore GLX support
It was removed since version 1.13 Signed-off-by: Sebastien Bacher <seb128@ubuntu.com> Acked-by: Daniel Stone <daniel@fooishbar.org>
This commit is contained in:
parent
f37972f4a6
commit
ceffb34774
@ -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;
|
||||||
@ -47,6 +48,22 @@ extern KdKeyboardDriver LinuxEvdevKeyboardDriver;
|
|||||||
|
|
||||||
void processScreenArg(const char *screen_size, char *parent_id);
|
void processScreenArg(const char *screen_size, char *parent_id);
|
||||||
|
|
||||||
|
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
|
||||||
InitCard(char *name)
|
InitCard(char *name)
|
||||||
{
|
{
|
||||||
@ -57,6 +74,9 @@ InitCard(char *name)
|
|||||||
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);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user