summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Jackson <[email protected]>2013-10-04 09:25:51 -0400
committerAdam Jackson <[email protected]>2013-10-08 13:24:20 -0400
commitd101204c23ba2f593881edeffff357309f3924cd (patch)
tree049986f007b876aa8b8c8173df3b74c3c2943b0b
parent68412d5006586f8b5814d85f76985b9d632f36df (diff)
glx: Propagate failures from SendMakeCurrentRequest where possible
Reviewed-by: Brian Paul <[email protected]> Signed-off-by: Adam Jackson <[email protected]>
-rw-r--r--src/glx/indirect_glx.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/glx/indirect_glx.c b/src/glx/indirect_glx.c
index d0457fe7359..d27b0197371 100644
--- a/src/glx/indirect_glx.c
+++ b/src/glx/indirect_glx.c
@@ -132,6 +132,7 @@ indirect_bind_context(struct glx_context *gc, struct glx_context *old,
__GLXattribute *state;
Display *dpy = gc->psc->dpy;
int opcode = __glXSetupForCommand(dpy);
+ Bool ret;
if (old != &dummyContext && !old->isDirect && old->psc->dpy == dpy) {
tag = old->currentContextTag;
@@ -140,8 +141,8 @@ indirect_bind_context(struct glx_context *gc, struct glx_context *old,
tag = 0;
}
- SendMakeCurrentRequest(dpy, opcode, gc->xid, tag, draw, read,
- &gc->currentContextTag);
+ ret = SendMakeCurrentRequest(dpy, opcode, gc->xid, tag, draw, read,
+ &gc->currentContextTag);
if (!IndirectAPI)
IndirectAPI = __glXNewIndirectAPI();
@@ -154,7 +155,7 @@ indirect_bind_context(struct glx_context *gc, struct glx_context *old,
__glXInitVertexArrayState(gc);
}
- return Success;
+ return ret;
}
static void