[PATCH] ephyr: restore GLX support

[Daniel Stone]

Please merge.

On 7 June 2013 18:43, Laurent Carlier <lordheavym at gmail.com> wrote:
> It was removed since version 1.13
>
> Signed-off-by: Sebastien Bacher <seb128 at ubuntu.com>
> Acked-by: Daniel Stone <daniel at fooishbar.org>
> ---
>  hw/kdrive/ephyr/ephyrinit.c | 20 ++++++++++++++++++++
>  1 file changed, 20 insertions(+)
>
> diff --git a/hw/kdrive/ephyr/ephyrinit.c b/hw/kdrive/ephyr/ephyrinit.c
> index adacac9..4a49cc1 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(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);
>  }
>
> --
> 1.8.3
>
> _______________________________________________
> xorg-devel at lists.x.org: X.Org development
> Archives: http://lists.x.org/archives/xorg-devel
> Info: http://lists.x.org/mailman/listinfo/xorg-devel