X-Git-Url: http://git.demorecorder.com/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fextensions%2Fglx.xml;h=5f8b5e6b8596378b7c88a0c30b24c31ffc4c7fac;hb=39a58929682650c0761e3ccfe2f10978ec5f0b74;hp=a40ecb2c384922b372c9143284f31992a90700dd;hpb=16e4c9bc2e2d1280fbdc1191a1f450dcd54c9417;p=free-sw%2Fxcb%2Fproto

diff --git a/src/extensions/glx.xml b/src/extensions/glx.xml
index a40ecb2..5f8b5e6 100644
--- a/src/extensions/glx.xml
+++ b/src/extensions/glx.xml
@@ -47,18 +47,20 @@ The patch that fixed this server bug in X.org CVS is here:
 <xcb header="glx" extension-xname="GLX" extension-name="Glx">
 	<!-- target support: 1.3 -->
 
+	<import>xproto</import>
+
 	<xidtype name="PIXMAP" />
 	<xidtype name="CONTEXT" />
 	<xidtype name="PBUFFER" />
 	<xidtype name="WINDOW" />
         <xidtype name="FBCONFIG" />
 
-        <union name="DRAWABLE">
-            <field type="xcb_types:WINDOW" name="window" />
-            <field type="PBUFFER" name="glx_pbuffer" />
-            <field type="glx:PIXMAP" name="glx_pixmap" />
-            <field type="glx:WINDOW" name="glx_window" />
-        </union>
+        <xidunion name="DRAWABLE">
+            <type>xproto:WINDOW</type>
+            <type>PBUFFER</type>
+            <type>glx:PIXMAP</type>
+            <type>glx:WINDOW</type>
+        </xidunion>
 
 	<typedef oldname="float" newname="FLOAT32" />
 	<typedef oldname="double" newname="FLOAT64" />
@@ -198,27 +200,27 @@ The patch that fixed this server bug in X.org CVS is here:
 
 	<!-- Enum for CopyContext: mask -->
 	<enum name="GC">
-		<item name="_GL_CURRENT_BIT"><value>0x00000001</value></item>
-		<item name="_GL_POINT_BIT"><value>0x00000002</value></item>
-		<item name="_GL_LINE_BIT"><value>0x00000004</value></item>
-		<item name="_GL_POLYGON_BIT"><value>0x00000008</value></item>
-		<item name="_GL_POLYGON_STIPPLE_BIT"><value>0x00000010</value></item>
-		<item name="_GL_PIXEL_MODE_BIT"><value>0x00000020</value></item>
-		<item name="_GL_LIGHTING_BIT"><value>0x00000040</value></item>
-		<item name="_GL_FOG_BIT"><value>0x00000080</value></item>
-		<item name="_GL_DEPTH_BUFFER_BIT"><value>0x00000100</value></item>
-		<item name="_GL_ACCUM_BUFFER_BIT"><value>0x00000200</value></item>
-		<item name="_GL_STENCIL_BUFFER_BIT"><value>0x00000400</value></item>
-		<item name="_GL_VIEWPORT_BIT"><value>0x00000800</value></item>
-		<item name="_GL_TRANSFORM_BIT"><value>0x00001000</value></item>
-		<item name="_GL_ENABLE_BIT"><value>0x00002000</value></item>
-		<item name="_GL_COLOR_BUFFER_BIT"><value>0x00004000</value></item>
-		<item name="_GL_HINT_BIT"><value>0x00008000</value></item>
-		<item name="_GL_EVAL_BIT"><value>0x00010000</value></item>
-		<item name="_GL_LIST_BIT"><value>0x00020000</value></item>
-		<item name="_GL_TEXTURE_BIT"><value>0x00040000</value></item>
-		<item name="_GL_SCISSOR_BIT"><value>0x00080000</value></item>
-		<item name="_GL_ALL_ATTRIB_BITS"><value>0x000ffffff</value></item>
+		<item name="GL_CURRENT_BIT"><value>0x00000001</value></item>
+		<item name="GL_POINT_BIT"><value>0x00000002</value></item>
+		<item name="GL_LINE_BIT"><value>0x00000004</value></item>
+		<item name="GL_POLYGON_BIT"><value>0x00000008</value></item>
+		<item name="GL_POLYGON_STIPPLE_BIT"><value>0x00000010</value></item>
+		<item name="GL_PIXEL_MODE_BIT"><value>0x00000020</value></item>
+		<item name="GL_LIGHTING_BIT"><value>0x00000040</value></item>
+		<item name="GL_FOG_BIT"><value>0x00000080</value></item>
+		<item name="GL_DEPTH_BUFFER_BIT"><value>0x00000100</value></item>
+		<item name="GL_ACCUM_BUFFER_BIT"><value>0x00000200</value></item>
+		<item name="GL_STENCIL_BUFFER_BIT"><value>0x00000400</value></item>
+		<item name="GL_VIEWPORT_BIT"><value>0x00000800</value></item>
+		<item name="GL_TRANSFORM_BIT"><value>0x00001000</value></item>
+		<item name="GL_ENABLE_BIT"><value>0x00002000</value></item>
+		<item name="GL_COLOR_BUFFER_BIT"><value>0x00004000</value></item>
+		<item name="GL_HINT_BIT"><value>0x00008000</value></item>
+		<item name="GL_EVAL_BIT"><value>0x00010000</value></item>
+		<item name="GL_LIST_BIT"><value>0x00020000</value></item>
+		<item name="GL_TEXTURE_BIT"><value>0x00040000</value></item>
+		<item name="GL_SCISSOR_BIT"><value>0x00080000</value></item>
+		<item name="GL_ALL_ATTRIB_BITS"><value>0x000ffffff</value></item>
 	</enum>
 
 	<request name="SwapBuffers" opcode="11">
@@ -237,7 +239,7 @@ 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="xproto:PIXMAP" name="pixmap" />
 		<field type="glx:PIXMAP" name="glx_pixmap" />
 	</request>
 
@@ -247,11 +249,9 @@ The patch that fixed this server bug in X.org CVS is here:
 		<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>
 
@@ -325,17 +325,20 @@ 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="xproto:PIXMAP" name="pixmap" />
 		<field type="glx:PIXMAP" name="glx_pixmap" />
 		<field type="CARD32" name="num_attribs" />  
 	</request>
@@ -416,7 +419,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"
@@ -490,9 +493,9 @@ The patch that fixed this server bug in X.org CVS is here:
 	</request>
 
 	<enum name="RM">
-		<item name="_GL_RENDER"><value>0x1C00</value></item>
-		<item name="_GL_FEEDBACK"><value>0x1C01</value></item>
-		<item name="_GL_SELECT"><value>0x1C02</value></item>
+		<item name="GL_RENDER"><value>0x1C00</value></item>
+		<item name="GL_FEEDBACK"><value>0x1C01</value></item>
+		<item name="GL_SELECT"><value>0x1C02</value></item>
 	</enum>
 
 	<request name="Finish" opcode="108">