summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesse Barnes <jbarnes@virtuousgeek.org>2011-05-03 12:14:58 -0700
committerJesse Barnes <jbarnes@virtuousgeek.org>2011-05-03 14:04:58 -0700
commit0ca3778de195a82087d0f07415a1cf8fc94f5b0a (patch)
tree4453fe5980f3dd05f5f9f2f5f3307080dd6520ec
parent2af5884ab0797f2872028a90fffd4155109cdc4d (diff)
downloadxorg-proto-dri2proto-0ca3778de195a82087d0f07415a1cf8fc94f5b0a.tar.gz
dri2proto: make DRI2 swap event match GLX specdri2proto-2.4
We only spec a 32 bit sbc count, so drop the high bits. Also make the padding explicit. Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
-rw-r--r--configure.ac2
-rw-r--r--dri2proto.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index 5b78d6b..9505f56 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
AC_PREREQ([2.60])
-AC_INIT([DRI2Proto], [2.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([DRI2Proto], [2.4], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
diff --git a/dri2proto.h b/dri2proto.h
index 9708a4a..ff76355 100644
--- a/dri2proto.h
+++ b/dri2proto.h
@@ -290,13 +290,13 @@ typedef struct {
CARD8 pad;
CARD16 sequenceNumber B16;
CARD16 event_type B16;
+ CARD16 pad2;
CARD32 drawable B32;
CARD32 ust_hi B32;
CARD32 ust_lo B32;
CARD32 msc_hi B32;
CARD32 msc_lo B32;
- CARD32 sbc_hi B32;
- CARD32 sbc_lo B32;
+ CARD32 sbc B32;
} xDRI2BufferSwapComplete;
#define sz_xDRI2BufferSwapComplete 32