made changes to support new value-mask-pad field of valueparam structures

[free-sw/xcb/proto] / src / glx.xml

diff --git a/src/glx.xml b/src/glx.xml
index 4f4a822..0f09b28 100644 (file)
--- a/src/glx.xml
+++ b/src/glx.xml
@@ -92,6 +92,7 @@ The patch that fixed this server bug in X.org CVS is here:
 
        <!-- Events -->
        <event name="PbufferClobber" number="0">
+               <pad bytes="1" />
                <field type="CARD16" name="event_type" />
                <field type="CARD16" name="draw_type" />
                <field type="glx:DRAWABLE" name="drawable" />
@@ -201,26 +202,26 @@ 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_CURRENT_BIT"><bit>0</bit></item>
+               <item name="GL_POINT_BIT"><bit>1</bit></item>
+               <item name="GL_LINE_BIT"><bit>2</bit></item>
+               <item name="GL_POLYGON_BIT"><bit>3</bit></item>
+               <item name="GL_POLYGON_STIPPLE_BIT"><bit>4</bit></item>
+               <item name="GL_PIXEL_MODE_BIT"><bit>5</bit></item>
+               <item name="GL_LIGHTING_BIT"><bit>6</bit></item>
+               <item name="GL_FOG_BIT"><bit>7</bit></item>
+               <item name="GL_DEPTH_BUFFER_BIT"><bit>8</bit></item>
+               <item name="GL_ACCUM_BUFFER_BIT"><bit>9</bit></item>
+               <item name="GL_STENCIL_BUFFER_BIT"><bit>10</bit></item>
+               <item name="GL_VIEWPORT_BIT"><bit>11</bit></item>
+               <item name="GL_TRANSFORM_BIT"><bit>12</bit></item>
+               <item name="GL_ENABLE_BIT"><bit>13</bit></item>
+               <item name="GL_COLOR_BUFFER_BIT"><bit>14</bit></item>
+               <item name="GL_HINT_BIT"><bit>15</bit></item>
+               <item name="GL_EVAL_BIT"><bit>16</bit></item>
+               <item name="GL_LIST_BIT"><bit>17</bit></item>
+               <item name="GL_TEXTURE_BIT"><bit>18</bit></item>
+               <item name="GL_SCISSOR_BIT"><bit>19</bit></item>
                <item name="GL_ALL_ATTRIB_BITS"><value>0x000ffffff</value></item>
        </enum>
 
@@ -252,7 +253,9 @@ The patch that fixed this server bug in X.org CVS is here:
                        <field type="CARD32" name="num_visuals" />
                        <field type="CARD32" name="num_properties" />
                         <pad bytes="16" />
-                        <list type="CARD32" name="property_list" />
+                       <list type="CARD32" name="property_list">
+                               <fieldref>length</fieldref>
+                       </list>
                </reply>
        </request>
 
@@ -281,7 +284,12 @@ The patch that fixed this server bug in X.org CVS is here:
                        <list type="BYTE" name="data1">
                                <value>24</value>
                        </list>
-                       <list type="BYTE" name="data2" />
+                       <list type="BYTE" name="data2">
+                               <op op="*">
+                                       <fieldref>length</fieldref>
+                                       <value>4</value>
+                               </op>
+                       </list>
                </reply>
        </request>
 
@@ -332,7 +340,9 @@ The patch that fixed this server bug in X.org CVS is here:
                                value-mask-name="value_mask"
                                 value-list-name="value_list" />
                             -->
-                        <list type="CARD32" name="property_list" />
+                        <list type="CARD32" name="property_list">
+                               <fieldref>length</fieldref>
+                       </list>
                </reply>
        </request>
 
@@ -342,6 +352,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">
@@ -351,7 +367,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" />
@@ -363,11 +379,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>
 
@@ -384,13 +403,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">
@@ -403,29 +425,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">
@@ -531,7 +562,12 @@ The patch that fixed this server bug in X.org CVS is here:
                <reply>
                        <pad bytes="1" />
                        <pad bytes="24" />
-                       <list type="BYTE" name="data" />
+                       <list type="BYTE" name="data">
+                               <op op="*">
+                                       <fieldref>length</fieldref>
+                                       <value>4</value>
+                               </op>
+                       </list>
                </reply>
        </request>
                
@@ -562,7 +598,12 @@ The patch that fixed this server bug in X.org CVS is here:
                <reply>
                        <pad bytes="1" />
                        <pad bytes="24" />
-                       <list type="FLOAT64" name="data" />
+                       <list type="FLOAT64" name="data">
+                               <op op="/">
+                                       <fieldref>length</fieldref>
+                                       <value>2</value>
+                               </op>
+                       </list>
                </reply>
        </request>
 
@@ -782,7 +823,12 @@ The patch that fixed this server bug in X.org CVS is here:
                <reply>
                        <pad bytes="1" />
                        <pad bytes="24" />
