diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2012-07-10 02:02:56 +0100 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2012-07-09 23:06:41 -0700 |
| commit | a1d41e311c21eb6627caa0d168e070ceaf90806f (patch) | |
| tree | b0df47d2426c60005c136859c0a3fe8abef73dd7 /glx | |
| parent | b86aa74cafddf9bca5addfeb458a23f46ddcf132 (diff) | |
Move extension initialisation prototypes into extinit.h
Create extinit.h (and xf86Extensions.h, for Xorg-specific extensions) to
hold all our extension initialisation prototypes, rather than
duplicating them everywhere.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'glx')
| -rw-r--r-- | glx/glxext.c | 4 | ||||
| -rw-r--r-- | glx/glxserver.h | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/glx/glxext.c b/glx/glxext.c index e506aec0b..a1f9d42e9 100644 --- a/glx/glxext.c +++ b/glx/glxext.c @@ -39,6 +39,7 @@ #include <registry.h> #include "privates.h" #include <os.h> +#include "extinit.h" #include "unpack.h" #include "glxutil.h" #include "glxext.h" @@ -338,6 +339,9 @@ GlxExtensionInit(void) if (!__glXContextRes || !__glXDrawableRes) return; + if (serverGeneration == 1) + GlxPushProvider(&__glXDRISWRastProvider); + if (!dixRegisterPrivateKey (&glxClientPrivateKeyRec, PRIVATE_CLIENT, sizeof(__GLXclientState))) return; diff --git a/glx/glxserver.h b/glx/glxserver.h index 61c45c51e..d9b106b82 100644 --- a/glx/glxserver.h +++ b/glx/glxserver.h @@ -76,8 +76,6 @@ extern __GLXclientState *glxGetClient(ClientPtr pClient); /************************************************************************/ -void GlxExtensionInit(void); - void GlxSetVisualConfigs(int nconfigs, void *configs, void **privates); void __glXScreenInitVisuals(__GLXscreen * screen); |