diff options
| author | Dave Airlie <[email protected]> | 2011-05-05 16:23:46 +1000 |
|---|---|---|
| committer | Dave Airlie <[email protected]> | 2011-05-05 16:25:33 +1000 |
| commit | dc4a3edcf9d414d5098618d5d3b79d8dd90adcc3 (patch) | |
| tree | 16ed7955052b42d3c8b5c247d1b241ba2ff94272 | |
| parent | ae7abf080b5c43e3736db2ed0d0e03ed59eb5ea4 (diff) | |
Revert "DRI2/GLX: make swap event handling match spec"
This reverts commit 70227e21bbd4411956ceeb5039640140e64a11a8.
revert this until we sort things out, with a new glproto release
with compatible struct names.
| -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 7bd1f2e21c0..54d9c296862 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.4 -GLPROTO_REQUIRED=1.4.13 +DRI2PROTO_REQUIRED=2.1 +GLPROTO_REQUIRED=1.4.11 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 2f18ca0f1f2..adfd3d1f7c8 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 = awire->sbc; + aevent->sbc = ((CARD64)awire->sbc_hi << 32) | awire->sbc_lo; return True; } #endif diff --git a/src/glx/glxext.c b/src/glx/glxext.c index 831d83f1b1c..278c71978fa 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 = awire->sbc; + aevent->sbc = ((CARD64)awire->sbc_hi << 32) | awire->sbc_lo; return True; } default: |