[Xcb-commit] Branch 'xspec' - 6 commits - xcb-proto
Alp Toker
alp at kemper.freedesktop.org
Thu Mar 23 22:00:10 PST 2006
xcb-proto/src/extensions/glx.xml | 179 ++++++++++++++++++--------------------
xcb-proto/src/extensions/xvmc.xml | 58 ++++++------
2 files changed, 120 insertions(+), 117 deletions(-)
New commits:
diff-tree 807c42427efd54ea0d4e7353ba9706f9ffdceb72 (from c1329c49a664975b707cca7d77f7d9b076d3930b)
Author: Alp Toker <alp at atoker.com>
Date: Fri Mar 24 05:59:52 2006 +0000
Capitalization fixes
Added new type ContextTag (just a CARD32).
diff --git a/xcb-proto/src/extensions/glx.xml b/xcb-proto/src/extensions/glx.xml
index 0adb831..7e9919c 100644
--- a/xcb-proto/src/extensions/glx.xml
+++ b/xcb-proto/src/extensions/glx.xml
@@ -43,11 +43,12 @@ The patch that fixed this server bug in
http://cvs.freedesktop.org/xorg/xserver/xorg/GL/glx/glxcmds.c?r1=1.6&r2=1.7
-->
<extension header="glx" xname="GLX" name="Glx" version="1.3">
- <type name="CONTEXT"/>
+ <type name="Context"/>
<type name="Drawable"/>
<type name="Pixmap"/>
- <type name="FBCONFIG"/>
- <type name="PBUFFER"/>
+ <typedef oldname="CARD32" newname="ContextTag"/>
+ <type name="FBConfig"/>
+ <type name="PBuffer"/>
<type name="Window"/>
<typedef oldname="float" newname="FLOAT32"/>
<typedef oldname="double" newname="FLOAT64"/>
@@ -106,11 +107,11 @@ The patch that fixed this server bug in
</enum>
<!-- Requests -->
<request name="Render" number="1" combine-adjacent="true">
- <field type="CARD32" name="context_tag"/>
+ <field type="ContextTag" name="context_tag"/>
<list type="byte" name="data"/>
</request>
<request name="RenderLarge" number="2">
- <field type="CARD32" name="context_tag"/>
+ <field type="ContextTag" name="context_tag"/>
<field type="CARD16" name="request_num"/>
<field type="CARD16" name="request_total"/>
<field type="CARD32" name="data_len"/>
@@ -132,10 +133,10 @@ The patch that fixed this server bug in
<request name="MakeCurrent" number="5">
<field type="glx:Drawable" name="drawable"/>
<field type="glx:Context" name="context"/>
- <field type="CARD32" name="old_context_tag"/>
+ <field type="ContextTag" name="old_context_tag"/>
<reply>
<pad bytes="1"/>
- <field type="CARD32" name="context_tag"/>
+ <field type="ContextTag" name="context_tag"/>
<pad bytes="20"/>
</reply>
</request>
@@ -148,26 +149,24 @@ The patch that fixed this server bug in
</reply>
</request>
<request name="QueryVersion" number="7">
- <field type="CARD32" name="major_version"/>
- <field type="CARD32" name="minor_version"/>
+ <field type="Version32"/>
<reply>
<pad bytes="1"/>
- <field type="CARD32" name="major_version"/>
- <field type="CARD32" name="minor_version"/>
+ <field type="Version32"/>
<pad bytes="16"/>
</reply>
</request>
<request name="WaitGL" number="8">
- <field type="CARD32" name="context_tag"/>
+ <field type="ContextTag" name="context_tag"/>
</request>
<request name="WaitX" number="9">
- <field type="CARD32" name="context_tag"/>
+ <field type="ContextTag" name="context_tag"/>
</request>
<request name="CopyContext" number="10">
<field type="glx:Context" name="src"/>
<field type="glx:Context" name="dest"/>
<field type="CARD32" name="mask"/>
- <field type="CARD32" name="src_context_tag"/>
+ <field type="ContextTag" name="src_context_tag"/>
</request>
<!-- Enum for CopyContext: mask -->
<enum name="GC">
@@ -236,11 +235,11 @@ The patch that fixed this server bug in
</item>
</enum>
<request name="SwapBuffers" number="11">
- <field type="CARD32" name="context_tag"/>
+ <field type="ContextTag" name="context_tag"/>
<field type="glx:Drawable" name="drawable"/>
</request>
<request name="UseXFont" number="12">
- <field type="CARD32" name="context_tag"/>
+ <field type="ContextTag" name="context_tag"/>
<field type="Font" name="font"/>
<field type="CARD32" name="first"/>
<field type="CARD32" name="count"/>
@@ -272,12 +271,12 @@ The patch that fixed this server bug in
-->
<request name="VendorPrivate" number="16">
<field type="CARD32" name="vendor_code"/>
- <field type="CARD32" name="context_tag"/>
+ <field type="ContextTag" name="context_tag"/>
<list type="byte" name="data"/>
</request>
<request name="VendorPrivateWithReply" number="17">
<field type="CARD32" name="vendor_code"/>
- <field type="CARD32" name="context_tag"/>
+ <field type="ContextTag" name="context_tag"/>
<list type="byte" name="data"/>
<reply>
<pad bytes="1"/>
@@ -359,25 +358,25 @@ The patch that fixed this server bug in
</reply>
</request>
<request name="MakeContextCurrent" number="26">
- <field type="CARD32" name="old_context_tag"/>
+ <field type="ContextTag" name="old_context_tag"/>
<field type="glx:Drawable" name="drawable"/>
<field type="glx:Drawable" name="read_drawable"/>
<field type="glx:Context" name="context"/>
<reply>
<pad bytes="1"/>
- <field type="CARD32" name="context_tag"/>
+ <field type="ContextTag" name="context_tag"/>
<pad bytes="20"/>
</reply>
</request>
<request name="CreatePbuffer" number="27">
<field type="Screen" name="screen"/>
- <field type="FBCONFIG" name="fbconfig"/>
- <field type="PBUFFER" name="pbuffer"/>
+ <field type="FBConfig" name="fbconfig"/>
+ <field type="PBuffer" name="pbuffer"/>
<field type="CARD32" name="num_attribs"/>
<valueparam value-mask-type="CARD32" value-mask-name="value_mask" value-list-name="value_list"/>
</request>
<request name="DestroyPbuffer" number="28">
- <field type="PBUFFER" name="pbuffer"/>
+ <field type="PBuffer" name="pbuffer"/>
</request>
<request name="GetDrawableAttributes" number="29">
<field type="glx:Drawable" name="drawable"/>
@@ -395,7 +394,7 @@ The patch that fixed this server bug in
</request>
<request name="CreateWindow" number="31">
<field type="Screen" name="screen"/>
- <field type="FBCONFIG" name="fbconfig"/>
+ <field type="FBConfig" name="fbconfig"/>
<field type="xcb_types:Window" name="window"/>
<field type="glx:Window" name="glx_window"/>
<field type="CARD32" name="num_attribs"/>
@@ -406,20 +405,20 @@ The patch that fixed this server bug in
</request>
<!-- Requests for GL Non-rendering Commands (single ops) -->
<request name="NewList" number="101">
- <field type="CARD32" name="context_tag"/>
+ <field type="ContextTag" name="context_tag"/>
<field type="CARD32" name="list"/>
<field type="CARD32" name="mode"/>
</request>
<request name="EndList" number="102">
- <field type="CARD32" name="context_tag"/>
+ <field type="ContextTag" name="context_tag"/>
</request>
<request name="DeleteLists" number="103">
- <field type="CARD32" name="context_tag"/>
+ <field type="ContextTag" name="context_tag"/>
<field type="CARD32" name="list"/>
<field type="INT32" name="range"/>
</request>
<request name="GenLists" number="104">
- <field type="CARD32" name="context_tag"/>
+ <field type="ContextTag" name="context_tag"/>
<field type="INT32" name="range"/>
<reply>
<pad bytes="1"/>
@@ -427,18 +426,18 @@ The patch that fixed this server bug in
</reply>
</request>
<request name="FeedbackBuffer" number="105">
- <field type="CARD32" name="context_tag"/>
+ <field type="ContextTag" name="context_tag"/>
<field type="INT32" name="size"/>
<field type="INT32" name="type"/>
</request>
<request name="SelectBuffer" number="106">
- <field type="CARD32" name="context_tag"/>
+ <field type="ContextTag" name="context_tag"/>
<field type="INT32" name="size"/>
<!-- the reply is actually returned in the data
of the next RenderMode request -->
</request>
<request name="RenderMode" number="107">
- <field type="CARD32" name="context_tag"/>
+ <field type="ContextTag" name="context_tag"/>
<field type="CARD32" name="mode"/>
<!--
This reply is only if RM was previously feedback/selection.
@@ -468,23 +467,23 @@ The patch that fixed this server bug in
</item>
</enum>
<request name="Finish" number="108">
- <field type="CARD32" name="context_tag"/>
+ <field type="ContextTag" name="context_tag"/>
<reply>
<pad bytes="1"/>
</reply>
</request>
<request name="PixelStoref" number="109">
- <field type="CARD32" name="context_tag"/>
+ <field type="ContextTag" name="context_tag"/>
<field type="CARD32" name="pname"/>
<field type="FLOAT32" name="datum"/>
</request>
<request name="PixelStorei" number="110">
- <field type="CARD32" name="context_tag"/>
+ <field type="ContextTag" name="context_tag"/>
<field type="CARD32" name="pname"/>
<field type="INT32" name="datum"/>
</request>
<request name="ReadPixels" number="111">
- <field type="CARD32" name="context_tag"/>
+ <field type="ContextTag" name="context_tag"/>
<field type="INT32" name="x"/>
<field type="INT32" name="y"/>
<field type="INT32" name="width"/>
@@ -506,7 +505,7 @@ The patch that fixed this server bug in
Starts on page 58/180
-->
<request name="GetBooleanv" number="112">
- <field type="CARD32" name="context_tag"/>
+ <field type="ContextTag" name="context_tag"/>
<field type="INT32" name="pname"/>
<reply>
<pad bytes="1"/>
@@ -520,7 +519,7 @@ The patch that fixed this server bug in
</reply>
</request>
<request name="GetClipPlane" number="113">
- <field type="CARD32" name="context_tag"/>
+ <field type="ContextTag" name="context_tag"/>
<field type="INT32" name="plane"/>
<reply>
<pad bytes="1"/>
@@ -529,7 +528,7 @@ The patch that fixed this server bug in
</reply>
</request>
<request name="GetDoublev" number="114">
- <field type="CARD32" name="context_tag"/>
+ <field type="ContextTag" name="context_tag"/>
<field type="CARD32" name="pname"/>
<reply>
<pad bytes="1"/>
@@ -543,14 +542,14 @@ The patch that fixed this server bug in
</reply>
</request>
<request name="GetError" number="115">
- <field type="CARD32" name="context_tag"/>
+ <field type="ContextTag" name="context_tag"/>
<reply>
<pad bytes="1"/>
<field type="INT32" name="error"/>
</reply>
</request>
<request name="GetFloatv" number="116">
- <field type="CARD32" name="context_tag"/>
+ <field type="ContextTag" name="context_tag"/>
<field type="CARD32" name="pname"/>
<reply>
<pad bytes="1"/>
@@ -564,7 +563,7 @@ The patch that fixed this server bug in
</reply>
</request>
<request name="GetIntegerv" number="117">
- <field type="CARD32" name="context_tag"/>
+ <field type="ContextTag" name="context_tag"/>
<field type="CARD32" name="pname"/>
<reply>
<pad bytes="1"/>
@@ -578,7 +577,7 @@ The patch that fixed this server bug in
</reply>
</request>
<request name="GetLightfv" number="118">
- <field type="CARD32" name="context_tag"/>
+ <field type="ContextTag" name="context_tag"/>
<field type="CARD32" name="light"/>
<field type="CARD32" name="pname"/>
<reply>
@@ -593,7 +592,7 @@ The patch that fixed this server bug in
</reply>
</request>
<request name="GetLightiv" number="119">
- <field type="CARD32" name="context_tag"/>
+ <field type="ContextTag" name="context_tag"/>
<field type="CARD32" name="light"/>
<field type="CARD32" name="pname"/>
<reply>
@@ -608,7 +607,7 @@ The patch that fixed this server bug in
</reply>
</request>
<request name="GetMapdv" number="120">
- <field type="CARD32" name="context_tag"/>
+ <field type="ContextTag" name="context_tag"/>
<field type="CARD32" name="target"/>
<field type="CARD32" name="query"/>
<reply>
@@ -623,7 +622,7 @@ The patch that fixed this server bug in
</reply>
</request>
<request name="GetMapfv" number="121">
- <field type="CARD32" name="context_tag"/>
+ <field type="ContextTag" name="context_tag"/>
<field type="CARD32" name="target"/>
<field type="CARD32" name="query"/>
<reply>
@@ -638,7 +637,7 @@ The patch that fixed this server bug in
</reply>
</request>
<request name="GetMapiv" number="122">
- <field type="CARD32" name="context_tag"/>
+ <field type="ContextTag" name="context_tag"/>
<field type="CARD32" name="target"/>
<field type="CARD32" name="query"/>
<reply>
@@ -653,7 +652,7 @@ The patch that fixed this server bug in
</reply>
</request>
<request name="GetMaterialfv" number="123">
- <field type="CARD32" name="context_tag"/>
+ <field type="ContextTag" name="context_tag"/>
<field type="CARD32" name="face"/>
<field type="CARD32" name="pname"/>
<reply>
@@ -668,7 +667,7 @@ The patch that fixed this server bug in
</reply>
</request>
<request name="GetMaterialiv" number="124">
- <field type="CARD32" name="context_tag"/>
+ <field type="ContextTag" name="context_tag"/>
<field type="CARD32" name="face"/>
<field type="CARD32" name="pname"/>
<reply>
@@ -683,7 +682,7 @@ The patch that fixed this server bug in
</reply>
</request>
<request name="GetPixelMapfv" number="125">
- <field type="CARD32" name="context_tag"/>
+ <field type="ContextTag" name="context_tag"/>
<field type="CARD32" name="map"/>
<reply>
<pad bytes="1"/>
@@ -697,7 +696,7 @@ The patch that fixed this server bug in
</reply>
</request>
<request name="GetPixelMapuiv" number="126">
- <field type="CARD32" name="context_tag"/>
+ <field type="ContextTag" name="context_tag"/>
<field type="CARD32" name="map"/>
<reply>
<pad bytes="1"/>
@@ -711,7 +710,7 @@ The patch that fixed this server bug in
</reply>
</request>
<request name="GetPixelMapusv" number="127">
- <field type="CARD32" name="context_tag"/>
+ <field type="ContextTag" name="context_tag"/>
<field type="CARD32" name="map"/>
<reply>
<pad bytes="1"/>
@@ -725,7 +724,7 @@ The patch that fixed this server bug in
</reply>
</request>
<request name="GetPolygonStipple" number="128">
- <field type="CARD32" name="context_tag"/>
+ <field type="ContextTag" name="context_tag"/>
<field type="bool" name="lsb_first"/>
<reply>
<pad bytes="1"/>
@@ -734,7 +733,7 @@ The patch that fixed this server bug in
</reply>
</request>
<request name="GetString" number="129">
- <field type="CARD32" name="context_tag"/>
+ <field type="ContextTag" name="context_tag"/>
<field type="CARD32" name="name"/>
<reply>
<pad bytes="1"/>
@@ -747,7 +746,7 @@ The patch that fixed this server bug in
</reply>
</request>
<request name="GetTexEnvfv" number="130">
- <field type="CARD32" name="context_tag"/>
+ <field type="ContextTag" name="context_tag"/>
<field type="CARD32" name="target"/>
<field type="CARD32" name="pname"/>
<reply>
@@ -762,7 +761,7 @@ The patch that fixed this server bug in
</reply>
</request>
<request name="GetTexEnviv" number="131">
- <field type="CARD32" name="context_tag"/>
+ <field type="ContextTag" name="context_tag"/>
<field type="CARD32" name="target"/>
<field type="CARD32" name="pname"/>
<reply>
@@ -777,7 +776,7 @@ The patch that fixed this server bug in
</reply>
</request>
<request name="GetTexGendv" number="132">
- <field type="CARD32" name="context_tag"/>
+ <field type="ContextTag" name="context_tag"/>
<field type="CARD32" name="coord"/>
<field type="CARD32" name="pname"/>
<reply>
@@ -792,7 +791,7 @@ The patch that fixed this server bug in
</reply>
</request>
<request name="GetTexGenfv" number="133">
- <field type="CARD32" name="context_tag"/>
+ <field type="ContextTag" name="context_tag"/>
<field type="CARD32" name="coord"/>
<field type="CARD32" name="pname"/>
<reply>
@@ -807,7 +806,7 @@ The patch that fixed this server bug in
</reply>
</request>
<request name="GetTexGeniv" number="134">
- <field type="CARD32" name="context_tag"/>
+ <field type="ContextTag" name="context_tag"/>
<field type="CARD32" name="coord"/>
<field type="CARD32" name="pname"/>
<reply>
@@ -822,7 +821,7 @@ The patch that fixed this server bug in
</reply>
</request>
<request name="GetTexImage" number="135">
- <field type="CARD32" name="context_tag"/>
+ <field type="ContextTag" name="context_tag"/>
<field type="CARD32" name="target"/>
<field type="INT32" name="level"/>
<field type="CARD32" name="format"/>
@@ -839,7 +838,7 @@ The patch that fixed this server bug in
</reply>
</request>
<request name="GetTexParameterfv" number="136">
- <field type="CARD32" name="context_tag"/>
+ <field type="ContextTag" name="context_tag"/>
<field type="CARD32" name="target"/>
<field type="CARD32" name="pname"/>
<reply>
@@ -854,7 +853,7 @@ The patch that fixed this server bug in
</reply>
</request>
<request name="GetTexParameteriv" number="137">
- <field type="CARD32" name="context_tag"/>
+ <field type="ContextTag" name="context_tag"/>
<field type="CARD32" name="target"/>
<field type="CARD32" name="pname"/>
<reply>
@@ -869,7 +868,7 @@ The patch that fixed this server bug in
</reply>
</request>
<request name="GetTexLevelParameterfv" number="138">
- <field type="CARD32" name="context_tag"/>
+ <field type="ContextTag" name="context_tag"/>
<field type="CARD32" name="target"/>
<field type="INT32" name="level"/>
<field type="CARD32" name="pname"/>
@@ -885,7 +884,7 @@ The patch that fixed this server bug in
</reply>
</request>
<request name="GetTexLevelParameteriv" number="139">
- <field type="CARD32" name="context_tag"/>
+ <field type="ContextTag" name="context_tag"/>
<field type="CARD32" name="target"/>
<field type="INT32" name="level"/>
<field type="CARD32" name="pname"/>
@@ -901,7 +900,7 @@ The patch that fixed this server bug in
</reply>
</request>
<request name="IsList" number="141">
- <field type="CARD32" name="context_tag"/>
+ <field type="ContextTag" name="context_tag"/>
<field type="CARD32" name="list"/>
<reply>
<pad bytes="1"/>
@@ -909,10 +908,10 @@ The patch that fixed this server bug in
</reply>
</request>
<request name="Flush" number="142">
- <field type="CARD32" name="context_tag"/>
+ <field type="ContextTag" name="context_tag"/>
</request>
<request name="AreTexturesResident" number="143">
- <field type="CARD32" name="context_tag"/>
+ <field type="ContextTag" name="context_tag"/>
<field type="INT32" name="n"/>
<list type="CARD32" name="textures">
<fieldref>n</fieldref>
@@ -925,14 +924,14 @@ The patch that fixed this server bug in
</reply>
</request>
<request name="DeleteTextures" number="144">
- <field type="CARD32" name="context_tag"/>
+ <field type="ContextTag" name="context_tag"/>
<field type="INT32" name="n"/>
<list type="CARD32" name="textures">
<fieldref>n</fieldref>
</list>
</request>
<request name="GenTextures" number="145">
- <field type="CARD32" name="context_tag"/>
+ <field type="ContextTag" name="context_tag"/>
<field type="INT32" name="n"/>
<reply>
<pad bytes="1"/>
@@ -941,7 +940,7 @@ The patch that fixed this server bug in
</reply>
</request>
<request name="IsTexture" number="146">
- <field type="CARD32" name="context_tag"/>
+ <field type="ContextTag" name="context_tag"/>
<field type="CARD32" name="texture"/>
<reply>
<pad bytes="1"/>
@@ -949,7 +948,7 @@ The patch that fixed this server bug in
</reply>
</request>
<request name="GetColorTable" number="147">
- <field type="CARD32" name="context_tag"/>
+ <field type="ContextTag" name="context_tag"/>
<field type="CARD32" name="target"/>
<field type="CARD32" name="format"/>
<field type="CARD32" name="type"/>
@@ -963,7 +962,7 @@ The patch that fixed this server bug in
</reply>
</request>
<request name="GetColorTableParameterfv" number="148">
- <field type="CARD32" name="context_tag"/>
+ <field type="ContextTag" name="context_tag"/>
<field type="CARD32" name="target"/>
<field type="CARD32" name="pname"/>
<reply>
@@ -978,7 +977,7 @@ The patch that fixed this server bug in
</reply>
</request>
<request name="GetColorTableParameteriv" number="149">
- <field type="CARD32" name="context_tag"/>
+ <field type="ContextTag" name="context_tag"/>
<field type="CARD32" name="target"/>
<field type="CARD32" name="pname"/>
<reply>
@@ -993,7 +992,7 @@ The patch that fixed this server bug in
</reply>
</request>
<request name="GetConvolutionFilter" number="150">
- <field type="CARD32" name="context_tag"/>
+ <field type="ContextTag" name="context_tag"/>
<field type="CARD32" name="target"/>
<field type="CARD32" name="format"/>
<field type="CARD32" name="type"/>
@@ -1008,7 +1007,7 @@ The patch that fixed this server bug in
</reply>
</request>
<request name="GetConvolutionParameterfv" number="151">
- <field type="CARD32" name="context_tag"/>
+ <field type="ContextTag" name="context_tag"/>
<field type="CARD32" name="target"/>
<field type="CARD32" name="pname"/>
<reply>
@@ -1023,7 +1022,7 @@ The patch that fixed this server bug in
</reply>
</request>
<request name="GetConvolutionParameteriv" number="152">
- <field type="CARD32" name="context_tag"/>
+ <field type="ContextTag" name="context_tag"/>
<field type="CARD32" name="target"/>
<field type="CARD32" name="pname"/>
<reply>
@@ -1038,7 +1037,7 @@ The patch that fixed this server bug in
</reply>
</request>
<request name="GetSeparableFilter" number="153">
- <field type="CARD32" name="context_tag"/>
+ <field type="ContextTag" name="context_tag"/>
<field type="CARD32" name="target"/>
<field type="CARD32" name="format"/>
<field type="CARD32" name="type"/>
@@ -1053,7 +1052,7 @@ The patch that fixed this server bug in
</reply>
</request>
<request name="GetHistogram" number="154">
- <field type="CARD32" name="context_tag"/>
+ <field type="ContextTag" name="context_tag"/>
<field type="CARD32" name="target"/>
<field type="CARD32" name="format"/>
<field type="CARD32" name="type"/>
@@ -1068,7 +1067,7 @@ The patch that fixed this server bug in
</reply>
</request>
<request name="GetHistogramParameterfv" number="155">
- <field type="CARD32" name="context_tag"/>
+ <field type="ContextTag" name="context_tag"/>
<field type="CARD32" name="target"/>
<field type="CARD32" name="pname"/>
<reply>
@@ -1083,7 +1082,7 @@ The patch that fixed this server bug in
</reply>
</request>
<request name="GetHistogramParameteriv" number="156">
- <field type="CARD32" name="context_tag"/>
+ <field type="ContextTag" name="context_tag"/>
<field type="CARD32" name="target"/>
<field type="CARD32" name="pname"/>
<reply>
@@ -1098,7 +1097,7 @@ The patch that fixed this server bug in
</reply>
</request>
<request name="GetMinmax" number="157">
- <field type="CARD32" name="context_tag"/>
+ <field type="ContextTag" name="context_tag"/>
<field type="CARD32" name="target"/>
<field type="CARD32" name="format"/>
<field type="CARD32" name="type"/>
@@ -1111,7 +1110,7 @@ The patch that fixed this server bug in
</reply>
</request>
<request name="GetMinmaxParameterfv" number="158">
- <field type="CARD32" name="context_tag"/>
+ <field type="ContextTag" name="context_tag"/>
<field type="CARD32" name="target"/>
<field type="CARD32" name="pname"/>
<reply>
@@ -1126,7 +1125,7 @@ The patch that fixed this server bug in
</reply>
</request>
<request name="GetMinmaxParameteriv" number="159">
- <field type="CARD32" name="context_tag"/>
+ <field type="ContextTag" name="context_tag"/>
<field type="CARD32" name="target"/>
<field type="CARD32" name="pname"/>
<reply>
@@ -1151,7 +1150,7 @@ The patch that fixed this server bug in
http://oss.sgi.com/projects/ogl-sample/registry/ARB/texture_compression.txt
-->
<request name="GetCompressedTexImageARB" number="160">
- <field type="CARD32" name="context_tag"/>
+ <field type="ContextTag" name="context_tag"/>
<field type="CARD32" name="target"/>
<field type="INT32" name="level"/>
<reply>
@@ -1167,14 +1166,14 @@ The patch that fixed this server bug in
http://oss.sgi.com/projects/ogl-sample/registry/ARB/occlusion_query.txt
-->
<request name="DeleteQueriesARB" number="161">
- <field type="CARD32" name="context_tag"/>
+ <field type="ContextTag" name="context_tag"/>
<field type="INT32" name="n"/>
<list type="CARD32" name="ids">
<fieldref>n</fieldref>
</list>
</request>
<request name="GenQueriesARB" number="162">
- <field type="CARD32" name="context_tag"/>
+ <field type="ContextTag" name="context_tag"/>
<field type="INT32" name="n"/>
<reply>
<pad bytes="1"/>
@@ -1183,7 +1182,7 @@ The patch that fixed this server bug in
</reply>
</request>
<request name="IsQueryARB" number="163">
- <field type="CARD32" name="context_tag"/>
+ <field type="ContextTag" name="context_tag"/>
<field type="CARD32" name="id"/>
<reply>
<pad bytes="1"/>
@@ -1191,7 +1190,7 @@ The patch that fixed this server bug in
</reply>
</request>
<request name="GetQueryivARB" number="164">
- <field type="CARD32" name="context_tag"/>
+ <field type="ContextTag" name="context_tag"/>
<field type="CARD32" name="target"/>
<field type="CARD32" name="pname"/>
<reply>
@@ -1206,7 +1205,7 @@ The patch that fixed this server bug in
</reply>
</request>
<request name="GetQueryObjectivARB" number="165">
- <field type="CARD32" name="context_tag"/>
+ <field type="ContextTag" name="context_tag"/>
<field type="CARD32" name="id"/>
<field type="CARD32" name="pname"/>
<reply>
@@ -1221,7 +1220,7 @@ The patch that fixed this server bug in
</reply>
</request>
<request name="GetQueryObjectuivARB" number="166">
- <field type="CARD32" name="context_tag"/>
+ <field type="ContextTag" name="context_tag"/>
<field type="CARD32" name="id"/>
<field type="CARD32" name="pname"/>
<reply>
diff-tree c1329c49a664975b707cca7d77f7d9b076d3930b (from 0142a56c965c566a619217039725138aa2765b11)
Author: Alp Toker <alp at atoker.com>
Date: Fri Mar 24 05:38:22 2006 +0000
share_list is a GLX_CONTEXT, not a CARD32
diff --git a/xcb-proto/src/extensions/glx.xml b/xcb-proto/src/extensions/glx.xml
index 57ac36b..0adb831 100644
--- a/xcb-proto/src/extensions/glx.xml
+++ b/xcb-proto/src/extensions/glx.xml
@@ -344,7 +344,7 @@ The patch that fixed this server bug in
<field type="CARD32" name="fbconfig"/>
<field type="Screen" 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"/>
diff-tree 0142a56c965c566a619217039725138aa2765b11 (from c77978f8caa9d8c3df48f6b1f0a41879e51a9130)
Author: Alp Toker <alp at atoker.com>
Date: Fri Mar 24 05:23:36 2006 +0000
XvMC: add missing errors, an enum and work towards 1.1 support
diff --git a/xcb-proto/src/extensions/xvmc.xml b/xcb-proto/src/extensions/xvmc.xml
index 266f9ff..2b3f326 100644
--- a/xcb-proto/src/extensions/xvmc.xml
+++ b/xcb-proto/src/extensions/xvmc.xml
@@ -26,12 +26,20 @@ institutions shall not be used in advert
sale, use or other dealings in this Software without prior written
authorization from the authors.
-->
-<extension header="xvmc" xname="XVideo-MotionCompensation" name="XvMC">
+<extension header="xvmc" xname="XVideo-MotionCompensation" name="XvMC" version="1.1">
<import>xv</import>
-<!-- FIXME: xspec: Why don't these types have errors? Some aren't xid types at all. Read up on XvMC_API.txt and headers to fix this. -->
+ <enum name="ChromaFormat">
+ <item name="420"/>
+ <item name="422"/>
+ <item name="444"/>
+ </enum>
+<!-- FIXME: Read up on XvMC_API.txt and headers to complete this extension -->
<type name="Context"/>
<type name="Surface"/>
<type name="Subpicture"/>
+ <error name="BadContext" number="0"/>
+ <error name="BadSurface" number="1"/>
+ <error name="BadSubpicture" number="2"/>
<struct name="SurfaceInfo">
<field type="Surface" name="id"/>
<field type="CARD16" name="chroma-format"/>
@@ -119,4 +127,5 @@ authorization from the authors.
</list>
</reply>
</request>
+<!-- TODO: GetDRInfoRequest -->
</extension>
diff-tree c77978f8caa9d8c3df48f6b1f0a41879e51a9130 (from 24e335609f42ac7e87217b5a33652c016cde62b8)
Author: Alp Toker <alp at atoker.com>
Date: Fri Mar 24 04:53:12 2006 +0000
Tidy XvMC and update a FIXME with new info
diff --git a/xcb-proto/src/extensions/xvmc.xml b/xcb-proto/src/extensions/xvmc.xml
index 89f0946..266f9ff 100644
--- a/xcb-proto/src/extensions/xvmc.xml
+++ b/xcb-proto/src/extensions/xvmc.xml
@@ -28,7 +28,7 @@ authorization from the authors.
-->
<extension header="xvmc" xname="XVideo-MotionCompensation" name="XvMC">
<import>xv</import>
-<!-- TODO: xspec: why don't these types have errors? -->
+<!-- FIXME: xspec: Why don't these types have errors? Some aren't xid types at all. Read up on XvMC_API.txt and headers to fix this. -->
<type name="Context"/>
<type name="Surface"/>
<type name="Subpicture"/>
@@ -44,8 +44,7 @@ authorization from the authors.
<request name="QueryVersion" number="0">
<reply>
<pad bytes="1"/>
- <field type="CARD32" name="major"/>
- <field type="CARD32" name="minor"/>
+ <field type="Version32"/>
</reply>
</request>
<request name="ListSurfaceTypes" number="1">
@@ -63,13 +62,11 @@ authorization from the authors.
<field type="Context" name="context-id"/>
<field type="Port" name="port-id"/>
<field type="Surface" name="surface-id"/>
- <field type="CARD16" name="width"/>
- <field type="CARD16" name="height"/>
+ <field type="Size"/>
<field type="CARD32" name="flags"/>
<reply>
<pad bytes="1"/>
- <field type="CARD16" name="width-actual"/>
- <field type="CARD16" name="height-actual"/>
+ <field type="Size" name="size-actual"/>
<field type="CARD32" name="flags-return"/>
<pad bytes="20"/>
<list type="CARD32" name="priv-data"/>
@@ -94,12 +91,10 @@ authorization from the authors.
<field type="Subpicture" name="subpicture-id"/>
<field type="Context" name="context"/>
<field type="CARD32" name="xvimage-id"/>
- <field type="CARD16" name="width"/>
- <field type="CARD16" name="height"/>
+ <field type="Size"/>
<reply>
<pad bytes="1"/>
- <field type="CARD16" name="width-actual"/>
- <field type="CARD16" name="height-actual"/>
+ <field type="Size" name="size-actual"/>
<field type="CARD16" name="num-palette-entries"/>
<field type="CARD16" name="entry-bytes"/>
<list type="CARD8" name="component-order">
diff-tree 24e335609f42ac7e87217b5a33652c016cde62b8 (from 3825c5cd4196f27442fc4c8d9e88f2f6393022a2)
Author: Alp Toker <alp at atoker.com>
Date: Fri Mar 24 04:35:57 2006 +0000
Update more type cases
diff --git a/xcb-proto/src/extensions/xvmc.xml b/xcb-proto/src/extensions/xvmc.xml
index 1013c88..89f0946 100644
--- a/xcb-proto/src/extensions/xvmc.xml
+++ b/xcb-proto/src/extensions/xvmc.xml
@@ -29,11 +29,11 @@ authorization from the authors.
<extension header="xvmc" xname="XVideo-MotionCompensation" name="XvMC">
<import>xv</import>
<!-- TODO: xspec: why don't these types have errors? -->
- <type name="CONTEXT"/>
- <type name="SURFACE"/>
- <type name="SUBPICTURE"/>
+ <type name="Context"/>
+ <type name="Surface"/>
+ <type name="Subpicture"/>
<struct name="SurfaceInfo">
- <field type="SURFACE" name="id"/>
+ <field type="Surface" name="id"/>
<field type="CARD16" name="chroma-format"/>
<pad bytes="2"/>
<field type="Size" name="max-size"/>
@@ -60,9 +60,9 @@ authorization from the authors.
</reply>
</request>
<request name="CreateContext" number="2">
- <field type="CONTEXT" name="context-id"/>
+ <field type="Context" name="context-id"/>
<field type="Port" name="port-id"/>
- <field type="SURFACE" name="surface-id"/>
+ <field type="Surface" name="surface-id"/>
<field type="CARD16" name="width"/>
<field type="CARD16" name="height"/>
<field type="CARD32" name="flags"/>
@@ -76,11 +76,11 @@ authorization from the authors.
</reply>
</request>
<request name="DestroyContext" number="3">
- <field type="CONTEXT" name="context-id"/>
+ <field type="Context" name="context-id"/>
</request>
<request name="CreateSurface" number="4">
- <field type="SURFACE" name="surface-id"/>
- <field type="CONTEXT" name="context-id"/>
+ <field type="Surface" name="surface-id"/>
+ <field type="Context" name="context-id"/>
<reply>
<pad bytes="1"/>
<pad bytes="24"/>
@@ -88,11 +88,11 @@ authorization from the authors.
</reply>
</request>
<request name="DestroySurface" number="5">
- <field type="SURFACE" name="surface-id"/>
+ <field type="Surface" name="surface-id"/>
</request>
<request name="CreateSubpicture" number="6">
- <field type="SUBPICTURE" name="subpicture-id"/>
- <field type="CONTEXT" name="context"/>
+ <field type="Subpicture" name="subpicture-id"/>
+ <field type="Context" name="context"/>
<field type="CARD32" name="xvimage-id"/>
<field type="CARD16" name="width"/>
<field type="CARD16" name="height"/>
@@ -110,11 +110,11 @@ authorization from the authors.
</reply>
</request>
<request name="DestroySubpicture" number="7">
- <field type="SUBPICTURE" name="subpicture-id"/>
+ <field type="Subpicture" name="subpicture-id"/>
</request>
<request name="ListSubpictureTypes" number="8">
<field type="Port" name="port-id"/>
- <field type="SURFACE" name="surface-id"/>
+ <field type="Surface" name="surface-id"/>
<reply>
<pad bytes="1"/>
<field type="CARD32" name="num"/>
diff-tree 3825c5cd4196f27442fc4c8d9e88f2f6393022a2 (from dfdbb311904578823119f1c51e5f2a2109976b0f)
Author: Alp Toker <alp at atoker.com>
Date: Fri Mar 24 04:30:23 2006 +0000
Whitespace fix
diff --git a/xcb-proto/src/extensions/xvmc.xml b/xcb-proto/src/extensions/xvmc.xml
index 2f9a79c..1013c88 100644
--- a/xcb-proto/src/extensions/xvmc.xml
+++ b/xcb-proto/src/extensions/xvmc.xml
@@ -27,7 +27,7 @@ sale, use or other dealings in this Soft
authorization from the authors.
-->
<extension header="xvmc" xname="XVideo-MotionCompensation" name="XvMC">
- <import>xv</import>
+ <import>xv</import>
<!-- TODO: xspec: why don't these types have errors? -->
<type name="CONTEXT"/>
<type name="SURFACE"/>
More information about the xcb-commit
mailing list