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

diff --git a/src/extensions/glx.xml b/src/extensions/glx.xml
index 0acab27..5f8b5e6 100644
--- a/src/extensions/glx.xml
+++ b/src/extensions/glx.xml
@@ -47,16 +47,25 @@ 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" />
-	<xidtype name="DRAWABLE" />
+        <xidtype name="FBCONFIG" />
+
+        <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" />
-	<typedef oldname="CARD32" newname="BOOL32" />
+        <typedef oldname="CARD32" newname="BOOL32" />
+        <typedef oldname="CARD32" newname="CONTEXT_TAG" />
 	    
 	<!-- Errors -->
 	<error name="Generic" number="-1"> <!-- FIXME: fake number -->
@@ -116,12 +125,12 @@ The patch that fixed this server bug in X.org CVS is here:
 
 	<!-- Requests -->
 	<request name="Render" opcode="1" combine-adjacent="true">
-		<field type="CARD32" name="context_tag" />
+		<field type="CONTEXT_TAG" name="context_tag" />
 		<list type="BYTE" name="data" />
 	</request>
 
 	<request name="RenderLarge" opcode="2">
-		<field type="CARD32" name="context_tag" />
+		<field type="CONTEXT_TAG" name="context_tag" />
 		<field type="CARD16" name="request_num" />
 		<field type="CARD16" name="request_total" />
 		<field type="CARD32" name="data_len" />
@@ -134,7 +143,7 @@ The patch that fixed this server bug in X.org CVS is here:
 		<field type="glx:CONTEXT" name="context" />
 		<field type="VISUALID" name="visual" />
 		<field type="CARD32" name="screen" />
-		<field type="CARD32" name="share_list" />
+		<field type="glx:CONTEXT" name="share_list" />
 		<field type="BOOL" name="is_direct" />
 		<pad bytes="3" />
 	</request>
@@ -146,10 +155,10 @@ The patch that fixed this server bug in X.org CVS is here:
 	<request name="MakeCurrent" opcode="5">
 		<field type="glx:DRAWABLE" name="drawable" />
 		<field type="glx:CONTEXT" name="context" />
-		<field type="CARD32" name="old_context_tag" />
+		<field type="CONTEXT_TAG" name="old_context_tag" />
 		<reply>
 			<pad bytes="1" />
-			<field type="CARD32" name="context_tag" />
+			<field type="CONTEXT_TAG" name="context_tag" />
 			<pad bytes="20" />
 		</reply>
 	</request>
@@ -175,52 +184,52 @@ The patch that fixed this server bug in X.org CVS is here:
 	</request>
 
 	<request name="WaitGL" opcode="8">
-		<field type="CARD32" name="context_tag" />
+		<field type="CONTEXT_TAG" name="context_tag" />
 	</request>
 
 	<request name="WaitX" opcode="9">
-		<field type="CARD32" name="context_tag" />
+		<field type="CONTEXT_TAG" name="context_tag" />
 	</request>
 
 	<request name="CopyContext" opcode="10">
 		<field type="glx:CONTEXT" name="src" />
 		<field type="glx:CONTEXT" name="dest" />
 		<field type="CARD32" name="mask" />
-		<field type="CARD32" name="src_context_tag" />
+		<field type="CONTEXT_TAG" name="src_context_tag" />
 	</request>
 
 	<!-- 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">
-		<field type="CARD32" name="context_tag" />
+		<field type="CONTEXT_TAG" name="context_tag" />
 		<field type="glx:DRAWABLE" name="drawable" />
 	</request>
 
 	<request name="UseXFont" opcode="12">
-		<field type="CARD32" name="context_tag" />
+		<field type="CONTEXT_TAG" name="context_tag" />
 		<field type="FONT" name="font" />
 		<field type="CARD32" name="first" />
 		<field type="CARD32" name="count" />
@@ -230,25 +239,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>
 
 	<!--
@@ -258,13 +266,13 @@ The patch that fixed this server bug in X.org CVS is here:
 	-->
 	<request name="VendorPrivate" opcode="16">
 		<field type="CARD32" name="vendor_code" />
-		<field type="CARD32" name="context_tag" />
+		<field type="CONTEXT_TAG" name="context_tag" />
 		<list type="BYTE" name="data" />
 	</request>
 
 	<request name="VendorPrivateWithReply" opcode="17">
 		<field type="CARD32" name="vendor_code" />
