summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAdam Jackson <ajax@redhat.com>2013-10-04 09:25:51 -0400
committerAdam Jackson <ajax@redhat.com>2013-10-08 13:24:20 -0400
commit68412d5006586f8b5814d85f76985b9d632f36df (patch)
tree9938d35a89078770490c3b38ec93221eeb47aae5 /src
parent15a201c6106fb072f2192f4cf85e5de8eeef56cb (diff)
glx: Hide xGLXMakeCurrentReply inside SendMakeCurrentRequest
Reviewed-by: Brian Paul <brianp@vmware.com> Signed-off-by: Adam Jackson <ajax@redhat.com>
Diffstat (limited to 'src')
-rw-r--r--src/glx/indirect_glx.c16
1 files changed, 9 insertions, 7 deletions
diff --git a/src/glx/indirect_glx.c b/src/glx/indirect_glx.c
index f8944a74006..d0457fe7359 100644
--- a/src/glx/indirect_glx.c
+++ b/src/glx/indirect_glx.c
@@ -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;
}
}