dri2proto: Branch 'master'

[Julien Cristau]

 dri2proto.txt |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 2af5884ab0797f2872028a90fffd4155109cdc4d
Author: Marcin Kościelnicki <koriakin at 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 at 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)
 └───
 
 ┌───