-		<field type="CARD32" name="context_tag" />
+		<field type="CONTEXT_TAG" name="context_tag" />
 		<list type="BYTE" name="data" />
 		<reply>
 			<pad bytes="1" />
@@ -317,23 +325,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">
@@ -360,13 +371,13 @@ The patch that fixed this server bug in X.org CVS is here:
 	</request>
 
 	<request name="MakeContextCurrent" opcode="26">
-		<field type="CARD32" name="old_context_tag" />
+		<field type="CONTEXT_TAG" name="old_context_tag" />
 		<field type="glx:DRAWABLE" name="drawable" />
 		<field type="glx:DRAWABLE" name="read_drawable" />
 		<field type="glx:CONTEXT" name="context" />
 		<reply>
 			<pad bytes="1" />
-			<field type="CARD32" name="context_tag" />
+			<field type="CONTEXT_TAG" name="context_tag" />
 			<pad bytes="20" />
 		</reply>
 	</request>
@@ -408,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"
@@ -423,23 +434,23 @@ The patch that fixed this server bug in X.org CVS is here:
 	<!-- Requests for GL Non-rendering Commands (single ops) -->
 
 	<request name="NewList" opcode="101">
-		<field type="CARD32" name="context_tag" />
+		<field type="CONTEXT_TAG" name="context_tag" />
 		<field type="CARD32" name="list" />
 		<field type="CARD32" name="mode" />
 	</request>
 
 	<request name="EndList" opcode="102">
-		<field type="CARD32" name="context_tag" />
+		<field type="CONTEXT_TAG" name="context_tag" />
 	</request>
 
 	<request name="DeleteLists" opcode="103">
-		<field type="CARD32" name="context_tag" />
+		<field type="CONTEXT_TAG" name="context_tag" />
 		<field type="CARD32" name="list" />
 		<field type="INT32" name="range" />
 	</request>
 
 	<request name="GenLists" opcode="104">
-		<field type="CARD32" name="context_tag" />
+		<field type="CONTEXT_TAG" name="context_tag" />
 		<field type="INT32" name="range" />
 		<reply>
 			<pad bytes="1" />
@@ -448,13 +459,13 @@ The patch that fixed this server bug in X.org CVS is here:
 	</request>
 
 	<request name="FeedbackBuffer" opcode="105">
-		<field type="CARD32" name="context_tag" />
+		<field type="CONTEXT_TAG" name="context_tag" />
 		<field type="INT32" name="size" />
 		<field type="INT32" name="type" />
 	</request>
 
 	<request name="SelectBuffer" opcode="106">
-		<field type="CARD32" name="context_tag" />
+		<field type="CONTEXT_TAG" name="context_tag" />
 		<field type="INT32" name="size" />
 		<!-- the reply is actually returned in the data
 		of the next RenderMode request -->
@@ -462,7 +473,7 @@ The patch that fixed this server bug in X.org CVS is here:
 
 
 	<request name="RenderMode" opcode="107">
-		<field type="CARD32" name="context_tag" />
+		<field type="CONTEXT_TAG" name="context_tag" />
 		<field type="CARD32" name="mode" />
 		<!--
 		This reply is only if RM was previously feedback/selection.
@@ -482,32 +493,32 @@ 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">
-		<field type="CARD32" name="context_tag" />
+		<field type="CONTEXT_TAG" name="context_tag" />
 		<reply>
 			<pad bytes="1" />
 		</reply>
 	</request>
 
 	<request name="PixelStoref" opcode="109">
-		<field type="CARD32" name="context_tag" />
+		<field type="CONTEXT_TAG" name="context_tag" />
 		<field type="CARD32" name="pname" />
 		<field type="FLOAT32" name="datum" />
 	</request>
 
 	<request name="PixelStorei" opcode="110">
-		<field type="CARD32" name="context_tag" />
+		<field type="CONTEXT_TAG" name="context_tag" />
 		<field type="CARD32" name="pname" />
 		<field type="INT32" name="datum" />
 	</request>
 
 	<request name="ReadPixels" opcode="111">
-		<field type="CARD32" name="context_tag" />
+		<field type="CONTEXT_TAG" name="context_tag" />
 		<field type="INT32" name="x" />
 		<field type="INT32" name="y" />
 		<field type="INT32" name="width" />
