summaryrefslogtreecommitdiff
path: root/src/glx/x11
diff options
context:
space:
mode:
authorRALOVICH, Kristóf <tade60@freemail.hu>2008-11-04 12:41:55 +0100
committerBrian Paul <brian.paul@tungstengraphics.com>2008-11-26 10:02:11 -0700
commit66db1b64e85a2225dff930d3bb9e1194bde75622 (patch)
treeb9eaeccfe16a11578e8c0648fe14c3fd91e32d35 /src/glx/x11
parent5f19f5c5865fb3fd7bf82f842d433264d3d2bf99 (diff)
glx: xcbified __glXClientInfo
Diffstat (limited to 'src/glx/x11')
-rw-r--r--src/glx/x11/glxcmds.c21
1 files changed, 17 insertions, 4 deletions
diff --git a/src/glx/x11/glxcmds.c b/src/glx/x11/glxcmds.c
index 0bb548f776..93fc40c284 100644
--- a/src/glx/x11/glxcmds.c
+++ b/src/glx/x11/glxcmds.c
@@ -254,6 +254,10 @@ GLXContext AllocateGLXContext( Display *dpy )
CARD8 opcode;
__GLXattribute *state;
+#ifdef USE_XCB
+ printf("USE_XCB\n");
+#endif
+
if (!dpy)
return NULL;
@@ -1399,9 +1403,18 @@ PUBLIC const char *glXQueryServerString( Display *dpy, int screen, int name )
void __glXClientInfo ( Display *dpy, int opcode )
{
- xGLXClientInfoReq *req;
- int size;
char * ext_str = __glXGetClientGLExtensionString();
+ int size = strlen( ext_str ) + 1;
+
+#ifdef USE_XCB
+ xcb_connection_t *c = XGetXCBConnection(dpy);
+ xcb_glx_client_info(c,
+ GLX_MAJOR_VERSION,
+ GLX_MINOR_VERSION,
+ size,
+ (const uint8_t *)ext_str);
+#else
+ xGLXClientInfoReq *req;
/* Send the glXClientInfo request */
LockDisplay(dpy);
@@ -1411,14 +1424,14 @@ void __glXClientInfo ( Display *dpy, int opcode )
req->major = GLX_MAJOR_VERSION;
req->minor = GLX_MINOR_VERSION;
- size = strlen( ext_str ) + 1;
req->length += (size + 3) >> 2;
req->numbytes = size;
Data(dpy, ext_str, size);
UnlockDisplay(dpy);
SyncHandle();
-
+#endif /* USE_XCB */
+
Xfree( ext_str );
}