diff options
| author | Jesse Barnes <[email protected]> | 2011-05-03 12:17:28 -0700 |
|---|---|---|
| committer | Jesse Barnes <[email protected]> | 2011-05-04 14:08:48 -0700 |
| commit | 70227e21bbd4411956ceeb5039640140e64a11a8 (patch) | |
| tree | 86b2cbec94a74c5f48f933450e1f395da7652ff2 | |
| parent | 6ae9e8cbabdc8a18a821ea3f716b18b3eb82a495 (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 <[email protected]>
Signed-off-by: Jesse Barnes <[email protected]>
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | src/glx/dri2.c | 2 | ||||
| -rw-r--r-- | src/glx/glxext.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 54d9c296862..7bd1f2e21c0 100644 --- a/configure.ac +++ b/configure.ac @@ -21,8 +21,8 @@ dnl Versions for external dependencies LIBDRM_REQUIRED=2.4.24 LIBDRM_RADEON_REQUIRED=2.4.24 LIBDRM_INTEL_REQUIRED=2.4.24 -DRI2PROTO_REQUIRED=2.1 -GLPROTO_REQUIRED=1.4.11 +DRI2PROTO_REQUIRED=2.4 +GLPROTO_REQUIRED=1.4.13 LIBDRM_XORG_REQUIRED=2.4.24 LIBKMS_XORG_REQUIRED=1.0.0 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: |