@@ -530,7 +541,7 @@ The patch that fixed this server bug in X.org CVS is here:
 	Starts on page 58/180
 	-->
 	<request name="GetBooleanv" opcode="112">
-		<field type="CARD32" name="context_tag" />
+		<field type="CONTEXT_TAG" name="context_tag" />
 		<field type="INT32" name="pname" />
 		<reply>
 			<pad bytes="1" />
@@ -545,7 +556,7 @@ The patch that fixed this server bug in X.org CVS is here:
 	</request>
 
 	<request name="GetClipPlane" opcode="113">
-		<field type="CARD32" name="context_tag" />
+		<field type="CONTEXT_TAG" name="context_tag" />
 		<field type="INT32" name="plane" />
 		<reply>
 			<pad bytes="1" />
@@ -555,7 +566,7 @@ The patch that fixed this server bug in X.org CVS is here:
 	</request>
 
 	<request name="GetDoublev" opcode="114">
-		<field type="CARD32" name="context_tag" />
+		<field type="CONTEXT_TAG" name="context_tag" />
 		<field type="CARD32" name="pname" />
 		<reply>
 			<pad bytes="1" />
@@ -570,7 +581,7 @@ The patch that fixed this server bug in X.org CVS is here:
 	</request>
 
 	<request name="GetError" opcode="115">
-		<field type="CARD32" name="context_tag" />
+		<field type="CONTEXT_TAG" name="context_tag" />
 		<reply>
 			<pad bytes="1" />
 			<field type="INT32" name="error" />
@@ -578,7 +589,7 @@ The patch that fixed this server bug in X.org CVS is here:
 	</request>
 
 	<request name="GetFloatv" opcode="116">
-		<field type="CARD32" name="context_tag" />
+		<field type="CONTEXT_TAG" name="context_tag" />
 		<field type="CARD32" name="pname" />
 		<reply>
 			<pad bytes="1" />
@@ -593,7 +604,7 @@ The patch that fixed this server bug in X.org CVS is here:
 	</request>
 
 	<request name="GetIntegerv" opcode="117">
-		<field type="CARD32" name="context_tag" />
+		<field type="CONTEXT_TAG" name="context_tag" />
 		<field type="CARD32" name="pname" />
 		<reply>
 			<pad bytes="1" />
@@ -608,7 +619,7 @@ The patch that fixed this server bug in X.org CVS is here:
 	</request>
 
 	<request name="GetLightfv" opcode="118">
-		<field type="CARD32" name="context_tag" />
+		<field type="CONTEXT_TAG" name="context_tag" />
 		<field type="CARD32" name="light" />
 		<field type="CARD32" name="pname" />
 		<reply>
@@ -624,7 +635,7 @@ The patch that fixed this server bug in X.org CVS is here:
 	</request>
 
 	<request name="GetLightiv" opcode="119">
-		<field type="CARD32" name="context_tag" />
+		<field type="CONTEXT_TAG" name="context_tag" />
 		<field type="CARD32" name="light" />
 		<field type="CARD32" name="pname" />
 		<reply>
@@ -640,7 +651,7 @@ The patch that fixed this server bug in X.org CVS is here:
 	</request>
 
 	<request name="GetMapdv" opcode="120">
-		<field type="CARD32" name="context_tag" />
+		<field type="CONTEXT_TAG" name="context_tag" />
 		<field type="CARD32" name="target" />
 		<field type="CARD32" name="query" />
 		<reply>
@@ -656,7 +667,7 @@ The patch that fixed this server bug in X.org CVS is here:
 	</request>
 
 	<request name="GetMapfv" opcode="121">
-		<field type="CARD32" name="context_tag" />
+		<field type="CONTEXT_TAG" name="context_tag" />
 		<field type="CARD32" name="target" />
 		<field type="CARD32" name="query" />
 		<reply>
@@ -672,7 +683,7 @@ The patch that fixed this server bug in X.org CVS is here:
 	</request>
 
 	<request name="GetMapiv" opcode="122">
-		<field type="CARD32" name="context_tag" />
+		<field type="CONTEXT_TAG" name="context_tag" />
 		<field type="CARD32" name="target" />
 		<field type="CARD32" name="query" />
 		<reply>
