summaryrefslogtreecommitdiffstats
path: root/src/glx/dri2.c
diff options
context:
space:
mode:
authorJesse Barnes <jbarnes@virtuousgeek.org>2011-05-05 13:09:16 -0700
committerJesse Barnes <jbarnes@virtuousgeek.org>2011-07-08 12:31:13 -0700
commit1e39fc784bc3d0d5ad01d9c147529ac0e10f1262 (patch)
tree1aeb45be5529a2a44d258f876433b30b7e8313e0 /src/glx/dri2.c
parent067c9d7bd776260298ceabda026425ed7e4eb161 (diff)
downloadexternal_mesa3d-1e39fc784bc3d0d5ad01d9c147529ac0e10f1262.zip
external_mesa3d-1e39fc784bc3d0d5ad01d9c147529ac0e10f1262.tar.gz
external_mesa3d-1e39fc784bc3d0d5ad01d9c147529ac0e10f1262.tar.bz2
DRI2/GLX: use new swap event types
Use the new swap event type so we get valid SBC values. Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Diffstat (limited to 'src/glx/dri2.c')
-rw-r--r--src/glx/dri2.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/glx/dri2.c b/src/glx/dri2.c
index adfd3d1..8654a37 100644
--- a/src/glx/dri2.c
+++ b/src/glx/dri2.c
@@ -97,7 +97,7 @@ DRI2WireToEvent(Display *dpy, XEvent *event, xEvent *wire)
case DRI2_BufferSwapComplete:
{
GLXBufferSwapComplete *aevent = (GLXBufferSwapComplete *)event;
- xDRI2BufferSwapComplete *awire = (xDRI2BufferSwapComplete *)wire;
+ xDRI2BufferSwapComplete2 *awire = (xDRI2BufferSwapComplete2 *)wire;
/* Ignore swap events if we're not looking for them */
aevent->type = dri2GetSwapEventType(dpy, awire->drawable);
@@ -124,7 +124,7 @@ DRI2WireToEvent(Display *dpy, XEvent *event, xEvent *wire)
}
aevent->ust = ((CARD64)awire->ust_hi << 32) | awire->ust_lo;
aevent->msc = ((CARD64)awire->msc_hi << 32) | awire->msc_lo;
- aevent->sbc = ((CARD64)awire->sbc_hi << 32) | awire->sbc_lo;
+ aevent->sbc = awire->sbc;
return True;
}
#endif