DRI2: report swap events correctly in direct rendered case
authorJesse Barnes <jbarnes@virtuousgeek.org>
Tue, 13 Apr 2010 16:38:41 +0000 (09:38 -0700)
committerJesse Barnes <jbarnes@virtuousgeek.org>
Tue, 13 Apr 2010 16:39:28 +0000 (09:39 -0700)
In the direct rendered case, we need to convert DRI2 swap complete
events to GLX events for the client to consume.  This path had what
looks like a stray "& 0x75" from some earlier debugging that prevented
clients from seeing the right event code.

src/glx/dri2.c

index 80c125e741852ac0aca5b943bf74c0488705ed52..6afa4149651b7ed6945af503e86877b1feea1814 100644 (file)
@@ -101,8 +101,7 @@ DRI2WireToEvent(Display *dpy, XEvent *event, xEvent *wire)
       GLXBufferSwapComplete *aevent = (GLXBufferSwapComplete *)event;
       xDRI2BufferSwapComplete *awire = (xDRI2BufferSwapComplete *)wire;
       aevent->serial = _XSetLastRequestRead(dpy, (xGenericReply *) wire);
-      aevent->type =
-         (glx_info->codes->first_event + GLX_BufferSwapComplete) & 0x75;
+      aevent->type = glx_info->codes->first_event + GLX_BufferSwapComplete;
       aevent->send_event = (awire->type & 0x80) != 0;
       aevent->display = dpy;
       aevent->drawable = awire->drawable;