@@ -688,7 +699,7 @@ The patch that fixed this server bug in X.org CVS is here:
 	</request>
 
 	<request name="GetMaterialfv" opcode="123">
-		<field type="CARD32" name="context_tag" />
+		<field type="CONTEXT_TAG" name="context_tag" />
 		<field type="CARD32" name="face" />
 		<field type="CARD32" name="pname" />
 		<reply>
@@ -704,7 +715,7 @@ The patch that fixed this server bug in X.org CVS is here:
 	</request>
 
 	<request name="GetMaterialiv" opcode="124">
-		<field type="CARD32" name="context_tag" />
+		<field type="CONTEXT_TAG" name="context_tag" />
 		<field type="CARD32" name="face" />
 		<field type="CARD32" name="pname" />
 		<reply>
@@ -720,7 +731,7 @@ The patch that fixed this server bug in X.org CVS is here:
 	</request>
 
 	<request name="GetPixelMapfv" opcode="125">
-		<field type="CARD32" name="context_tag" />
+		<field type="CONTEXT_TAG" name="context_tag" />
 		<field type="CARD32" name="map" />
 		<reply>
 			<pad bytes="1" />
@@ -735,7 +746,7 @@ The patch that fixed this server bug in X.org CVS is here:
 	</request>
 
 	<request name="GetPixelMapuiv" opcode="126">
-		<field type="CARD32" name="context_tag" />
+		<field type="CONTEXT_TAG" name="context_tag" />
 		<field type="CARD32" name="map" />
 		<reply>
 			<pad bytes="1" />
@@ -750,7 +761,7 @@ The patch that fixed this server bug in X.org CVS is here:
 	</request>
 
 	<request name="GetPixelMapusv" opcode="127">
-		<field type="CARD32" name="context_tag" />
+		<field type="CONTEXT_TAG" name="context_tag" />
 		<field type="CARD32" name="map" />
 		<reply>
 			<pad bytes="1" />
@@ -765,7 +776,7 @@ The patch that fixed this server bug in X.org CVS is here:
 	</request>
 
 	<request name="GetPolygonStipple" opcode="128">
-		<field type="CARD32" name="context_tag" />
+		<field type="CONTEXT_TAG" name="context_tag" />
 		<field type="BOOL" name="lsb_first" />
 		<reply>
 			<pad bytes="1" />
@@ -776,7 +787,7 @@ The patch that fixed this server bug in X.org CVS is here:
 
 
 	<request name="GetString" opcode="129">
-		<field type="CARD32" name="context_tag" />
+		<field type="CONTEXT_TAG" name="context_tag" />
 		<field type="CARD32" name="name" />
 		<reply>
 			<pad bytes="1" />
@@ -790,7 +801,7 @@ The patch that fixed this server bug in X.org CVS is here:
 	</request>
 
 	<request name="GetTexEnvfv" opcode="130">
-		<field type="CARD32" name="context_tag" />
+		<field type="CONTEXT_TAG" name="context_tag" />
 		<field type="CARD32" name="target" />
 		<field type="CARD32" name="pname" />
 		<reply>
@@ -806,7 +817,7 @@ The patch that fixed this server bug in X.org CVS is here:
 	</request>
 
 	<request name="GetTexEnviv" opcode="131">
-		<field type="CARD32" name="context_tag" />
+		<field type="CONTEXT_TAG" name="context_tag" />
 		<field type="CARD32" name="target" />
 		<field type="CARD32" name="pname" />
 		<reply>
@@ -822,7 +833,7 @@ The patch that fixed this server bug in X.org CVS is here:
 	</request>
 
 	<request name="GetTexGendv" opcode="132">
-		<field type="CARD32" name="context_tag" />
+		<field type="CONTEXT_TAG" name="context_tag" />
 		<field type="CARD32" name="coord" />
 		<field type="CARD32" name="pname" />
 		<reply>
@@ -838,7 +849,7 @@ The patch that fixed this server bug in X.org CVS is here:
 	</request>
 
 	<request name="GetTexGenfv" opcode="133">
-		<field type="CARD32" name="context_tag" />
+		<field type="CONTEXT_TAG" name="context_tag" />
 		<field type="CARD32" name="coord" />
 		<field type="CARD32" name="pname" />
 		<reply>
