dri2proto: Branch 'master'

[Kristian Høgsberg]

 configure.ac  |    2 +-
 dri2proto.h   |    5 ++---
 dri2proto.txt |   31 ++++++++-----------------------
 3 files changed, 11 insertions(+), 27 deletions(-)

New commits:
commit 65c7097d549ada25d11738b15996b18c9e57a847
Author: Kristian Høgsberg <krh at redhat.com>
Date:   Mon Dec 1 20:57:40 2008 -0500

    Bump to 1.99.3 and back out the value bitmask from the CopyRegion request.

diff --git a/configure.ac b/configure.ac
index 0a04a0d..e68ec63 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.57])
-AC_INIT([DRI2Proto], [1.99.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([DRI2Proto], [1.99.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 
 XORG_RELEASE_VERSION
diff --git a/dri2proto.h b/dri2proto.h
index 827b358..dc3f2d1 100644
--- a/dri2proto.h
+++ b/dri2proto.h
@@ -173,21 +173,20 @@ typedef struct {
     CARD32  region B32;
     CARD32  dest B32;
     CARD32  src B32;
-    CARD32  bitmask B32;
 } xDRI2CopyRegionReq;
-#define sz_xDRI2CopyRegionReq   24
+#define sz_xDRI2CopyRegionReq   20
 
 typedef struct {
     BYTE    type;   /* X_Reply */
     BYTE    pad1;
     CARD16  sequenceNumber B16;
     CARD32  length B32;
-    CARD32  bitmask B32;
     CARD32  pad2 B32;
     CARD32  pad3 B32;
     CARD32  pad4 B32;
     CARD32  pad5 B32;
     CARD32  pad6 B32;
+    CARD32  pad7 B32;
 } xDRI2CopyRegionReply;
 #define sz_xDRI2CopyRegionReply	32
 
diff --git a/dri2proto.txt b/dri2proto.txt
index e8db139..106f8d8 100644
--- a/dri2proto.txt
+++ b/dri2proto.txt
@@ -269,22 +269,16 @@ The name of this extension is "DRI2".
 	region: REGION
 	source: DRI2ATTACHMENT
 	destination: DRI2ATTACHMENT
-	value-mask: CARD32
-	value-list: LISTofVALUE
       â–¶	
-	value-mask: CARD32
-	value-list: LISTofVALUE
 └───
 	Errors: Window, Value
 
 	Schedule a copy from one DRI2 buffer to another.
 
-	The value-mask and value-list specify optional attributes of
-	the copy operation.  This initial revision of the DRI2
-	protocol doesn't specify any optional attributes, but it is
-	anticipated that buffer flips and various types of vertical
-	retrace synchronization will require extra arguments to be
-	provided and returned.
+	The DRICopyRegion request has a reply but it is empty.  The
+	reply is there to let the direct rendering client wait until
+	the server has seen the request before proceeding with
+	rendering the next frame.
 
 
 			     âš™ âš™ âš™  âš™ âš™ âš™
@@ -309,6 +303,9 @@ The DRI2 extension has undergone a number of revisions before
 		support different driver types and to send the
 		authentication group.
 
+	1.99.3: Drop the bitmask argument intended to indicate
+		presence of optional arguments for CopyRegion.
+
 	2.0: Awesomeness!
 
 Compatibility up to 2.0 is not preserved, but was also never released.
@@ -469,26 +466,14 @@ A.2 Protocol Requests
 	4	REGION			region
 	4	DRI2ATTACHMENT		source
 	4	DRI2ATTACHMENT		destination
-	4	BITMASK			value-mask (has n bits set to 1)
-		no bits specified, must be 0
       â–¶	
 	1	1			Reply
         1				unused
 	2	CARD16			sequence number
 	4	0			reply length
-	4	BITMASK			value-mask (has n bits set to 1)
-		no bits specified, must be 0
-	20				unused	
+	24				unused	
 └───
 
-	With BITMASK and LISTofVALUE defined as in the X11 protocol
-	encoding document.  Specifically, the most significant bit of
-	value-mask is reserved to allow for chained bitmasks.  The
-	sizes of the individual values depend on the values, but is
-	known.  In case of differing DRI2 versions on client and
-	server, either side must not send values the other side does
-	not know about.
-
 
 A.3 Protocol Events