Oops. keithp told me to forget about videmode.

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

diff --git a/src/extensions/glx.xml b/src/extensions/glx.xml
index ba5c253..5f8b5e6 100644 (file)
--- 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="xproto: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" />