@@ -854,7 +865,7 @@ The patch that fixed this server bug in X.org CVS is here:
 	</request>
 
 	<request name="GetTexGeniv" opcode="134">
-		<field type="CARD32" name="context_tag" />
+		<field type="CONTEXT_TAG" name="context_tag" />
 		<field type="CARD32" name="coord" />
 		<field type="CARD32" name="pname" />
 		<reply>
@@ -870,7 +881,7 @@ The patch that fixed this server bug in X.org CVS is here:
 	</request>
 
 	<request name="GetTexImage" opcode="135">
-		<field type="CARD32" name="context_tag" />
+		<field type="CONTEXT_TAG" name="context_tag" />
 		<field type="CARD32" name="target" />
 		<field type="INT32" name="level" />
 		<field type="CARD32" name="format" />
@@ -889,7 +900,7 @@ The patch that fixed this server bug in X.org CVS is here:
 	    
 
 	<request name="GetTexParameterfv" opcode="136">
-		<field type="CARD32" name="context_tag" />
+		<field type="CONTEXT_TAG" name="context_tag" />
 		<field type="CARD32" name="target" />
 		<field type="CARD32" name="pname" />
 		<reply>
@@ -905,7 +916,7 @@ The patch that fixed this server bug in X.org CVS is here:
 	</request>
 
 	<request name="GetTexParameteriv" opcode="137">
-		<field type="CARD32" name="context_tag" />
+		<field type="CONTEXT_TAG" name="context_tag" />
 		<field type="CARD32" name="target" />
 		<field type="CARD32" name="pname" />
 		<reply>
@@ -921,7 +932,7 @@ The patch that fixed this server bug in X.org CVS is here:
 	</request>
 
 	<request name="GetTexLevelParameterfv" opcode="138">
-		<field type="CARD32" name="context_tag" />
+		<field type="CONTEXT_TAG" name="context_tag" />
 		<field type="CARD32" name="target" />
 		<field type="INT32" name="level" />
 		<field type="CARD32" name="pname" />
@@ -938,7 +949,7 @@ The patch that fixed this server bug in X.org CVS is here:
 	</request>
 
 	<request name="GetTexLevelParameteriv" opcode="139">
-		<field type="CARD32" name="context_tag" />
+		<field type="CONTEXT_TAG" name="context_tag" />
 		<field type="CARD32" name="target" />
 		<field type="INT32" name="level" />
 		<field type="CARD32" name="pname" />
@@ -955,7 +966,7 @@ The patch that fixed this server bug in X.org CVS is here:
 	</request>
 
 	<request name="IsList" opcode="141" >
-		<field type="CARD32" name="context_tag" />
+		<field type="CONTEXT_TAG" name="context_tag" />
 		<field type="CARD32" name="list" />
 		<reply>
 			<pad bytes="1" />
@@ -964,11 +975,11 @@ The patch that fixed this server bug in X.org CVS is here:
 	</request>
 
 	<request name="Flush" opcode="142">
-		<field type="CARD32" name="context_tag" />
+		<field type="CONTEXT_TAG" name="context_tag" />
 	</request>
 
 	<request name="AreTexturesResident" opcode="143">
-		<field type="CARD32" name="context_tag" />
+		<field type="CONTEXT_TAG" name="context_tag" />
 		<field type="INT32" name="n" />
 		<list type="CARD32" name="textures">
 		    <fieldref>n</fieldref>
@@ -982,7 +993,7 @@ The patch that fixed this server bug in X.org CVS is here:
 	</request>
 
 	<request name="DeleteTextures" opcode="144">
-		<field type="CARD32" name="context_tag" />
+		<field type="CONTEXT_TAG" name="context_tag" />
 		<field type="INT32" name="n" />
 		<list type="CARD32" name="textures">
 			<fieldref>n</fieldref>
@@ -990,7 +1001,7 @@ The patch that fixed this server bug in X.org CVS is here:
 	</request>
 
 	<request name="GenTextures" opcode="145">
-		<field type="CARD32" name="context_tag" />
+		<field type="CONTEXT_TAG" name="context_tag" />
 		<field type="INT32" name="n" />
 		<reply>
 			<pad bytes="1" />
