Mesa (master): glx: Fix return value from indirect_bind_context
Adam Jackson
ajax at kemper.freedesktop.org
Fri Oct 25 20:50:19 UTC 2013
Module: Mesa
Branch: master
Commit: 1090eb57552aed1f4e36ac97b5859ff4b2cc80a5
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=1090eb57552aed1f4e36ac97b5859ff4b2cc80a5
Author: Adam Jackson <ajax at redhat.com>
Date: Fri Oct 25 15:12:04 2013 -0400
glx: Fix return value from indirect_bind_context
_XReply returns 1 on success, but indirect_bind_context returns 0 on
success.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=70486
Reviewed-and-tested-by: Ian Romanick <ian.d.romanick at intel.com>
Signed-off-by: Adam Jackson <ajax at redhat.com>
---
src/glx/indirect_glx.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/glx/indirect_glx.c b/src/glx/indirect_glx.c
index d27b019..28b8cd0 100644
--- a/src/glx/indirect_glx.c
+++ b/src/glx/indirect_glx.c
@@ -132,7 +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;
+ Bool sent;
if (old != &dummyContext && !old->isDirect && old->psc->dpy == dpy) {
tag = old->currentContextTag;
@@ -141,8 +141,8 @@ indirect_bind_context(struct glx_context *gc, struct glx_context *old,
tag = 0;
}
- ret = SendMakeCurrentRequest(dpy, opcode, gc->xid, tag, draw, read,
- &gc->currentContextTag);
+ sent = SendMakeCurrentRequest(dpy, opcode, gc->xid, tag, draw, read,
+ &gc->currentContextTag);
if (!IndirectAPI)
IndirectAPI = __glXNewIndirectAPI();
@@ -155,7 +155,7 @@ indirect_bind_context(struct glx_context *gc, struct glx_context *old,
__glXInitVertexArrayState(gc);
}
- return ret;
+ return !sent;
}
static void
More information about the mesa-commit
mailing list