aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/glx/glxext.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2009-12-20 22:23:03 +0000
committermarha <marha@users.sourceforge.net>2009-12-20 22:23:03 +0000
commitc438f190eedc71ee8dd14e14fec660e98d3dc0bf (patch)
tree9f128ed0356e62d09b44a720ac20bdc60566b66e /xorg-server/glx/glxext.c
parentd842f9ef1c88a7aad04a78613548fc0f0638ac48 (diff)
parentd8432fdd4f13e9f9d1d44f5482faeb56562661a9 (diff)
downloadvcxsrv-c438f190eedc71ee8dd14e14fec660e98d3dc0bf.tar.gz
vcxsrv-c438f190eedc71ee8dd14e14fec660e98d3dc0bf.tar.bz2
vcxsrv-c438f190eedc71ee8dd14e14fec660e98d3dc0bf.zip
svn merge ^/branches/released
Diffstat (limited to 'xorg-server/glx/glxext.c')
-rw-r--r--xorg-server/glx/glxext.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/xorg-server/glx/glxext.c b/xorg-server/glx/glxext.c
index c8885fd3a..a3b5b62dd 100644
--- a/xorg-server/glx/glxext.c
+++ b/xorg-server/glx/glxext.c
@@ -349,13 +349,14 @@ void GlxExtensionInit(void)
__GLXprovider *p;
Bool glx_provided = False;
- __glXContextRes = CreateNewResourceType((DeleteType)ContextGone);
- __glXDrawableRes = CreateNewResourceType((DeleteType)DrawableGone);
- __glXSwapBarrierRes = CreateNewResourceType((DeleteType)SwapBarrierGone);
-
- RegisterResourceName(__glXContextRes, "GLXContext");
- RegisterResourceName(__glXDrawableRes, "GLXDrawable");
- RegisterResourceName(__glXSwapBarrierRes, "GLXSwapBarrier");
+ __glXContextRes = CreateNewResourceType((DeleteType)ContextGone,
+ "GLXContext");
+ __glXDrawableRes = CreateNewResourceType((DeleteType)DrawableGone,
+ "GLXDrawable");
+ __glXSwapBarrierRes = CreateNewResourceType((DeleteType)SwapBarrierGone,
+ "GLXSwapBarrier");
+ if (!__glXContextRes || !__glXDrawableRes || !__glXSwapBarrierRes)
+ return;
if (!dixRequestPrivate(glxClientPrivateKey, sizeof (__GLXclientState)))
return;