X-Git-Url: http://git.demorecorder.com/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fextensions%2Fglx.xml;h=2e22c773d236ff3b121891a85fa3122b87a4e39e;hb=453b1ae69b2df7f9d16c5db3316b3dc32fb65ea2;hp=32adaacbf50b8ecfac19340039ffe8362c8c9a20;hpb=db7df9aa326d199d51eb8a2489a95aaa9a3a8606;p=free-sw%2Fxcb%2Fproto

diff --git a/src/extensions/glx.xml b/src/extensions/glx.xml
index 32adaac..2e22c77 100644
--- a/src/extensions/glx.xml
+++ b/src/extensions/glx.xml
@@ -54,7 +54,7 @@ The patch that fixed this server bug in X.org CVS is here:
         <xidtype name="FBCONFIG" />
 
         <union name="DRAWABLE">
-            <field type="xcb_types:WINDOW" name="window" />
+            <field type="xproto:WINDOW" name="window" />
             <field type="PBUFFER" name="glx_pbuffer" />
             <field type="glx:PIXMAP" name="glx_pixmap" />
             <field type="glx:WINDOW" name="glx_window" />
@@ -237,25 +237,24 @@ The patch that fixed this server bug in X.org CVS is here:
 	<request name="CreateGLXPixmap" opcode="13">
 		<field type="CARD32" name="screen" />
 		<field type="VISUALID" name="visual" />
-		<field type="xcb_types:PIXMAP" name="pixmap" />
-		<field type="glx:PIXMAP" name="glxpixmap" />
+		<field type="xproto:PIXMAP" name="pixmap" />
+		<field type="glx:PIXMAP" name="glx_pixmap" />
 	</request>
 
+        
 	<request name="GetVisualConfigs" opcode="14">
 		<field type="CARD32" name="screen" />
 		<reply>
 			<pad bytes="1" />
 			<field type="CARD32" name="num_visuals" />
-			<field type="CARD32" name="num_props" />
-			<pad bytes="16" />
-			<valueparam value-mask-type="CARD32"
-				value-mask-name="value_mask"
-				value-list-name="value_list" />
+			<field type="CARD32" name="num_properties" />
+                        <pad bytes="16" />
+                        <list type="CARD32" name="property_list" />
 		</reply>
 	</request>
 
 	<request name="DestroyGLXPixmap" opcode="15">
-		<field type="glx:PIXMAP" name="glxpixmap" />
+		<field type="glx:PIXMAP" name="glx_pixmap" />
 	</request>
 
 	<!--
@@ -324,23 +323,26 @@ The patch that fixed this server bug in X.org CVS is here:
 			<pad bytes="1" />
 			<field type="CARD32" name="num_FB_configs" />
 			<field type="CARD32" name="num_properties" />
-			<pad bytes="16" />
+                        <pad bytes="16" />
+                        <!--
 			<valueparam value-mask-type="CARD32"
 				value-mask-name="value_mask"
-				value-list-name="value_list" />
+                                value-list-name="value_list" />
+                            -->
+                        <list type="CARD32" name="property_list" />
 		</reply>
 	</request>
 
 	<request name="CreatePixmap" opcode="22">
 		<field type="CARD32" name="screen" />
 		<field type="CARD32" name="fbconfig" />
-		<field type="xcb_types:PIXMAP" name="pixmap" />
-		<field type="glx:PIXMAP" name="glxpixmap" />
+		<field type="xproto:PIXMAP" name="pixmap" />
+		<field type="glx:PIXMAP" name="glx_pixmap" />
 		<field type="CARD32" name="num_attribs" />  
 	</request>
 
 	<request name="DestroyPixmap" opcode="23">
-		<field type="glx:PIXMAP" name="glxpixmap" />
+		<field type="glx:PIXMAP" name="glx_pixmap" />
 	</request>
 
 	<request name="CreateNewContext" opcode="24">
@@ -415,7 +417,7 @@ The patch that fixed this server bug in X.org CVS is here:
 	<request name="CreateWindow" opcode="31">
 		<field type="SCREEN" name="screen" />
 		<field type="FBCONFIG" name="fbconfig" />
-		<field type="xcb_types:WINDOW" name="window" />
+		<field type="xproto:WINDOW" name="window" />
 		<field type="glx:WINDOW" name="glx_window" />
 		<field type="CARD32" name="num_attribs" />
 		<valueparam value-mask-type="CARD32"