Commit cd5689ca authored by Ian Romanick's avatar Ian Romanick
Browse files

glx: Use one function to add a context to all global tables



Instead of having separate __glXAddContextToList and AddResource
functions, just have one function that does both steps.
Signed-off-by: default avatarIan Romanick <ian.d.romanick@intel.com>
Reviewed-by: Jesse Barnes's avatarJesse Barnes <jbarnes@virtuousgeek.org>
Reviewed-by: Christopher James Halse Rogers's avatarChristopher James Halse Rogers <christopher.halse.rogers@canonical.com>
parent c1d91ab3
......@@ -308,16 +308,14 @@ DoCreateContext(__GLXclientState * cl, GLXContextID gcId,
glxc->drawPriv = NULL;
glxc->readPriv = NULL;
/* Register this context as a resource.
/* Add the new context to the various global tables of GLX contexts.
*/
if (!AddResource(gcId, __glXContextRes, (pointer)glxc)) {
if (!__glXAddContext(glxc)) {
(*glxc->destroy) (glxc);
client->errorValue = gcId;
return BadAlloc;
}
__glXAddToContextList(glxc);
return Success;
}
......
......@@ -157,11 +157,18 @@ DrawableGone(__GLXdrawable * glxPriv, XID xid)
return True;
}
void
__glXAddToContextList(__GLXcontext * cx)
Bool
__glXAddContext(__GLXcontext * cx)
{
/* Register this context as a resource.
*/
if (!AddResource(cx->id, __glXContextRes, (pointer)cx)) {
return False;
}
cx->next = glxAllContexts;
glxAllContexts = cx;
return True;
}
static void
......
......@@ -38,7 +38,7 @@
extern GLboolean __glXFreeContext(__GLXcontext * glxc);
extern void __glXFlushContextCache(void);
extern void __glXAddToContextList(__GLXcontext * cx);
extern Bool __glXAddContext(__GLXcontext * cx);
extern void __glXErrorCallBack(GLenum code);
extern void __glXClearErrorOccured(void);
extern GLboolean __glXErrorOccured(void);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment