diff options
| author | marha <marha@users.sourceforge.net> | 2012-07-13 12:16:00 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-07-13 12:16:00 +0200 |
| commit | dcf9ae77854778629cabd0d6943dda3678eb91fa (patch) | |
| tree | 087d3bb4beb55bcc0c5857b41d2b5b10edd0e2f3 /xorg-server/glx/glxext.c | |
| parent | 2c8d7aa6bda138693fa1827852ba6b75d1721ff8 (diff) | |
| parent | f0a7d1d88be0c31bd471f4428c4493a93f2d9321 (diff) | |
| download | vcxsrv-dcf9ae77854778629cabd0d6943dda3678eb91fa.tar.gz vcxsrv-dcf9ae77854778629cabd0d6943dda3678eb91fa.tar.bz2 vcxsrv-dcf9ae77854778629cabd0d6943dda3678eb91fa.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/glx/glxext.c
xorg-server/hw/xwin/InitOutput.c
Diffstat (limited to 'xorg-server/glx/glxext.c')
| -rw-r--r-- | xorg-server/glx/glxext.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/xorg-server/glx/glxext.c b/xorg-server/glx/glxext.c index 83b85e7c0..0436e2cff 100644 --- a/xorg-server/glx/glxext.c +++ b/xorg-server/glx/glxext.c @@ -332,9 +332,15 @@ GlxExtensionInit(void) ExtensionEntry *extEntry; ScreenPtr pScreen; int i; - __GLXprovider *p; + __GLXprovider *p, **stack; Bool glx_provided = False; + if (serverGeneration == 1) { + for (stack = &__glXProviderStack; *stack; stack = &(*stack)->next) + ; + *stack = &__glXDRISWRastProvider; + } + __glXContextRes = CreateNewResourceType((DeleteType) ContextGone, "GLXContext"); __glXDrawableRes = CreateNewResourceType((DeleteType) DrawableGone, @@ -342,12 +348,6 @@ GlxExtensionInit(void) if (!__glXContextRes || !__glXDrawableRes) return; - if (serverGeneration == 1) - { - GlxPushProvider(&__glXDRISWRastProvider); - glxWinPushNativeProvider(); - } - if (!dixRegisterPrivateKey (&glxClientPrivateKeyRec, PRIVATE_CLIENT, sizeof(__GLXclientState))) return; |