-                       <list type="BYTE" name="data" />
+                       <list type="BYTE" name="data">
+                               <op op="*">
+                                       <fieldref>length</fieldref>
+                                       <value>4</value>
+                               </op>
+                       </list>
                </reply>
        </request>
 
@@ -895,7 +941,12 @@ The patch that fixed this server bug in X.org CVS is here:
                        <field type="INT32" name="height" />
                        <field type="INT32" name="depth" />
                        <pad bytes="4" />
-                       <list type="BYTE" name="data" />
+                       <list type="BYTE" name="data">
+                               <op op="*">
+                                       <fieldref>length</fieldref>
+                                       <value>4</value>
+                               </op>
+                       </list>
                </reply>
        </request>
            
@@ -989,7 +1040,12 @@ The patch that fixed this server bug in X.org CVS is here:
                        <pad bytes="1" />
                        <field type="BOOL32" name="ret_val" />
                        <pad bytes="20" />
-                       <list type="BOOL" name="data" />
+                       <list type="BOOL" name="data">
+                               <op op="*">
+                                       <fieldref>length</fieldref>
+                                       <value>4</value>
+                               </op>
+                       </list>
                </reply>
        </request>
 
@@ -1007,7 +1063,9 @@ The patch that fixed this server bug in X.org CVS is here:
                <reply>
                        <pad bytes="1" />
                        <pad bytes="24" />
-                       <list type="CARD32" name="data" />
+                       <list type="CARD32" name="data">
+                               <fieldref>length</fieldref>
+                       </list>
                </reply>
        </request>
 
@@ -1031,7 +1089,12 @@ The patch that fixed this server bug in X.org CVS is here:
                        <pad bytes="8" />
                        <field type="INT32" name="width" />
                        <pad bytes="12" />
-                       <list type="BYTE" name="data" />
+                       <list type="BYTE" name="data">
+                               <op op="*">
+                                       <fieldref>length</fieldref>
+                                       <value>4</value>
+                               </op>
+                       </list>
                </reply>
        </request>
        
@@ -1079,7 +1142,12 @@ The patch that fixed this server bug in X.org CVS is here:
                        <field type="INT32" name="width" />
                        <field type="INT32" name="height" />
                        <pad bytes="8" />
-                       <list type="BYTE" name="data" />
+                       <list type="BYTE" name="data">
+                               <op op="*">
+                                       <fieldref>length</fieldref>
+                                       <value>4</value>
+                               </op>
+                       </list>
                </reply>
        </request>
 
@@ -1128,7 +1196,12 @@ The patch that fixed this server bug in X.org CVS is here:
                        <field type="INT32" name="row_w" />
                        <field type="INT32" name="col_h" />
                        <pad bytes="8" />
-                       <list type="BYTE" name="rows_and_cols" />
+                       <list type="BYTE" name="rows_and_cols">
+                               <op op="*">
+                                       <fieldref>length</fieldref>
+                                       <value>4</value>
+                               </op>
+                       </list>
                </reply>
        </request>
 
@@ -1144,7 +1217,12 @@ The patch that fixed this server bug in X.org CVS is here:
                        <pad bytes="8" />
                        <field type="INT32" name="width" />
                        <pad bytes="12" />
-                       <list type="BYTE" name="data" />
+                       <list type="BYTE" name="data">
+                               <op op="*">
+                                       <fieldref>length</fieldref>
+                                       <value>4</value>
+                               </op>
+                       </list>
                </reply>
        </request>
 
@@ -1191,7 +1269,12 @@ The patch that fixed this server bug in X.org CVS is here:
                <reply>
                        <pad bytes="1" />
                        <pad bytes="24" />
-                       <list type="BYTE" name="data" />
+                       <list type="BYTE" name="data">
+                               <op op="*">
+                                       <fieldref>length</fieldref>
+                                       <value>4</value>
+                               </op>
+                       </list>
                </reply>
        </request>
 
@@ -1247,7 +1330,12 @@ The patch that fixed this server bug in X.org CVS is here:
                        <pad bytes="8" />
                        <field type="INT32" name="size" />
                        <pad bytes="12" />
-                       <list type="BYTE" name="data" />
+                       <list type="BYTE" name="data">
+                               <op op="*">
+                                       <fieldref>length</fieldref>
+                                       <value>4</value>
+                               </op>
+                       </list>
                </reply>
        </request>
 
@@ -1271,7 +1359,9 @@ The patch that fixed this server bug in X.org CVS is here:
                <reply>
                        <pad bytes="1" />
                        <pad bytes="24" />
-                       <list type="CARD32" name="data" />
+                       <list type="CARD32" name="data">
+                               <fieldref>length</fieldref>
+                       </list>
                </reply>
        </request>