[Xcb-commit] 4 commits - src
Peter Harris
peterh at kemper.freedesktop.org
Tue Dec 6 12:21:35 PST 2011
src/glx.xml | 68 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 file changed, 63 insertions(+), 5 deletions(-)
New commits:
commit a0f20ce0efef23fdebb600d2a926f87b8db0cdd3
Author: Ian Romanick <ian.d.romanick at intel.com>
Date: Fri Dec 2 15:09:00 2011 -0800
glx: Add protocol for GLX_ARB_create_context and GLX_ARB_create_context_profile
Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
Signed-off-by: Peter Harris <pharris at opentext.com>
diff --git a/src/glx.xml b/src/glx.xml
index 119a81f..53c9267 100644
--- a/src/glx.xml
+++ b/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">
@@ -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">
commit d0b88e5119a93436ac6eb5b604e2743cd3c43a3c
Author: Ian Romanick <ian.d.romanick at intel.com>
Date: Fri Dec 2 15:08:59 2011 -0800
glx: Use FBCONFIG type for fbconfig parameter of CreateNewContext and CreatePixmap
Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
Signed-off-by: Peter Harris <pharris at opentext.com>
diff --git a/src/glx.xml b/src/glx.xml
index 53fa400..119a81f 100644
--- a/src/glx.xml
+++ b/src/glx.xml
@@ -348,7 +348,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,7 +366,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="FBCONFIG" name="fbconfig" />
<field type="CARD32" name="screen" />
<field type="CARD32" name="render_type" />
<field type="glx:CONTEXT" name="share_list" />
commit 6a167ee4f24cd195d197e608b70f5a91ea3ec89f
Author: Ian Romanick <ian.d.romanick at intel.com>
Date: Fri Dec 2 15:08:58 2011 -0800
glx: Use glx:CONTEXT for share_list parameter of CreateNewContext
This matches the share_list parameter of CreateContext.
Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
Signed-off-by: Peter Harris <pharris at opentext.com>
diff --git a/src/glx.xml b/src/glx.xml
index f23105c..53fa400 100644
--- a/src/glx.xml
+++ b/src/glx.xml
@@ -369,7 +369,7 @@ The patch that fixed this server bug in X.org CVS is here:
<field type="CARD32" 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" />
<pad bytes="3" />
</request>
commit cb7c7123e18ec2c103d72eaf840baec70d71c686
Author: Ian Romanick <ian.d.romanick at intel.com>
Date: Fri Dec 2 15:08:57 2011 -0800
glx: Replace some 'reserved' fields with explicit padding
In the GLX protocol specs, the various fields named 'reserved' are
just there to provide alignment padding.
Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
Reviewed-by: Peter Harris <pharris at opentext.com>
Signed-off-by: Peter Harris <pharris at opentext.com>
diff --git a/src/glx.xml b/src/glx.xml
index 544b543..f23105c 100644
--- a/src/glx.xml
+++ b/src/glx.xml
@@ -371,8 +371,7 @@ The patch that fixed this server bug in X.org CVS is here:
<field type="CARD32" name="render_type" />
<field type="CARD32" 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">
More information about the xcb-commit
mailing list