summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2011-05-05 16:23:46 +1000
committerDave Airlie <airlied@redhat.com>2011-05-05 16:25:33 +1000
commitdc4a3edcf9d414d5098618d5d3b79d8dd90adcc3 (patch)
tree16ed7955052b42d3c8b5c247d1b241ba2ff94272 /src
parentae7abf080b5c43e3736db2ed0d0e03ed59eb5ea4 (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.
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 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: