projects / free-sw / xcb / proto / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Allow multiple <enumref> in a <bitcase>
[free-sw/xcb/proto] / src / glx.xml
diff --git a/src/glx.xml b/src/glx.xml
index 5fedb7b..53c9267 100644 (file)
--- a/src/glx.xml
+++ b/src/glx.xml
@@ -89,9 +89,11 @@ The patch that fixed this server bug in X.org CVS is here:
        <errorcopy name="BadPbuffer" number="10" ref="Generic" />
        <errorcopy name="BadCurrentDrawable" number="11" ref="Generic" />
        <errorcopy name="BadWindow" number="12" ref="Generic" />
+       <errorcopy name="GLXBadProfileARB" number="13" ref="Generic" />
 
        <!-- 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" />
@@ -108,19 +110,19 @@ The patch that fixed this server bug in X.org CVS is here:
        <!-- enums for PbufferClobber event/draw type -->
        <enum name="PBCET">
                <item name="Damaged">
-                       <value>0x8017</value>
+                       <value>32791</value>
                </item>
                <item name="Saved">
-                       <value>0x8018</value>
+                       <value>32792</value>
                </item>
        </enum>
 
        <enum name="PBCDT">
                <item name="Window">
-                       <value>0x8019</value>
+                       <value>32793</value>
                </item>
                <item name="Pbuffer">
-                       <value>0x801A</value>
+                       <value>32794</value>
                </item>
        </enum>
 
@@ -221,7 +223,7 @@ The patch that fixed this server bug in X.org CVS is here:
                <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>
+               <item name="GL_ALL_ATTRIB_BITS"><value>16777215<!--0x000ffffff--></value></item>
        </enum>
 
        <request name="SwapBuffers" opcode="11">
@@ -310,7 +312,7 @@ The patch that fixed this server bug in X.org CVS is here:
                        <pad bytes="4" />
                        <field type="CARD32" name="str_len" />
                        <pad bytes="16" />
-                       <list type="CARD8" name="string">
+                       <list type="char" name="string">
                                <fieldref>str_len</fieldref>
                        </list>
                </reply>
@@ -320,7 +322,7 @@ The patch that fixed this server bug in X.org CVS is here:
                <field type="CARD32" name="major_version" />
                <field type="CARD32" name="minor_version" />
                <field type="CARD32" name="str_len" />
-               <list type="CARD8" name="string">
+               <list type="char" name="string">
                        <fieldref>str_len</fieldref>
                </list>
        </request>
@@ -347,7 +349,7 @@ The patch that fixed this server bug in X.org CVS is here:
 
        <request name="CreatePixmap" opcode="22">
                <field type="CARD32" name="screen" />
-               <field type="CARD32" name="fbconfig" />
+               <field type="FBCONFIG" name="fbconfig" />
                <field type="xproto:PIXMAP" name="pixmap" />
                <field type="glx:PIXMAP" name="glx_pixmap" />
                <field type="CARD32" name="num_attribs" />  
@@ -365,13 +367,12 @@ 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="FBCONFIG" name="fbconfig" />
                <field type="CARD32" name="screen" />
                <field type="CARD32" name="render_type" />
-               <field type="CARD32" name="share_list" />
+               <field type="glx:CONTEXT" name="share_list" />
                <field type="BOOL" name="is_direct" />
-               <field type="CARD8" name="reserved1" />
-               <field type="CARD16" name="reserved2" />
+               <pad bytes="3" />
        </request>
 
        <request name="QueryContext" opcode="25">
@@ -462,6 +463,64 @@ The patch that fixed this server bug in X.org CVS is here:
                <field type="glx:WINDOW" name="glxwindow" />
        </request>
 
+       <!-- Start of GLX_ARB_create_context and GLX_ARB_create_context_profile
+             requests. -->
+       <request name="SetClientInfoARB" opcode="33">
+               <field type="CARD32" name="major_version" />
+               <field type="CARD32" name="minor_version" />
+               <field type="CARD32" name="num_versions" />
+               <field type="CARD32" name="gl_str_len" />
+               <field type="CARD32" name="glx_str_len" />
+               <list type="CARD32" name="gl_versions">
+                       <op op="*">
+                               <fieldref>num_versions</fieldref>
+                               <value>2</value>
+                       </op>
+               </list>
+               <list type="char" name="gl_extension_string">
+                       <fieldref>gl_str_len</fieldref>
+               </list>
+               <list type="char" name="glx_extension_string">
+                       <fieldref>glx_str_len</fieldref>
+               </list>
+       </request>
+
+       <request name="CreateContextAttribsARB" opcode="34">
+               <field type="glx:CONTEXT" name="context" />
+               <field type="FBCONFIG" name="fbconfig" />
+               <field type="CARD32" name="screen" />
+               <field type="glx:CONTEXT" name="share_list" />
+               <field type="BOOL" name="is_direct" />
+               <pad bytes="3" />
+               <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="SetClientInfo2ARB" opcode="35">
+               <field type="CARD32" name="major_version" />
+               <field type="CARD32" name="minor_version" />
+               <field type="CARD32" name="num_versions" />
+               <field type="CARD32" name="gl_str_len" />
+               <field type="CARD32" name="glx_str_len" />
+               <list type="CARD32" name="gl_versions">
+                       <op op="*">
+                               <fieldref>num_versions</fieldref>
+                               <value>3</value>
+                       </op>
+               </list>
+               <list type="char" name="gl_extension_string">
+                       <fieldref>gl_str_len</fieldref>
+               </list>
+               <list type="char" name="glx_extension_string">
+                       <fieldref>glx_str_len</fieldref>
+               </list>
+       </request>
+
        <!-- Requests for GL Non-rendering Commands (single ops) -->
 
        <request name="NewList" opcode="101">
@@ -524,9 +583,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>7168</value></item>
+               <item name="GL_FEEDBACK"><value>7169</value></item>
+               <item name="GL_SELECT"><value>7170</value></item>
        </enum>
 
        <request name="Finish" opcode="108">
@@ -840,7 +899,7 @@ The patch that fixed this server bug in X.org CVS is here:
                        <pad bytes="4" />
                        <field type="CARD32" name="n" />
                        <pad bytes="16" />
-                       <list type="CARD8" name="string">
+                       <list type="char" name="string">
                                <fieldref>n</fieldref>
                        </list>
                </reply>
Unnamed repository; edit this file 'description' to name the repository.