@@ -1000,7 +1011,7 @@ The patch that fixed this server bug in X.org CVS is here:
 	</request>
 
 	<request name="IsTexture" opcode="146">
-		<field type="CARD32" name="context_tag" />
+		<field type="CONTEXT_TAG" name="context_tag" />
 		<field type="CARD32" name="texture" />
 		<reply>
 			<pad bytes="1" />
@@ -1009,7 +1020,7 @@ The patch that fixed this server bug in X.org CVS is here:
 	</request>
 
 	<request name="GetColorTable" opcode="147">
-		<field type="CARD32" name="context_tag" />
+		<field type="CONTEXT_TAG" name="context_tag" />
 		<field type="CARD32" name="target" />
 		<field type="CARD32" name="format" />
 		<field type="CARD32" name="type" />
@@ -1024,7 +1035,7 @@ The patch that fixed this server bug in X.org CVS is here:
 	</request>
 	
 	<request name="GetColorTableParameterfv" opcode="148">
-		<field type="CARD32" name="context_tag" />
+		<field type="CONTEXT_TAG" name="context_tag" />
 		<field type="CARD32" name="target" />
 		<field type="CARD32" name="pname" />
 		<reply>
@@ -1040,7 +1051,7 @@ The patch that fixed this server bug in X.org CVS is here:
 	</request>
 
 	<request name="GetColorTableParameteriv" opcode="149">
-		<field type="CARD32" name="context_tag" />
+		<field type="CONTEXT_TAG" name="context_tag" />
 		<field type="CARD32" name="target" />
 		<field type="CARD32" name="pname" />
 		<reply>
@@ -1056,7 +1067,7 @@ The patch that fixed this server bug in X.org CVS is here:
 	</request>
 
 	<request name="GetConvolutionFilter" opcode="150">
-		<field type="CARD32" name="context_tag" />
+		<field type="CONTEXT_TAG" name="context_tag" />
 		<field type="CARD32" name="target" />
 		<field type="CARD32" name="format" />
 		<field type="CARD32" name="type" />
@@ -1073,7 +1084,7 @@ The patch that fixed this server bug in X.org CVS is here:
 
 
 	<request name="GetConvolutionParameterfv" opcode="151">
-		<field type="CARD32" name="context_tag" />
+		<field type="CONTEXT_TAG" name="context_tag" />
 		<field type="CARD32" name="target" />
 		<field type="CARD32" name="pname" />
 		<reply>
@@ -1089,7 +1100,7 @@ The patch that fixed this server bug in X.org CVS is here:
 	</request>
 
 	<request name="GetConvolutionParameteriv" opcode="152">
-		<field type="CARD32" name="context_tag" />
+		<field type="CONTEXT_TAG" name="context_tag" />
 		<field type="CARD32" name="target" />
 		<field type="CARD32" name="pname" />
 		<reply>
@@ -1105,7 +1116,7 @@ The patch that fixed this server bug in X.org CVS is here:
 	</request>
 
 	<request name="GetSeparableFilter" opcode="153">
-		<field type="CARD32" name="context_tag" />
+		<field type="CONTEXT_TAG" name="context_tag" />
 		<field type="CARD32" name="target" />
 		<field type="CARD32" name="format" />
 		<field type="CARD32" name="type" />
@@ -1121,7 +1132,7 @@ The patch that fixed this server bug in X.org CVS is here:
 	</request>
 
 	<request name="GetHistogram" opcode="154">
-		<field type="CARD32" name="context_tag" />
+		<field type="CONTEXT_TAG" name="context_tag" />
 		<field type="CARD32" name="target" />
 		<field type="CARD32" name="format" />
 		<field type="CARD32" name="type" />
@@ -1138,7 +1149,7 @@ The patch that fixed this server bug in X.org CVS is here:
 
 
 	<request name="GetHistogramParameterfv" opcode="155">
-		<field type="CARD32" name="context_tag" />
+		<field type="CONTEXT_TAG" name="context_tag" />
 		<field type="CARD32" name="target" />
 		<field type="CARD32" name="pname" />
 		<reply>
@@ -1154,7 +1165,7 @@ The patch that fixed this server bug in X.org CVS is here:
 	</request>
 
 	<request name="GetHistogramParameteriv" opcode="156">
