x11proto-dri2: Changes to 'upstream-unstable'
Makefile.am | 3 ++-
configure.ac | 4 ++--
dri2proto.h | 16 ++++++++++++++++
dri2proto.txt | 53 +++++++++++++++++++++++++++++++++++++++++++++--------
dri2tokens.h | 1 +
5 files changed, 66 insertions(+), 11 deletions(-)
New commits:
commit 7fd18b15646a62bd82a4eb0eca60a34c1731813d
Author: Chad Versace <chad@chad-versace.us>
Date: Wed May 11 12:50:11 2011 -0700
Add attachment token DRI2BufferHiz
... and bump version to 2.6.
CC: Eric Anholt <eric@anholt.net>
CC: Ian Romanick <idr@freedesktop.org>
CC: Kristian Høgsberg <krh@bitplanet.net
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Signed-off-by: Chad Versace <chad@chad-versace.us>
diff --git a/configure.ac b/configure.ac
index 297be0e..d671f5a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
AC_PREREQ([2.60])
-AC_INIT([DRI2Proto], [2.5], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([DRI2Proto], [2.6], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
diff --git a/dri2proto.txt b/dri2proto.txt
index dc46e58..df763c7 100644
--- a/dri2proto.txt
+++ b/dri2proto.txt
@@ -178,7 +178,8 @@ DRI2ATTACHMENT { DRI2BufferFrontLeft
DRI2BufferAccum
DRI2BufferFakeFrontLeft
DRI2BufferFakeFrontRight
- DRI2BufferDepthStencil }
+ DRI2BufferDepthStencil
+ DRI2BufferHiz }
These values describe various attachment points for DRI2
buffers.
@@ -509,6 +510,8 @@ The DRI2 extension has undergone a number of revisions before
2.3: Added the DRI2InvalidateBuffers event.
+ 2.6: Enlightenment attained. Added the DRI2BufferHiz attachment.
+
Compatibility up to 2.0 is not preserved, but was also never released.
@@ -569,6 +572,7 @@ A.1 Common Types
0x7 DRI2BufferFakeFrontLeft
0x8 DRI2BufferFakeFrontRight
0x9 DRI2BufferDepthStencil
+ 0xa DRI2BufferHiz
└───
Used to encode the possible attachment points. The attachment
DRI2BufferDepthStencil is only available with protocol version 1.1 or
diff --git a/dri2tokens.h b/dri2tokens.h
index 7804e4d..16c9008 100644
--- a/dri2tokens.h
+++ b/dri2tokens.h
@@ -43,6 +43,7 @@
#define DRI2BufferFakeFrontLeft 7
#define DRI2BufferFakeFrontRight 8
#define DRI2BufferDepthStencil 9
+#define DRI2BufferHiz 10
#define DRI2DriverDRI 0
#define DRI2DriverVDPAU 1
commit 005096937e1da6f65f8ece77662a8db6102d933d
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
Date: Thu May 5 13:11:22 2011 -0700
dri2proto: add a new DRI2BufferSwapComplete struct that matches the spec
Just add a new struct to remain compatible with existing code.
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
diff --git a/configure.ac b/configure.ac
index 9505f56..297be0e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
AC_PREREQ([2.60])
-AC_INIT([DRI2Proto], [2.4], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([DRI2Proto], [2.5], [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..cd82afb 100644
--- a/dri2proto.h
+++ b/dri2proto.h
@@ -290,6 +290,7 @@ typedef struct {
CARD8 pad;
CARD16 sequenceNumber B16;
CARD16 event_type B16;
+ CARD16 pad2;
CARD32 drawable B32;
CARD32 ust_hi B32;
CARD32 ust_lo B32;
@@ -304,6 +305,21 @@ typedef struct {
CARD8 type;
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 B32;
+} xDRI2BufferSwapComplete2;
+#define sz_xDRI2BufferSwapComplete2 32
+
+typedef struct {
+ CARD8 type;
+ CARD8 pad;
+ CARD16 sequenceNumber B16;
CARD32 drawable B32;
CARD32 pad1 B32;
CARD32 pad2 B32;
commit f3c211e1ae183dab5c7529814c9f42af2c29fc6c
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
Date: Thu May 5 09:22:39 2011 -0700
Revert "dri2proto: make DRI2 swap event match GLX spec"
This reverts commit 0ca3778de195a82087d0f07415a1cf8fc94f5b0a.
This broke compatibility by renaming existing struct fields. So revert
in favor of a new struct.
diff --git a/dri2proto.h b/dri2proto.h
index ff76355..9708a4a 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 B32;
+ CARD32 sbc_hi B32;
+ CARD32 sbc_lo B32;
} xDRI2BufferSwapComplete;
#define sz_xDRI2BufferSwapComplete 32
commit 0ca3778de195a82087d0f07415a1cf8fc94f5b0a
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
Date: Tue May 3 12:14:58 2011 -0700
dri2proto: make DRI2 swap event match GLX spec
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>
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
commit 2af5884ab0797f2872028a90fffd4155109cdc4d
Author: Marcin Kościelnicki <koriakin@0x04.net>
Date: Thu May 13 21:05:56 2010 +0000
Fix DRI2Connect line encoding to match existing code
Signed-off-by: Julien Cristau <jcristau@debian.org>
diff --git a/dri2proto.txt b/dri2proto.txt
index f74792e..dc46e58 100644
--- a/dri2proto.txt
+++ b/dri2proto.txt
@@ -618,20 +618,21 @@ A.2 Protocol Requests
DRI2Connect
1 CARD8 major opcode
1 1 DRI2 opcode
- 2 3+(n+p)/4 length
+ 2 3 length
4 WINDOW window
4 CARD32 driver type
▶
1 1 Reply
1 unused
2 CARD16 sequence number
- 4 (n+m+p)/4 reply length
+ 4 (n+m+p+q)/4 reply length
4 n driver name length
4 m device name length
16 unused
n CARD8 driver name
+ p unused, p=pad(n)
m CARD8 device name
- p unused, p=pad(n+m)
+ q unused, q=pad(m)
└───
┌───
commit c34ce137fdb21fc9a52bb8d5a0c25e3c5d79e687
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sun Mar 28 19:25:52 2010 -0400
config: update AC_PREREQ statement to 2.60
Unrelated to the previous patches, the new value simply reflects
the reality that the minimum level for autoconf to configure
all x.org modules is 2.60 dated June 2006.
ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index c5affe3..5b78d6b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_PREREQ([2.57])
+AC_PREREQ([2.60])
AC_INIT([DRI2Proto], [2.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
commit 1c1456e1517d28ffbd844b00090596c21d9a9d9b
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sun Mar 28 19:00:30 2010 -0400
config: remove the pkgconfig pc.in file from EXTRA_DIST
Automake always includes it in the tarball.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/Makefile.am b/Makefile.am
index 2440162..5990273 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,7 +6,6 @@ pkgconfig_DATA = dri2proto.pc
dist_doc_DATA = dri2proto.txt
-EXTRA_DIST = dri2proto.pc.in
MAINTAINERCLEANFILES = ChangeLog INSTALL
commit 70e5dee9a600e67057c55ab9b1b975f20a68682d
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sun Mar 28 17:35:44 2010 -0400
config: install and distribute dri2proto.txt
It will now be installed in $docdir in addition
to being distributed in the tarball.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/Makefile.am b/Makefile.am
index 153b422..2440162 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,7 +4,9 @@ dri2_HEADERS = dri2proto.h dri2tokens.h
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = dri2proto.pc
-EXTRA_DIST = dri2proto.pc.in dri2proto.txt
+dist_doc_DATA = dri2proto.txt
+
+EXTRA_DIST = dri2proto.pc.in
MAINTAINERCLEANFILES = ChangeLog INSTALL
commit 3e6dc6d72844bbc8e8752e2ac2e781cb7d0172f1
Author: Mike Stroyan <mike@LunarG.com>
Date: Tue Feb 16 14:51:43 2010 -0700
Fix typo and obsolete reference in dri2proto.txt
diff --git a/dri2proto.txt b/dri2proto.txt
index 9aa7578..f74792e 100644
--- a/dri2proto.txt
+++ b/dri2proto.txt
@@ -146,7 +146,7 @@ version 2 is used in the CopyRegion request.
4. Errors
-No errrors defined by the DRI2 extension.
+No errors are defined by the DRI2 extension.
⚙ ⚙ ⚙ ⚙ ⚙ ⚙
@@ -260,7 +260,7 @@ The name of this extension is "DRI2".
If the client is not local, or the request driver type is
unknown or not available, 'driver' and 'device' will be empty
- strings, 'group' will be '0'. We are not using an regular X
+ strings. We are not using an regular X
error here to indicate failure, which will allow the client
fall back to other options more easily.
commit 1911ee62a552fae34c82c91b4deef523380fbfe1
Author: Mike Stroyan <mike@LunarG.com>
Date: Tue Feb 16 14:47:21 2010 -0700
Add more info about dri2proto events
diff --git a/dri2proto.txt b/dri2proto.txt
index 3d3eec4..9aa7578 100644
--- a/dri2proto.txt
+++ b/dri2proto.txt
@@ -153,7 +153,8 @@ No errrors defined by the DRI2 extension.
5. Events
-The only event provided by DRI2 is DRI2_BufferSwapComplete.
+The only events provided by DRI2 are DRI2_BufferSwapComplete
+and DRI2InvalidateBuffers.
⚙ ⚙ ⚙ ⚙ ⚙ ⚙
@@ -826,7 +827,38 @@ A.2 Protocol Requests
A.3 Protocol Events
-The DRI2 extension specifies no events.
+The DRI2 extension specifies DRI2_BufferSwapComplete and
+DRI2_InvalidateBuffers events.
+
+┌───
+ DRI2_BufferSwapComplete
+ 1 CARD8 type
+ 1 CARD8 extension
+ 2 CARD16 sequenceNumber
+ 2 CARD16 event_type
+ 4 DRAWABLE drawable
+ 4 CARD32 ust_hi
+ 4 CARD32 ust_lo
+ 4 CARD32 msc_hi
+ 4 CARD32 msc_lo
+ 4 CARD32 sbc_hi
+ 4 CARD32 sbc_lo
+└───
+
+
+┌───
+ DRI2_InvalidateBuffers
+ 1 CARD8 type
+ 1 CARD8 extension
+ 2 CARD16 sequenceNumber
+ 4 DRAWABLE drawable
+ 4 CARD32 unused
+ 4 CARD32 unused
+ 4 CARD32 unused
+ 4 CARD32 unused
+ 4 CARD32 unused
+ 4 CARD32 unused
+└───
A.4 Protocol Errors
Reply to: