fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 09:18:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

glx: Hide xGLXMakeCurrentReply inside SendMakeCurrentRequest

Browse source 
Reviewed-by: Brian Paul <brianp@vmware.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
This commit is contained in:
Adam Jackson 2013-10-04 09:25:51 -04:00
parent 15a201c610
commit 68412d5006
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/glx/indirect_glx.c
View file

@ -59,8 +59,9 @@ static Bool
SendMakeCurrentRequest(Display * dpy, CARD8 opcode,
GLXContextID gc_id, GLXContextTag gc_tag,
GLXDrawable draw, GLXDrawable read,
xGLXMakeCurrentReply * reply)
GLXContextTag *out_tag)
{
xGLXMakeCurrentReply reply;
Bool ret;
LockDisplay(dpy);
@ -112,7 +113,10 @@ SendMakeCurrentRequest(Display * dpy, CARD8 opcode,
}
}
ret = _XReply(dpy, (xReply *) reply, 0, False);
ret = _XReply(dpy, (xReply *) &reply, 0, False);
if (out_tag)
*out_tag = reply.contextTag;
UnlockDisplay(dpy);
SyncHandle();
@ -124,7 +128,6 @@ static int
indirect_bind_context(struct glx_context *gc, struct glx_context *old,
GLXDrawable draw, GLXDrawable read)
{
xGLXMakeCurrentReply reply;
GLXContextTag tag;
__GLXattribute *state;
Display *dpy = gc->psc->dpy;
@ -137,13 +140,13 @@ indirect_bind_context(struct glx_context *gc, struct glx_context *old,
tag = 0;
}
SendMakeCurrentRequest(dpy, opcode, gc->xid, tag, draw, read, &reply);
SendMakeCurrentRequest(dpy, opcode, gc->xid, tag, draw, read,
&gc->currentContextTag);
if (!IndirectAPI)
IndirectAPI = __glXNewIndirectAPI();
_glapi_set_dispatch(IndirectAPI);
gc->currentContextTag = reply.contextTag;
state = gc->client_state_private;
if (state->array_state == NULL) {
glGetString(GL_EXTENSIONS);
@ -159,7 +162,6 @@ indirect_unbind_context(struct glx_context *gc, struct glx_context *new)
{
Display *dpy = gc->psc->dpy;
int opcode = __glXSetupForCommand(dpy);
xGLXMakeCurrentReply reply;
if (gc == new)
return;
@ -170,7 +172,7 @@ indirect_unbind_context(struct glx_context *gc, struct glx_context *new)
*/
if (!new || new->isDirect || new->psc->dpy != dpy) {
SendMakeCurrentRequest(dpy, opcode, None,
gc->currentContextTag, None, None, &reply);
gc->currentContextTag, None, None, NULL);
gc->currentContextTag = 0;
}
}