XCBButton -> XCBButtonIndex. XCBHost -> XCBHostMode. XCBSetupReq -> XCBSetupRequest

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

diff --git a/src/extensions/glx.xml b/src/extensions/glx.xml
index a40ecb2..2e22c77 100644 (file)
--- 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,7 +237,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 +247,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 +323,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 +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"