X-Git-Url: http://git.demorecorder.com/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fglx.xml;h=feaffceaf34db001828e10ac021e65d728b24988;hb=186c79774257193307f92d2cf2008a18bcd68393;hp=5f8b5e6b8596378b7c88a0c30b24c31ffc4c7fac;hpb=b3423e67845cb6f2b858fb3f22295a5ef79821fb;p=free-sw%2Fxcb%2Fproto

diff --git a/src/glx.xml b/src/glx.xml
index 5f8b5e6..feaffce 100644
--- a/src/glx.xml
+++ b/src/glx.xml
@@ -44,7 +44,8 @@ The patch that fixed this server bug in X.org CVS is here:
 	http://cvs.freedesktop.org/xorg/xserver/xorg/GL/glx/glxcmds.c?r1=1.6&r2=1.7
 -->
 
-<xcb header="glx" extension-xname="GLX" extension-name="Glx">
+<xcb header="glx" extension-xname="GLX" extension-name="Glx"
+    major-version="1" minor-version="3">
 	<!-- target support: 1.3 -->
 
 	<import>xproto</import>
@@ -341,6 +342,12 @@ The patch that fixed this server bug in X.org CVS is here:
 		<field type="xproto:PIXMAP" name="pixmap" />
 		<field type="glx:PIXMAP" name="glx_pixmap" />
 		<field type="CARD32" name="num_attribs" />  
+		<list type="CARD32" name="attribs">
+			<op op="*">
+				<fieldref>num_attribs</fieldref>
+				<value>2</value>
+			</op>
+		</list>
 	</request>
 
 	<request name="DestroyPixmap" opcode="23">
@@ -350,7 +357,7 @@ The patch that fixed this server bug in X.org CVS is here:
 	<request name="CreateNewContext" opcode="24">
 		<field type="glx:CONTEXT" name="context" />
 		<field type="CARD32" name="fbconfig" />
-		<field type="SCREEN" name="screen" />
+		<field type="CARD32" name="screen" />
 		<field type="CARD32" name="render_type" />
 		<field type="CARD32" name="share_list" />
 		<field type="BOOL" name="is_direct" />
@@ -362,11 +369,14 @@ The patch that fixed this server bug in X.org CVS is here:
 		<field type="glx:CONTEXT" name="context" />
 		<reply>
 			<pad bytes="1" />
-			<field type="CARD32" name="num_attributes"/>
+			<field type="CARD32" name="num_attribs"/>
 			<pad bytes="20" />
-			<valueparam value-mask-type="CARD32"
-				value-mask-name="value_mask"
-				value-list-name="value_list" />
+			<list type="CARD32" name="attribs">
+				<op op="*">
+					<fieldref>num_attribs</fieldref>
+					<value>2</value>
+				</op>
+			</list>
 		</reply>
 	</request>
 
@@ -383,13 +393,16 @@ The patch that fixed this server bug in X.org CVS is here:
 	</request>
 
 	<request name="CreatePbuffer" opcode="27">
-		<field type="SCREEN" name="screen" />
+		<field type="CARD32" name="screen" />
 		<field type="FBCONFIG" name="fbconfig" />
 		<field type="PBUFFER" name="pbuffer" />
 		<field type="CARD32" name="num_attribs" />
-		<valueparam value-mask-type="CARD32"
-			value-mask-name="value_mask"
-			value-list-name="value_list" />
+		<list type="CARD32" name="attribs">
+			<op op="*">
+				<fieldref>num_attribs</fieldref>
+				<value>2</value>
+			</op>
+		</list>
 	</request>
 
 	<request name="DestroyPbuffer" opcode="28">
@@ -402,29 +415,38 @@ The patch that fixed this server bug in X.org CVS is here:
 			<pad bytes="1" />
 			<field type="CARD32" name="num_attribs" />
 			<pad bytes="20" />
-			<valueparam value-mask-type="CARD32"
-				value-mask-name="value_mask"
-				value-list-name="value_list" />
+			<list type="CARD32" name="attribs">
+				<op op="*">
+					<fieldref>num_attribs</fieldref>
+					<value>2</value>
+				</op>
+			</list>
 		</reply>
 	</request>
 
 	<request name="ChangeDrawableAttributes" opcode="30">
 		<field type="glx:DRAWABLE" name="drawable" />
 		<field type="CARD32" name="num_attribs" />
-		<valueparam value-mask-type="CARD32"
-			value-mask-name="value_mask"
-			value-list-name="value_list" />
+		<list type="CARD32" name="attribs">
+			<op op="*">
+				<fieldref>num_attribs</fieldref>
+				<value>2</value>
+			</op>
+		</list>
 	</request>
 
 	<request name="CreateWindow" opcode="31">
-		<field type="SCREEN" name="screen" />
+		<field type="CARD32" name="screen" />
 		<field type="FBCONFIG" name="fbconfig" />
 		<field type="xproto:WINDOW" name="window" />
 		<field type="glx:WINDOW" name="glx_window" />
 		<field type="CARD32" name="num_attribs" />
-		<valueparam value-mask-type="CARD32"
-			value-mask-name="value_mask"
-			value-list-name="value_list" />
+		<list type="CARD32" name="attribs">
+			<op op="*">
+				<fieldref>num_attribs</fieldref>
+				<value>2</value>
+			</op>
+		</list>
 	</request>
 
 	<request name="DeleteWindow" opcode="32">