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.

diff --git a/configure.ac b/configure.ac
index 7bd1f2e21c00be75a31e02d80c0742e8ed83c167..54d9c296862380c602706416a5427a13710536aa 100644 (file)
--- 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 2f18ca0f1f241657007b85949aaaf9b14d894b64..adfd3d1f7c8869023fdde46db26fd9a1b45f866e 100644 (file)
--- 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 831d83f1b1c884d149be63eb939bdddb2b22d825..278c71978fa9b372a0a9243153435c9570465adc 100644 (file)
--- 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: