diff options
| author | Laurent Carlier <lordheavym@gmail.com> | 2013-06-08 00:43:56 +0200 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2013-09-10 13:26:25 -0400 |
| commit | ceffb34774d44ada83cc1994d20c8d65b46bd555 (patch) | |
| tree | 5aa2d945c8b3de161054afbf1083baf315d044a1 /hw | |
| parent | f37972f4a67b49ba9649310a6778bd1bf31e0130 (diff) | |
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>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/kdrive/ephyr/ephyrinit.c | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/hw/kdrive/ephyr/ephyrinit.c b/hw/kdrive/ephyr/ephyrinit.c index 9a1dd7d94..447ff6ba1 100644 --- a/hw/kdrive/ephyr/ephyrinit.c +++ b/hw/kdrive/ephyr/ephyrinit.c @@ -28,6 +28,7 @@ #endif #include "ephyr.h" #include "ephyrlog.h" +#include "glx_extinit.h" extern Window EphyrPreExistingHostWin; extern Bool EphyrWantGrayScale; @@ -47,6 +48,22 @@ extern KdKeyboardDriver LinuxEvdevKeyboardDriver; 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 InitCard(char *name) { @@ -57,6 +74,9 @@ InitCard(char *name) void InitOutput(ScreenInfo * pScreenInfo, int argc, char **argv) { + if (serverGeneration == 1) + ephyrExtensionInit(); + KdInitOutput(pScreenInfo, argc, argv); } |