summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJesse Barnes <jbarnes@virtuousgeek.org>2011-05-03 12:17:28 -0700
committerJesse Barnes <jbarnes@virtuousgeek.org>2011-05-04 14:08:48 -0700
commit70227e21bbd4411956ceeb5039640140e64a11a8 (patch)
tree86b2cbec94a74c5f48f933450e1f395da7652ff2 /src
parent6ae9e8cbabdc8a18a821ea3f716b18b3eb82a495 (diff)
DRI2/GLX: make swap event handling match spec
We only handle a 32 bit swap count, so use the new structure definitions. Reviewed-by: Adam Jackson <ajax@redhat.com> Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Diffstat (limited to 'src')
-rw-r--r--src/glx/dri2.c2
-rw-r--r--src/glx/glxext.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/glx/dri2.c b/src/glx/dri2.c
index adfd3d1f7c8..2f18ca0f1f2 100644
--- a/src/glx/dri2.c
+++ b/src/glx/dri2.c
@@ -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
diff --git a/src/glx/glxext.c b/src/glx/glxext.c
index 278c71978fa..831d83f1b1c 100644
--- a/src/glx/glxext.c
+++ b/src/glx/glxext.c
@@ -138,7 +138,7 @@ __glXWireToEvent(Display *dpy, XEvent *event, xEvent *wire)
aevent->drawable = awire->drawable;
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;
}
default: