diff options
| author | Keith Packard <keithp@keithp.com> | 2011-06-29 20:08:32 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2011-06-29 20:08:32 -0700 |
| commit | 0d2153a46cc72d5f2e6a9081a3cf153aa3eb7787 (patch) | |
| tree | a4641a1ed34f0e710fc38599793dcb9667780ea1 /glx | |
| parent | b631c39a21c8d74fd00b8932df342d6921cce8f4 (diff) | |
| parent | 932513e23b5fe1793cc38eabe02df82e1cc6e4d9 (diff) | |
Merge remote-tracking branch 'jbarnes/master'
Diffstat (limited to 'glx')
| -rw-r--r-- | glx/glxdri2.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/glx/glxdri2.c b/glx/glxdri2.c index d97971739..e8722585b 100644 --- a/glx/glxdri2.c +++ b/glx/glxdri2.c @@ -163,10 +163,10 @@ __glXDRIdrawableWaitGL(__GLXdrawable *drawable) static void __glXdriSwapEvent(ClientPtr client, void *data, int type, CARD64 ust, - CARD64 msc, CARD64 sbc) + CARD64 msc, CARD32 sbc) { __GLXdrawable *drawable = data; - xGLXBufferSwapComplete wire; + xGLXBufferSwapComplete2 wire; if (!(drawable->eventMask & GLX_BUFFER_SWAP_COMPLETE_INTEL_MASK)) return; @@ -192,8 +192,7 @@ __glXdriSwapEvent(ClientPtr client, void *data, int type, CARD64 ust, wire.ust_lo = ust & 0xffffffff; wire.msc_hi = msc >> 32; wire.msc_lo = msc & 0xffffffff; - wire.sbc_hi = sbc >> 32; - wire.sbc_lo = sbc & 0xffffffff; + wire.sbc = sbc; WriteEventsToClient(client, 1, (xEvent *) &wire); } @@ -222,7 +221,7 @@ __glXDRIdrawableSwapBuffers(ClientPtr client, __GLXdrawable *drawable) #endif if (DRI2SwapBuffers(client, drawable->pDraw, 0, 0, 0, &unused, - __glXdriSwapEvent, drawable->pDraw) != Success) + __glXdriSwapEvent, drawable) != Success) return FALSE; return TRUE; |