aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/hw/dmx/glxProxy/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/hw/dmx/glxProxy/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/hw/dmx/glxProxy/glxext.c')
-rw-r--r--xorg-server/hw/dmx/glxProxy/glxext.c19
1 files changed, 14 insertions, 5 deletions
diff --git a/xorg-server/hw/dmx/glxProxy/glxext.c b/xorg-server/hw/dmx/glxProxy/glxext.c
index b30d144ee..6cd8bb41a 100644
--- a/xorg-server/hw/dmx/glxProxy/glxext.c
+++ b/xorg-server/hw/dmx/glxProxy/glxext.c
@@ -293,11 +293,20 @@ void GlxExtensionInit(void)
return;
}
- __glXContextRes = CreateNewResourceType((DeleteType)ContextGone);
- __glXClientRes = CreateNewResourceType((DeleteType)ClientGone);
- __glXPixmapRes = CreateNewResourceType((DeleteType)PixmapGone);
- __glXWindowRes = CreateNewResourceType((DeleteType)WindowGone);
- __glXPbufferRes = CreateNewResourceType((DeleteType)PbufferGone);
+ __glXContextRes = CreateNewResourceType((DeleteType)ContextGone,
+ "GLXContext");
+ __glXClientRes = CreateNewResourceType((DeleteType)ClientGone,
+ "GLXClient");
+ __glXPixmapRes = CreateNewResourceType((DeleteType)PixmapGone,
+ "GLXPixmap");
+ __glXWindowRes = CreateNewResourceType((DeleteType)WindowGone,
+ "GLXWindow");
+ __glXPbufferRes = CreateNewResourceType((DeleteType)PbufferGone,
+ "GLXPbuffer");
+
+ if (!__glXContextRes || !__glXClientRes || !__glXPixmapRes ||
+ !__glXWindowRes || !__glXPbufferRes)
+ return;
/*
** Add extension to server extensions.