[PATCH v2 34/42] Quartz: Move PseudoramiX initialisation to DDX

[Peter Hutterer]

On Fri, Dec 02, 2011 at 11:27:42AM +0000, Daniel Stone wrote:
> As PseudoramiX is a DDX-specific extension, move its loading and
> initialisation to hw/xquartz.  This creates a QuartzExtensionInit()
> similar in spirit to xf86ExtensionInit.
> 
> Signed-off-by: Daniel Stone <daniel at fooishbar.org>

Acked-by: Peter Hutterer <peter.hutterer at who-t.net> but I guess jeremy needs
to ack this  too

Cheers,
  Peter
> ---
> 
> v2: New.
> 
>  hw/xquartz/quartz.c |   19 +++++++++++++++++++
>  1 files changed, 19 insertions(+), 0 deletions(-)
> 
> diff --git a/hw/xquartz/quartz.c b/hw/xquartz/quartz.c
> index c395b42..46511b5 100644
> --- a/hw/xquartz/quartz.c
> +++ b/hw/xquartz/quartz.c
> @@ -41,6 +41,7 @@
>  #include "darwin.h"
>  #include "darwinEvents.h"
>  #include "pseudoramiX.h"
> +#include "extension.h"
>  #define _APPLEWM_SERVER_
>  #include "applewmExt.h"
>  
> @@ -137,6 +138,22 @@ Bool QuartzSetupScreen(
>      return TRUE;
>  }
>  
> +static const ExtensionModule quartzExtensions[] = {
> +    { PseudoramiXExtensionInit, "PseudoramiX", &noPseudoramiXExtension, NULL },
> +};
> +
> +/*
> + * QuartzExtensionInit
> + * Initialises XQuartz-specific extensions.
> + */
> +void QuartzExtensionInit(void)
> +{
> +    int i;
> +
> +    for (i = 0; i < ARRAY_SIZE(quartzExtensions); i++)
> +        LoadExtension(&quartzExtensions[i], TRUE);
> +}
> +
>  
>  /*
>   * QuartzInitOutput
> @@ -178,6 +195,8 @@ void QuartzInitOutput(
>  
>      // Do display mode specific initialization
>      quartzProcs->DisplayInit();
> +
> +    QuartzExtensionInit();
>  }
>  
>  
> -- 
> 1.7.7.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
>