[PATCH 2/2] Attempt to make the protocol spec text reflect reality.

[Eric Anholt]

This was done by comparing dri2proto.h to dri2proto.txt, with some
confirmation from looking at what the server was doing.
---
 dri2proto.txt |   39 +++++++++------------------------------
 1 files changed, 9 insertions(+), 30 deletions(-)

diff --git a/dri2proto.txt b/dri2proto.txt
index dc46e58..5fb7c74 100644
--- a/dri2proto.txt
+++ b/dri2proto.txt
@@ -654,7 +654,7 @@ A.2 Protocol Requests
 ┌───
     DRI2GetBuffers
 	1	CARD8			major opcode
-	1	3			DRI2 opcode
+	1	5			DRI2 opcode
 	2	3			length
 	4	DRAWABLE		drawable
 	4	n			number of attachments
@@ -674,7 +674,7 @@ A.2 Protocol Requests
 ┌───
     DRI2CopyRegion
 	1	CARD8			major opcode
-	1	4			DRI2 opcode
+	1	6			DRI2 opcode
 	2	3			length
 	4	DRAWABLE		drawable
 	4	REGION			region
@@ -691,7 +691,7 @@ A.2 Protocol Requests
 ┌───
     DRI2GetBuffersWithFormat
 	1	CARD8			major opcode
-	1	3			DRI2 opcode
+	1	7			DRI2 opcode
 	2	3			length
 	4	DRAWABLE		drawable
 	4	n			number of attachments
@@ -711,28 +711,7 @@ A.2 Protocol Requests
 ┌───
     DRI2SwapBuffers
 	1	CARD8			major opcode
-	1	7			DRI2 opcode
-	2	8			length
-	4	DRAWABLE		drawable
-      ▶	
-	1	1			Reply
-        1				unused
-	2	CARD16			sequence number
-	4	0			reply length
-	4	CARD32			buffer count
-	4	CARD32			unused
-	4	CARD32			unused
-	4	CARD32			unused
-	4	CARD32			unused
-	4	CARD32			unused
-	4	CARD32			unused
-	5n	LISTofDRI2BUFFER	buffers
-└───
-
-┌───
-    DRI2SwapBuffers
-	1	CARD8			major opcode
-	1	7			DRI2 opcode
+	1	8			DRI2 opcode
 	2	8			length
 	4	DRAWABLE		drawable
 	4	CARD32			target_msc_hi
@@ -748,13 +727,12 @@ A.2 Protocol Requests
 	4	0			reply length
 	4	CARD32			swap_hi
 	4	CARD32			swap_lo
-	5n	LISTofDRI2BUFFER	buffers
 └───
 
 ┌───
     DRI2GetMSC
 	1	CARD8			major opcode
-	1	7			DRI2 opcode
+	1	9			DRI2 opcode
 	2	8			length
 	4	DRAWABLE		drawable
       ▶
@@ -773,7 +751,7 @@ A.2 Protocol Requests
 ┌───
     DRI2WaitMSC
 	1	CARD8			major opcode
-	1	7			DRI2 opcode
+	1	10			DRI2 opcode
 	2	8			length
 	4	DRAWABLE		drawable
 	4	CARD32			target_msc_hi
@@ -798,7 +776,7 @@ A.2 Protocol Requests
 ┌───
     DRI2WaitSBC
 	1	CARD8			major opcode
-	1	7			DRI2 opcode
+	1	11			DRI2 opcode
 	2	8			length
 	4	DRAWABLE		drawable
  	4	CARD32			swap_hi
@@ -819,7 +797,7 @@ A.2 Protocol Requests
 ┌───
     DRI2SwapInterval
 	1	CARD8			major opcode
-	1	7			DRI2 opcode
+	1	12			DRI2 opcode
 	2	8			length
 	4	DRAWABLE		drawable
  	4	CARD32			interval
@@ -837,6 +815,7 @@ DRI2_InvalidateBuffers events.
 	1	CARD8			extension
 	2	CARD16			sequenceNumber
 	2	CARD16			event_type
+	2	CARD16			unused
 	4	DRAWABLE		drawable
 	4	CARD32			ust_hi
 	4	CARD32			ust_lo
-- 
1.7.4.4