summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/glx/glxcmds.c15
-rw-r--r--src/glx/single2.c3
2 files changed, 9 insertions, 9 deletions
diff --git a/src/glx/glxcmds.c b/src/glx/glxcmds.c
index 5c79073a9cc..224e402c8ca 100644
--- a/src/glx/glxcmds.c
+++ b/src/glx/glxcmds.c
@@ -575,20 +575,19 @@ static Bool
__glXIsDirect(Display * dpy, GLXContextID contextID)
{
CARD8 opcode;
+ xcb_connection_t *c;
+ xcb_generic_error_t *err;
+ xcb_glx_is_direct_reply_t *reply;
+ Bool is_direct;
opcode = __glXSetupForCommand(dpy);
if (!opcode) {
return GL_FALSE;
}
- xcb_connection_t *c = XGetXCBConnection(dpy);
- xcb_generic_error_t *err;
- xcb_glx_is_direct_reply_t *reply = xcb_glx_is_direct_reply(c,
- xcb_glx_is_direct
- (c, contextID),
- &err);
-
- const Bool is_direct = (reply != NULL && reply->is_direct) ? True : False;
+ c = XGetXCBConnection(dpy);
+ reply = xcb_glx_is_direct_reply(c, xcb_glx_is_direct(c, contextID), &err);
+ is_direct = (reply != NULL && reply->is_direct) ? True : False;
if (err != NULL) {
__glXSendErrorForXcb(dpy, err);
diff --git a/src/glx/single2.c b/src/glx/single2.c
index 103558fb5b2..54f51ad7fd8 100644
--- a/src/glx/single2.c
+++ b/src/glx/single2.c
@@ -886,8 +886,9 @@ __indirect_glAreTexturesResident(GLsizei n, const GLuint * textures,
GLboolean retval = (GLboolean) 0;
if (__builtin_expect((n >= 0) && (dpy != NULL), 1)) {
xcb_connection_t *c = XGetXCBConnection(dpy);
+ xcb_glx_are_textures_resident_reply_t *reply;
(void) __glXFlushRenderBuffer(gc, gc->pc);
- xcb_glx_are_textures_resident_reply_t *reply =
+ reply =
xcb_glx_are_textures_resident_reply(c,
xcb_glx_are_textures_resident
(c, gc->currentContextTag, n,