aboutsummaryrefslogtreecommitdiff
path: root/libxcb
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-12-08 09:32:47 +0100
committermarha <marha@users.sourceforge.net>2011-12-08 09:32:47 +0100
commitacd000667561cb9978ead7f14d4fbb97c1a8e727 (patch)
tree21668e5efeb08af34de6c679d4c46cc6fe5d7b64 /libxcb
parent893624a6c15d4ee6cf1d46e4ad29282c72bee962 (diff)
parent5b178ff5a5f0b6e481cf9fd9749eb7ef9581c987 (diff)
downloadvcxsrv-acd000667561cb9978ead7f14d4fbb97c1a8e727.tar.gz
vcxsrv-acd000667561cb9978ead7f14d4fbb97c1a8e727.tar.bz2
vcxsrv-acd000667561cb9978ead7f14d4fbb97c1a8e727.zip
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'libxcb')
-rw-r--r--libxcb/xcb-proto/src/glx.xml68
1 files changed, 63 insertions, 5 deletions
diff --git a/libxcb/xcb-proto/src/glx.xml b/libxcb/xcb-proto/src/glx.xml
index 544b543a1..53c926737 100644
--- a/libxcb/xcb-proto/src/glx.xml
+++ b/libxcb/xcb-proto/src/glx.xml
@@ -89,6 +89,7 @@ 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">
@@ -348,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" />
@@ -366,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">
@@ -463,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">