-		<field type="CARD32" name="context_tag" />
+		<field type="CONTEXT_TAG" name="context_tag" />
 		<field type="CARD32" name="target" />
 		<field type="CARD32" name="pname" />
 		<reply>
@@ -1170,7 +1181,7 @@ The patch that fixed this server bug in X.org CVS is here:
 	</request>
 
 	<request name="GetMinmax" opcode="157">
-		<field type="CARD32" name="context_tag" />
+		<field type="CONTEXT_TAG" name="context_tag" />
 		<field type="CARD32" name="target" />
 		<field type="CARD32" name="format" />
 		<field type="CARD32" name="type" />
@@ -1184,7 +1195,7 @@ The patch that fixed this server bug in X.org CVS is here:
 	</request>
 
 	<request name="GetMinmaxParameterfv" opcode="158">
-		<field type="CARD32" name="context_tag" />
+		<field type="CONTEXT_TAG" name="context_tag" />
 		<field type="CARD32" name="target" />
 		<field type="CARD32" name="pname" />
 		<reply>
@@ -1200,7 +1211,7 @@ The patch that fixed this server bug in X.org CVS is here:
 	</request>
 
 	<request name="GetMinmaxParameteriv" opcode="159">
-		<field type="CARD32" name="context_tag" />
+		<field type="CONTEXT_TAG" name="context_tag" />
 		<field type="CARD32" name="target" />
 		<field type="CARD32" name="pname" />
 		<reply>
@@ -1227,7 +1238,7 @@ The patch that fixed this server bug in X.org CVS is here:
 	http://oss.sgi.com/projects/ogl-sample/registry/ARB/texture_compression.txt
 	-->
 	<request name="GetCompressedTexImageARB" opcode="160">
-		<field type="CARD32" name="context_tag" />
+		<field type="CONTEXT_TAG" name="context_tag" />
 		<field type="CARD32" name="target" />
 		<field type="INT32" name="level" />
 		<reply>
@@ -1246,7 +1257,7 @@ The patch that fixed this server bug in X.org CVS is here:
 	-->
 
 	<request name="DeleteQueriesARB" opcode="161">
-		<field type="CARD32" name="context_tag" />
+		<field type="CONTEXT_TAG" name="context_tag" />
 		<field type="INT32" name="n" />
 		<list type="CARD32" name="ids">
 			<fieldref>n</fieldref>
@@ -1254,7 +1265,7 @@ The patch that fixed this server bug in X.org CVS is here:
 	</request>
 
 	<request name="GenQueriesARB" opcode="162">
-		<field type="CARD32" name="context_tag" />
+		<field type="CONTEXT_TAG" name="context_tag" />
 		<field type="INT32" name="n" />
 		<reply>
 			<pad bytes="1" />
@@ -1264,7 +1275,7 @@ The patch that fixed this server bug in X.org CVS is here:
 	</request>
 	
 	<request name="IsQueryARB" opcode="163">
-		<field type="CARD32" name="context_tag" />
+		<field type="CONTEXT_TAG" name="context_tag" />
 		<field type="CARD32" name="id" />
 		<reply>
 			<pad bytes="1" />
@@ -1273,7 +1284,7 @@ The patch that fixed this server bug in X.org CVS is here:
 	</request>
 	
 	<request name="GetQueryivARB" opcode="164">
-		<field type="CARD32" name="context_tag" />
+		<field type="CONTEXT_TAG" name="context_tag" />
 		<field type="CARD32" name="target" />
 		<field type="CARD32" name="pname" />
 		<reply>
@@ -1289,7 +1300,7 @@ The patch that fixed this server bug in X.org CVS is here:
 	</request>
 	
 	<request name="GetQueryObjectivARB" opcode="165">
-		<field type="CARD32" name="context_tag" />
+		<field type="CONTEXT_TAG" name="context_tag" />
 		<field type="CARD32" name="id" />
 		<field type="CARD32" name="pname" />
 		<reply>
@@ -1305,7 +1316,7 @@ The patch that fixed this server bug in X.org CVS is here:
 	</request>
 	
 	<request name="GetQueryObjectuivARB" opcode="166">
-		<field type="CARD32" name="context_tag" />
+		<field type="CONTEXT_TAG" name="context_tag" />
 		<field type="CARD32" name="id" />
 		<field type="CARD32" name="pname" />
 		<reply>